Skip to content

Commit a6eb698

Browse files
author
Yui
committed
Merge pull request microsoft#924 from Microsoft/fixColorizationUnittest
Fix colorization unittest
2 parents a1e69b0 + 54bc1da commit a6eb698

5 files changed

Lines changed: 21 additions & 93 deletions

File tree

‎Jakefile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ var servicesDirectory = "src/services/";
1010
var harnessDirectory = "src/harness/";
1111
var libraryDirectory = "src/lib/";
1212
var scriptsDirectory = "scripts/";
13+
var unittestsDirectory = "tests/cases/unittests/";
1314
var docDirectory = "doc/";
1415

1516
var builtDirectory = "built/";
@@ -74,13 +75,17 @@ var harnessSources = [
7475
"typeWriter.ts",
7576
"fourslashRunner.ts",
7677
"projectsRunner.ts",
77-
"unittestrunner.ts",
7878
"loggedIO.ts",
7979
"rwcRunner.ts",
8080
"runner.ts"
8181
].map(function (f) {
8282
return path.join(harnessDirectory, f);
83-
});
83+
}).concat([
84+
"services/colorization.ts",
85+
"services/documentRegistry.ts"
86+
].map(function (f) {
87+
return path.join(unittestsDirectory, f);
88+
}));
8489

8590
var librarySourceMap = [
8691
{ target: "lib.core.d.ts", sources: ["core.d.ts"] },

‎src/harness/runner.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
// ///<reference path='fourslashRunner.ts' />
1919
/// <reference path='projectsRunner.ts' />
2020
/// <reference path='rwcRunner.ts' />
21-
/// <reference path='unittestrunner.ts' />
2221

2322
function runTests(runners: RunnerBase[]) {
2423
if (reverse) {
@@ -67,9 +66,6 @@ if (testConfigFile !== '') {
6766
case 'fourslash-generated':
6867
runners.push(new GeneratedFourslashRunner());
6968
break;
70-
case 'unittests':
71-
runners.push(new UnitTestRunner());
72-
break;
7369
case 'rwc':
7470
runners.push(new RWCRunner());
7571
break;
@@ -93,9 +89,6 @@ if (runners.length === 0) {
9389
// language services
9490
runners.push(new FourslashRunner());
9591
//runners.push(new GeneratedFourslashRunner());
96-
97-
// unittests
98-
runners.push(new UnitTestRunner());
9992
}
10093

10194
sys.newLine = '\r\n';

‎src/harness/unittestrunner.ts‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎tests/cases/unittests/services/colorization.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
interface Classification {
1+
/// <reference path="..\..\..\..\src\harness\external\mocha.d.ts" />
2+
/// <reference path="..\..\..\..\src\harness\harnessLanguageService.ts" />
3+
4+
interface Classification {
25
position: number;
36
length: number;
47
class: ts.TokenClass;
@@ -66,7 +69,7 @@ describe('Colorization', function () {
6669
function numberLiteral(text: string) { return { value: text, class: ts.TokenClass.NumberLiteral }; }
6770
function stringLiteral(text: string) { return { value: text, class: ts.TokenClass.StringLiteral }; }
6871
function regExpLiteral(text: string) { return { value: text, class: ts.TokenClass.RegExpLiteral }; }
69-
function finalEndOfLineState(value: number) { return { value: value, class: undefined }; }
72+
function finalEndOfLineState(value: number) { return { value: value, class: <ts.TokenClass>undefined }; }
7073

7174
function test(text: string, initialEndOfLineState: ts.EndOfLineState, ...expectedEntries: ClassificationEntry[]): void {
7275
var result = getClassifications(text, initialEndOfLineState);
@@ -253,7 +256,7 @@ describe('Colorization', function () {
253256
identifier("Foo"),
254257
operator("<"),
255258
identifier("Foo"),
256-
punctuation(","),
259+
operator(","),
257260
identifier("Foo"),
258261
operator("<"),
259262
identifier("number"),
@@ -265,8 +268,8 @@ describe('Colorization', function () {
265268
identifier("Foo"),
266269
operator("<"),
267270
identifier("Foo"),
268-
operator(">"
269-
identifier("keyword"),
271+
operator(">"),
272+
keyword("number"),
270273
finalEndOfLineState(ts.EndOfLineState.Start));
271274
});
272275
});

‎tests/cases/unittests/services/documentRegistry.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ describe("DocumentRegistry", () => {
55
var documentRegistry = ts.createDocumentRegistry();
66
var defaultCompilerOptions = ts.getDefaultCompilerOptions();
77

8-
var f1 = documentRegistry.acquireDocument("file1.ts", defaultCompilerOptions, TypeScript.ScriptSnapshot.fromString("var x = 1;"), 1, false);
9-
var f2 = documentRegistry.acquireDocument("file1.ts", defaultCompilerOptions, TypeScript.ScriptSnapshot.fromString("var x = 1;"), 1, false);
8+
var f1 = documentRegistry.acquireDocument("file1.ts", defaultCompilerOptions, TypeScript.ScriptSnapshot.fromString("var x = 1;"), "1", false);
9+
var f2 = documentRegistry.acquireDocument("file1.ts", defaultCompilerOptions, TypeScript.ScriptSnapshot.fromString("var x = 1;"), "1", false);
1010

1111
assert(f1 === f2, "DocumentRegistry should return the same document for the same name");
1212
});
@@ -17,21 +17,21 @@ describe("DocumentRegistry", () => {
1717

1818
// change compilation setting that doesn't affect parsing - should have the same document
1919
compilerOptions.declaration = true;
20-
var f1 = documentRegistry.acquireDocument("file1.ts", compilerOptions, TypeScript.ScriptSnapshot.fromString("var x = 1;"), 1, false);
20+
var f1 = documentRegistry.acquireDocument("file1.ts", compilerOptions, TypeScript.ScriptSnapshot.fromString("var x = 1;"), "1", false);
2121
compilerOptions.declaration = false;
22-
var f2 = documentRegistry.acquireDocument("file1.ts", compilerOptions, TypeScript.ScriptSnapshot.fromString("var x = 1;"), 1, false);
22+
var f2 = documentRegistry.acquireDocument("file1.ts", compilerOptions, TypeScript.ScriptSnapshot.fromString("var x = 1;"), "1", false);
2323

2424
assert(f1 === f2, "Expected to have the same document instance");
2525

2626

2727
// change value of compilation setting that is used during production of AST - new document is required
2828
compilerOptions.target = ts.ScriptTarget.ES3;
29-
var f3 = documentRegistry.acquireDocument("file1.ts", compilerOptions, TypeScript.ScriptSnapshot.fromString("var x = 1;"), 1, false);
29+
var f3 = documentRegistry.acquireDocument("file1.ts", compilerOptions, TypeScript.ScriptSnapshot.fromString("var x = 1;"), "1", false);
3030

3131
assert(f1 !== f3, "Changed target: Expected to have different instances of document");
3232

3333
compilerOptions.module = ts.ModuleKind.CommonJS;
34-
var f4 = documentRegistry.acquireDocument("file1.ts", compilerOptions, TypeScript.ScriptSnapshot.fromString("var x = 1;"), 1, false);
34+
var f4 = documentRegistry.acquireDocument("file1.ts", compilerOptions, TypeScript.ScriptSnapshot.fromString("var x = 1;"), "1", false);
3535

3636
assert(f1 !== f4, "Changed module: Expected to have different instances of document");
3737
});

0 commit comments

Comments
 (0)