Skip to content

Commit 7de6083

Browse files
aozgaaaozgaa
authored
Merge pull request microsoft#20291 from Microsoft/dev/aozgaa/tsserverProjectTestOrganization
Dev/aozgaa/tsserver project test organization
2 parents 8f23bf8 + e01c0be commit 7de6083

1 file changed

Lines changed: 30 additions & 30 deletions

File tree

‎src/harness/unittests/tsserverProjectSystem.ts‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ namespace ts.projectSystem {
473473
}
474474
}
475475

476-
describe("tsserverProjectSystem", () => {
476+
describe("tsserverProjectSystem general functionality", () => {
477477
const commonFile1: FileOrFolder = {
478478
path: "/a/b/commonFile1.ts",
479479
content: "let x = 1"
@@ -2806,7 +2806,7 @@ namespace ts.projectSystem {
28062806

28072807
});
28082808

2809-
describe("Proper errors", () => {
2809+
describe("tsserverProjectSystem Proper errors", () => {
28102810
it("document is not contained in project", () => {
28112811
const file1 = {
28122812
path: "/a/b/app.ts",
@@ -2960,7 +2960,7 @@ namespace ts.projectSystem {
29602960
});
29612961
});
29622962

2963-
describe("autoDiscovery", () => {
2963+
describe("tsserverProjectSystem autoDiscovery", () => {
29642964
it("does not depend on extension", () => {
29652965
const file1 = {
29662966
path: "/a/b/app.html",
@@ -2983,7 +2983,7 @@ namespace ts.projectSystem {
29832983
});
29842984
});
29852985

2986-
describe("extra resolution pass in lshost", () => {
2986+
describe("tsserverProjectSystem extra resolution pass in lshost", () => {
29872987
it("can load typings that are proper modules", () => {
29882988
const file1 = {
29892989
path: "/a/b/app.js",
@@ -3025,7 +3025,7 @@ namespace ts.projectSystem {
30253025
});
30263026
});
30273027

3028-
describe("navigate-to for javascript project", () => {
3028+
describe("tsserverProjectSystem navigate-to for javascript project", () => {
30293029
function containsNavToItem(items: protocol.NavtoItem[], itemName: string, itemKind: string) {
30303030
return find(items, item => item.name === itemName && item.kind === itemKind) !== undefined;
30313031
}
@@ -3054,7 +3054,7 @@ namespace ts.projectSystem {
30543054
});
30553055
});
30563056

3057-
describe("external projects", () => {
3057+
describe("tsserverProjectSystem external projects", () => {
30583058
it("correctly handling add/remove tsconfig - 1", () => {
30593059
const f1 = {
30603060
path: "/a/b/app.ts",
@@ -3280,7 +3280,7 @@ namespace ts.projectSystem {
32803280
});
32813281
});
32823282

3283-
describe("prefer typings to js", () => {
3283+
describe("tsserverProjectSystem prefer typings to js", () => {
32843284
it("during second resolution pass", () => {
32853285
const typingsCacheLocation = "/a/typings";
32863286
const f1 = {
@@ -3308,7 +3308,7 @@ namespace ts.projectSystem {
33083308
});
33093309
});
33103310

3311-
describe("format settings", () => {
3311+
describe("tsserverProjectSystem format settings", () => {
33123312
it("can be set globally", () => {
33133313
const f1 = {
33143314
path: "/a/b/app.ts",
@@ -3349,7 +3349,7 @@ namespace ts.projectSystem {
33493349
});
33503350
});
33513351

3352-
describe("watching @types", () => {
3352+
describe("tsserverProjectSystem watching @types", () => {
33533353
it("works correctly when typings are added or removed", () => {
33543354
const f1 = {
33553355
path: "/a/b/app.ts",
@@ -3395,7 +3395,7 @@ namespace ts.projectSystem {
33953395
});
33963396
});
33973397

3398-
describe("Open-file", () => {
3398+
describe("tsserverProjectSystem Open-file", () => {
33993399
it("can be reloaded with empty content", () => {
34003400
const f = {
34013401
path: "/a/b/app.ts",
@@ -3470,7 +3470,7 @@ namespace ts.projectSystem {
34703470
});
34713471
});
34723472

3473-
describe("Language service", () => {
3473+
describe("tsserverProjectSystem Language service", () => {
34743474
it("should work correctly on case-sensitive file systems", () => {
34753475
const lib = {
34763476
path: "/a/Lib/lib.d.ts",
@@ -3488,7 +3488,7 @@ namespace ts.projectSystem {
34883488
});
34893489
});
34903490

3491-
describe("rename a module file and rename back", () => {
3491+
describe("tsserverProjectSystem rename a module file and rename back", () => {
34923492
it("should restore the states for inferred projects", () => {
34933493
const moduleFile = {
34943494
path: "/a/b/moduleFile.ts",
@@ -3623,7 +3623,7 @@ namespace ts.projectSystem {
36233623
});
36243624
});
36253625

3626-
describe("add the missing module file for inferred project", () => {
3626+
describe("tsserverProjectSystem add the missing module file for inferred project", () => {
36273627
it("should remove the `module not found` error", () => {
36283628
const moduleFile = {
36293629
path: "/a/b/moduleFile.ts",
@@ -3729,7 +3729,7 @@ namespace ts.projectSystem {
37293729
});
37303730
});
37313731

3732-
describe("Configure file diagnostics events", () => {
3732+
describe("tsserverProjectSystem Configure file diagnostics events", () => {
37333733

37343734
it("are generated when the config file has errors", () => {
37353735
const file = {
@@ -3845,7 +3845,7 @@ namespace ts.projectSystem {
38453845
});
38463846
});
38473847

3848-
describe("skipLibCheck", () => {
3848+
describe("tsserverProjectSystem skipLibCheck", () => {
38493849
it("should be turned on for js-only inferred projects", () => {
38503850
const file1 = {
38513851
path: "/a/b/file1.js",
@@ -4073,7 +4073,7 @@ namespace ts.projectSystem {
40734073
});
40744074
});
40754075

4076-
describe("non-existing directories listed in config file input array", () => {
4076+
describe("tsserverProjectSystem non-existing directories listed in config file input array", () => {
40774077
it("should be tolerated without crashing the server", () => {
40784078
const configFile = {
40794079
path: "/a/b/tsconfig.json",
@@ -4128,7 +4128,7 @@ namespace ts.projectSystem {
41284128
});
41294129
});
41304130

4131-
describe("reload", () => {
4131+
describe("tsserverProjectSystem reload", () => {
41324132
it("should work with temp file", () => {
41334133
const f1 = {
41344134
path: "/a/b/app.ts",
@@ -4267,7 +4267,7 @@ namespace ts.projectSystem {
42674267
});
42684268
});
42694269

4270-
describe("Inferred projects", () => {
4270+
describe("tsserverProjectSystem Inferred projects", () => {
42714271
it("should support files without extensions", () => {
42724272
const f = {
42734273
path: "/a/compile",
@@ -4495,7 +4495,7 @@ namespace ts.projectSystem {
44954495
});
44964496
});
44974497

4498-
describe("No overwrite emit error", () => {
4498+
describe("tsserverProjectSystem No overwrite emit error", () => {
44994499
it("for inferred project", () => {
45004500
const f1 = {
45014501
path: "/a/b/f1.js",
@@ -4578,7 +4578,7 @@ namespace ts.projectSystem {
45784578
});
45794579
});
45804580

4581-
describe("emit with outFile or out setting", () => {
4581+
describe("tsserverProjectSystem emit with outFile or out setting", () => {
45824582
function test(opts: CompilerOptions, expectedUsesOutFile: boolean) {
45834583
const f1 = {
45844584
path: "/a/a.ts",
@@ -4626,7 +4626,7 @@ namespace ts.projectSystem {
46264626
});
46274627
});
46284628

4629-
describe("import helpers", () => {
4629+
describe("tsserverProjectSystem import helpers", () => {
46304630
it("should not crash in tsserver", () => {
46314631
const f1 = {
46324632
path: "/a/app.ts",
@@ -4643,7 +4643,7 @@ namespace ts.projectSystem {
46434643
});
46444644
});
46454645

4646-
describe("searching for config file", () => {
4646+
describe("tsserverProjectSystem searching for config file", () => {
46474647
it("should stop at projectRootPath if given", () => {
46484648
const f1 = {
46494649
path: "/a/file1.ts",
@@ -4735,7 +4735,7 @@ namespace ts.projectSystem {
47354735
});
47364736
});
47374737

4738-
describe("cancellationToken", () => {
4738+
describe("tsserverProjectSystem cancellationToken", () => {
47394739
// Disable sourcemap support for the duration of the test, as sourcemapping the errors generated during this test is slow and not something we care to test
47404740
let oldPrepare: ts.AnyFunction;
47414741
before(() => {
@@ -4998,7 +4998,7 @@ namespace ts.projectSystem {
49984998
});
49994999
});
50005000

5001-
describe("occurence highlight on string", () => {
5001+
describe("tsserverProjectSystem occurence highlight on string", () => {
50025002
it("should be marked if only on string values", () => {
50035003
const file1: FileOrFolder = {
50045004
path: "/a/b/file1.ts",
@@ -5044,7 +5044,7 @@ namespace ts.projectSystem {
50445044
});
50455045
});
50465046

5047-
describe("maxNodeModuleJsDepth for inferred projects", () => {
5047+
describe("tsserverProjectSystem maxNodeModuleJsDepth for inferred projects", () => {
50485048
it("should be set to 2 if the project has js root files", () => {
50495049
const file1: FileOrFolder = {
50505050
path: "/a/b/file1.js",
@@ -5098,7 +5098,7 @@ namespace ts.projectSystem {
50985098
});
50995099
});
51005100

5101-
describe("Options Diagnostic locations reported correctly with changes in configFile contents", () => {
5101+
describe("tsserverProjectSystem Options Diagnostic locations reported correctly with changes in configFile contents", () => {
51025102
it("when options change", () => {
51035103
const file = {
51045104
path: "/a/b/app.ts",
@@ -5162,7 +5162,7 @@ namespace ts.projectSystem {
51625162
});
51635163
});
51645164

5165-
describe("refactors", () => {
5165+
describe("tsserverProjectSystem refactors", () => {
51665166
it("use formatting options", () => {
51675167
const file = {
51685168
path: "/a.ts",
@@ -5218,7 +5218,7 @@ namespace ts.projectSystem {
52185218
});
52195219
});
52205220

5221-
describe("CachingFileSystemInformation", () => {
5221+
describe("tsserverProjectSystem CachingFileSystemInformation", () => {
52225222
enum CalledMapsWithSingleArg {
52235223
fileExists = "fileExists",
52245224
directoryExists = "directoryExists",
@@ -5835,7 +5835,7 @@ namespace ts.projectSystem {
58355835
});
58365836
});
58375837

5838-
describe("ProjectsChangedInBackground", () => {
5838+
describe("tsserverProjectSystem ProjectsChangedInBackground", () => {
58395839
function verifyFiles(caption: string, actual: ReadonlyArray<string>, expected: ReadonlyArray<string>) {
58405840
assert.equal(actual.length, expected.length, `Incorrect number of ${caption}. Actual: ${actual} Expected: ${expected}`);
58415841
const seen = createMap<true>();
@@ -6431,7 +6431,7 @@ namespace ts.projectSystem {
64316431
});
64326432
});
64336433

6434-
describe("Watched recursive directories with windows style file system", () => {
6434+
describe("tsserverProjectSystem Watched recursive directories with windows style file system", () => {
64356435
function verifyWatchedDirectories(useProjectAtRoot: boolean) {
64366436
const root = useProjectAtRoot ? "c:/" : "c:/myfolder/allproject/";
64376437
const configFile: FileOrFolder = {

0 commit comments

Comments
 (0)