cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test(language-service): Fix diagnostic tests (#32161)

Browse Source 
This commit fixes many diagnostic tests have have incorrect/uncaught assertions.
Also added more assertions to make sure TS diagnostics are clear.
A few test util methods are removed to reduce clutter and improve readability.

PR Close #32161
This commit is contained in:
Keen Yee Liau
2019-08-15 15:17:00 -07:00
committed by Andrew Kushnir
parent 71ada483bf
commit 5f76de1d71
2 changed files with 457 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
packages/language-service/test/test_utils.ts
View File

@ -11,7 +11,7 @@ import * as fs from 'fs';
import * as path from 'path';
import * as ts from 'typescript';
import {Diagnostic, DiagnosticMessageChain, Diagnostics, Span} from '../src/types';
import {Span} from '../src/types';
export type MockData = string | MockDirectory;
@ -104,6 +104,7 @@ export class MockTypescriptHost implements ts.LanguageServiceHost {
} else {
this.overrides.delete(fileName);
}
return content;
}
addScript(fileName: string, content: string) {
@ -330,53 +331,3 @@ function getReferenceMarkers(value: string): ReferenceResult {
function removeReferenceMarkers(value: string): string {
return value.replace(referenceMarker, (match, text) => text.replace(/ᐱ/g, ''));
}
export function noDiagnostics(diagnostics: ts.Diagnostic[]) {
if (diagnostics && diagnostics.length) {
throw new Error(
`Unexpected diagnostics: \n ${diagnostics.map(d => d.messageText).join('\n ')}`);
}
}
export function diagnosticMessageContains(
message: string | ts.DiagnosticMessageChain, messageFragment: string): boolean {
if (typeof message == 'string') {
return message.indexOf(messageFragment) >= 0;
}
if (message.messageText.indexOf(messageFragment) >= 0) {
return true;
}
if (message.next) {
return diagnosticMessageContains(message.next, messageFragment);
}
return false;
}
export function findDiagnostic(
diagnostics: ts.Diagnostic[], messageFragment: string): ts.Diagnostic|undefined {
return diagnostics.find(d => diagnosticMessageContains(d.messageText, messageFragment));
}
export function includeDiagnostic(
diagnostics: ts.Diagnostic[], message: string, text?: string, len?: string): void;
export function includeDiagnostic(
diagnostics: ts.Diagnostic[], message: string, at?: number, len?: number): void;
export function includeDiagnostic(
diagnostics: ts.Diagnostic[], message: string, p1?: any, p2?: any) {
expect(diagnostics).toBeDefined();
if (diagnostics) {
const diagnostic = findDiagnostic(diagnostics, message);
expect(diagnostic).toBeDefined(`no diagnostic contains '${message}`);
if (diagnostic && p1 != null) {
const at = typeof p1 === 'number' ? p1 : p2.indexOf(p1);
const len = typeof p2 === 'number' ? p2 : p1.length;
expect(diagnostic.start)
.toEqual(
at,
`expected message '${message}' was reported at ${diagnostic.start} but should be ${at}`);
if (len != null) {
expect(diagnostic.length).toEqual(len, `expected '${message}'s span length to be ${len}`);
}
}
}
}