Skip to content

Commit dbb1252

Browse files
author
Andy
authored
Merge pull request #15140 from Microsoft/configuration-extension-tests
configurationExtension tests: Use objects instead of strings for readability
2 parents 8324244 + fe007cc commit dbb1252

File tree

1 file changed

+79
-78
lines changed

1 file changed

+79
-78
lines changed

Diff for: src/harness/unittests/configurationExtension.ts

+79-78
Original file line numberDiff line numberDiff line change
@@ -2,91 +2,92 @@
22
/// <reference path="..\virtualFileSystem.ts" />
33

44
namespace ts {
5-
const testContents = createMapFromTemplate({
6-
"/dev/tsconfig.json": `{
7-
"extends": "./configs/base",
8-
"files": [
9-
"main.ts",
10-
"supplemental.ts"
11-
]
12-
}`,
13-
"/dev/tsconfig.nostrictnull.json": `{
14-
"extends": "./tsconfig",
15-
"compilerOptions": {
16-
"strictNullChecks": false
17-
}
18-
}`,
19-
"/dev/configs/base.json": `{
20-
"compilerOptions": {
21-
"allowJs": true,
22-
"noImplicitAny": true,
23-
"strictNullChecks": true
24-
}
25-
}`,
26-
"/dev/configs/tests.json": `{
27-
"compilerOptions": {
28-
"preserveConstEnums": true,
29-
"removeComments": false,
30-
"sourceMap": true
31-
},
32-
"exclude": [
33-
"../tests/baselines",
34-
"../tests/scenarios"
35-
],
36-
"include": [
37-
"../tests/**/*.ts"
38-
]
39-
}`,
40-
"/dev/circular.json": `{
41-
"extends": "./circular2",
42-
"compilerOptions": {
43-
"module": "amd"
44-
}
45-
}`,
46-
"/dev/circular2.json": `{
47-
"extends": "./circular",
48-
"compilerOptions": {
49-
"module": "commonjs"
50-
}
51-
}`,
52-
"/dev/missing.json": `{
53-
"extends": "./missing2",
54-
"compilerOptions": {
55-
"types": []
56-
}
57-
}`,
58-
"/dev/failure.json": `{
59-
"extends": "./failure2.json",
60-
"compilerOptions": {
61-
"typeRoots": []
62-
}
63-
}`,
64-
"/dev/failure2.json": `{
65-
"excludes": ["*.js"]
66-
}`,
67-
"/dev/configs/first.json": `{
68-
"extends": "./base",
69-
"compilerOptions": {
70-
"module": "commonjs"
71-
},
72-
"files": ["../main.ts"]
73-
}`,
74-
"/dev/configs/second.json": `{
75-
"extends": "./base",
76-
"compilerOptions": {
77-
"module": "amd"
78-
},
79-
"include": ["../supplemental.*"]
80-
}`,
81-
"/dev/extends.json": `{ "extends": 42 }`,
82-
"/dev/extends2.json": `{ "extends": "configs/base" }`,
5+
const testContentsJson = createMapFromTemplate({
6+
"/dev/tsconfig.json": {
7+
extends: "./configs/base",
8+
files: [
9+
"main.ts",
10+
"supplemental.ts"
11+
]
12+
},
13+
"/dev/tsconfig.nostrictnull.json": {
14+
extends: "./tsconfig",
15+
compilerOptions: {
16+
strictNullChecks: false
17+
}
18+
},
19+
"/dev/configs/base.json": {
20+
compilerOptions: {
21+
allowJs: true,
22+
noImplicitAny: true,
23+
strictNullChecks: true
24+
}
25+
},
26+
"/dev/configs/tests.json": {
27+
compilerOptions: {
28+
"preserveConstEnums": true,
29+
"removeComments": false,
30+
"sourceMap": true
31+
},
32+
exclude: [
33+
"../tests/baselines",
34+
"../tests/scenarios"
35+
],
36+
include: [
37+
"../tests/**/*.ts"
38+
]
39+
},
40+
"/dev/circular.json": {
41+
extends: "./circular2",
42+
compilerOptions: {
43+
module: "amd"
44+
}
45+
},
46+
"/dev/circular2.json": {
47+
extends: "./circular",
48+
compilerOptions: {
49+
module: "commonjs"
50+
}
51+
},
52+
"/dev/missing.json": {
53+
extends: "./missing2",
54+
compilerOptions: {
55+
"types": []
56+
}
57+
},
58+
"/dev/failure.json": {
59+
extends: "./failure2.json",
60+
compilerOptions: {
61+
typeRoots: []
62+
}
63+
},
64+
"/dev/failure2.json": {
65+
excludes: ["*.js"]
66+
},
67+
"/dev/configs/first.json": {
68+
extends: "./base",
69+
compilerOptions: {
70+
module: "commonjs"
71+
},
72+
files: ["../main.ts"]
73+
},
74+
"/dev/configs/second.json": {
75+
extends: "./base",
76+
compilerOptions: {
77+
module: "amd"
78+
},
79+
include: ["../supplemental.*"]
80+
},
81+
"/dev/extends.json": { extends: 42 },
82+
"/dev/extends2.json": { extends: "configs/base" },
8383
"/dev/main.ts": "",
8484
"/dev/supplemental.ts": "",
8585
"/dev/tests/unit/spec.ts": "",
8686
"/dev/tests/utils.ts": "",
8787
"/dev/tests/scenarios/first.json": "",
8888
"/dev/tests/baselines/first/output.ts": ""
8989
});
90+
const testContents = mapEntries(testContentsJson, (k, v) => [k, typeof v === "string" ? v : JSON.stringify(v)]);
9091

9192
const caseInsensitiveBasePath = "c:/dev/";
9293
const caseInsensitiveHost = new Utils.MockParseConfigHost(caseInsensitiveBasePath, /*useCaseSensitiveFileNames*/ false, mapEntries(testContents, (key, content) => [`c:${key}`, content]));

0 commit comments

Comments
 (0)