Merge pull request microsoft#15140 from Microsoft/configuration-extension-tests

Andy · web-flow · commit dbb1252e6aff · 2017-04-14T11:47:38.000-07:00
configurationExtension tests: Use objects instead of strings for readability
diff --git a/src/harness/unittests/configurationExtension.ts b/src/harness/unittests/configurationExtension.ts
@@ -2,91 +2,92 @@
 /// <reference path="..\virtualFileSystem.ts" />
 
 namespace ts {
-    const testContents = createMapFromTemplate({
-        "/dev/tsconfig.json": `{
-  "extends": "./configs/base",
-  "files": [
-    "main.ts",
-    "supplemental.ts"
-  ]
-}`,
-        "/dev/tsconfig.nostrictnull.json": `{
-  "extends": "./tsconfig",
-  "compilerOptions": {
-    "strictNullChecks": false
-  }
-}`,
-        "/dev/configs/base.json": `{
-  "compilerOptions": {
-    "allowJs": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true
-  }
-}`,
-        "/dev/configs/tests.json": `{
-  "compilerOptions": {
-    "preserveConstEnums": true,
-    "removeComments": false,
-    "sourceMap": true
-  },
-  "exclude": [
-    "../tests/baselines",
-    "../tests/scenarios"
-  ],
-  "include": [
-    "../tests/**/*.ts"
-  ]
-}`,
-        "/dev/circular.json": `{
-    "extends": "./circular2",
-    "compilerOptions": {
-        "module": "amd"
-    }
-}`,
-        "/dev/circular2.json": `{
-    "extends": "./circular",
-    "compilerOptions": {
-        "module": "commonjs"
-    }
-}`,
-        "/dev/missing.json": `{
-    "extends": "./missing2",
-    "compilerOptions": {
-        "types": []
-    }
-}`,
-        "/dev/failure.json": `{
-    "extends": "./failure2.json",
-    "compilerOptions": {
-        "typeRoots": []
-    }
-}`,
-        "/dev/failure2.json": `{
-    "excludes": ["*.js"]
-}`,
-        "/dev/configs/first.json": `{
-    "extends": "./base",
-    "compilerOptions": {
-        "module": "commonjs"
-    },
-    "files": ["../main.ts"]
-}`,
-        "/dev/configs/second.json": `{
-    "extends": "./base",
-    "compilerOptions": {
-        "module": "amd"
-    },
-    "include": ["../supplemental.*"]
-}`,
-        "/dev/extends.json": `{ "extends": 42 }`,
-        "/dev/extends2.json": `{ "extends": "configs/base" }`,
+    const testContentsJson = createMapFromTemplate({
+        "/dev/tsconfig.json": {
+            extends: "./configs/base",
+            files: [
+                "main.ts",
+                "supplemental.ts"
+            ]
+        },
+        "/dev/tsconfig.nostrictnull.json": {
+            extends: "./tsconfig",
+            compilerOptions: {
+                strictNullChecks: false
+            }
+        },
+        "/dev/configs/base.json": {
+            compilerOptions: {
+                allowJs: true,
+                noImplicitAny: true,
+                strictNullChecks: true
+            }
+        },
+        "/dev/configs/tests.json": {
+            compilerOptions: {
+                "preserveConstEnums": true,
+                "removeComments": false,
+                "sourceMap": true
+            },
+            exclude: [
+                "../tests/baselines",
+                "../tests/scenarios"
+            ],
+            include: [
+                "../tests/**/*.ts"
+            ]
+        },
+        "/dev/circular.json": {
+            extends: "./circular2",
+            compilerOptions: {
+                module: "amd"
+            }
+        },
+        "/dev/circular2.json": {
+            extends: "./circular",
+            compilerOptions: {
+                module: "commonjs"
+            }
+        },
+        "/dev/missing.json": {
+            extends: "./missing2",
+            compilerOptions: {
+                "types": []
+            }
+        },
+        "/dev/failure.json": {
+            extends: "./failure2.json",
+            compilerOptions: {
+                typeRoots: []
+            }
+        },
+        "/dev/failure2.json": {
+            excludes: ["*.js"]
+        },
+        "/dev/configs/first.json": {
+            extends: "./base",
+            compilerOptions: {
+                module: "commonjs"
+            },
+            files: ["../main.ts"]
+        },
+        "/dev/configs/second.json": {
+            extends: "./base",
+            compilerOptions: {
+                module: "amd"
+            },
+            include: ["../supplemental.*"]
+        },
+        "/dev/extends.json": { extends: 42 },
+        "/dev/extends2.json": { extends: "configs/base" },
         "/dev/main.ts": "",
         "/dev/supplemental.ts": "",
         "/dev/tests/unit/spec.ts": "",
         "/dev/tests/utils.ts": "",
         "/dev/tests/scenarios/first.json": "",
         "/dev/tests/baselines/first/output.ts": ""
     });
+    const testContents = mapEntries(testContentsJson, (k, v) => [k, typeof v === "string" ? v : JSON.stringify(v)]);
 
     const caseInsensitiveBasePath = "c:/dev/";
     const caseInsensitiveHost = new Utils.MockParseConfigHost(caseInsensitiveBasePath, /*useCaseSensitiveFileNames*/ false, mapEntries(testContents, (key, content) => [`c:${key}`, content]));
