Complicate the paths of the project for better sourcemap testing

RyanCavanaugh · RyanCavanaugh · commit e40778070ed3 · 2018-06-05T14:06:13.000-07:00
diff --git a/src/harness/unittests/tsbuild.ts b/src/harness/unittests/tsbuild.ts
@@ -239,13 +239,23 @@ namespace ts {
             builder.buildAllProjects();
             assertDiagnosticMessages(/*none*/);
 
-            it("Generates files matching the baseline", () => {
-                Harness.Baseline.runBaseline("outfile-concat.js", () => {
-                    return fs.readFileSync("/src/third/third-output.js", 'utf-8');
+            const files = [
+                "/src/third/thirdjs/output/third-output.js",
+                "/src/third/thirdjs/output/third-output.js.map"
+            ];
+
+
+            for (const file of files) {
+                it(`Generates files matching the baseline - ${file}`, () => {
+                    Harness.Baseline.runBaseline(getBaseFileName(file), () => {
+                        return fs.readFileSync(file, 'utf-8');
+                    });
                 });
-    
-                Harness.Baseline.runBaseline("outfile-concat.js.map", () => {
-                    return fs.readFileSync("/src/third/third-output.js.map", 'utf-8');
+            }
+
+            it(`Generates files matching the baseline - file listing for outFile-concat`, () => {
+                Harness.Baseline.runBaseline("outfile-concat-fileListing.txt", () => {
+                    return fs.getFileListing();
                 });
             });
         });
diff --git a/src/harness/vfs.ts b/src/harness/vfs.ts
@@ -353,10 +353,7 @@ namespace vfs {
             if (!result.node) this._mkdir(result);
         }
 
-        /**
-         * Print diagnostic information about the structure of the file system to the console.
-         */
-        public debugPrint(): void {
+        public getFileListing(): string {
             let result = "";
             const printLinks = (dirname: string | undefined, links: collections.SortedMap<string, Inode>) => {
                 const iterator = collections.getIterator(links);
@@ -384,7 +381,14 @@ namespace vfs {
                 }
             };
             printLinks(/*dirname*/ undefined, this._getRootLinks());
-            console.log(result);
+            return result;
+        }
+
+        /**
+         * Print diagnostic information about the structure of the file system to the console.
+         */
+        public debugPrint(): void {
+            console.log(this.getFileListing());
         }
 
         // POSIX API (aligns with NodeJS "fs" module API)
diff --git a/tests/baselines/reference/outfile-concat-fileListing.txt b/tests/baselines/reference/outfile-concat-fileListing.txt
@@ -0,0 +1,39 @@
+*/
+ /lib/
+ /lib/lib.d.ts
+ /src/
+ /src/2/
+ /src/2/second-output.d.ts
+ /src/2/second-output.d.ts.map
+ /src/2/second-output.js
+ /src/2/second-output.js.map
+ /src/first/
+ /src/first/bin/
+ /src/first/bin/first-output.d.ts
+ /src/first/bin/first-output.d.ts.map
+ /src/first/bin/first-output.js
+ /src/first/bin/first-output.js.map
+ /src/first/first_part1.ts
+ /src/first/first_part2.ts
+ /src/first/first_part3.ts
+ /src/first/tsconfig.json
+ /src/first_part1.ts
+ /src/first_part2.ts
+ /src/first_part3.ts
+ /src/second/
+ /src/second/second_part1.ts
+ /src/second/second_part2.ts
+ /src/second/tsconfig.json
+ /src/second_part1.ts
+ /src/second_part2.ts
+ /src/third/
+ /src/third/third_part1.ts
+ /src/third/thirdjs/
+ /src/third/thirdjs/output/
+ /src/third/thirdjs/output/third-output.d.ts
+ /src/third/thirdjs/output/third-output.d.ts.map
+ /src/third/thirdjs/output/third-output.js
+ /src/third/thirdjs/output/third-output.js.map
+ /src/third/tsconfig.json
+ /src/third_part1.ts
+ /src/tsconfig.json
diff --git a/tests/baselines/reference/third-output.js b/tests/baselines/reference/third-output.js
diff --git a/tests/baselines/reference/third-output.js.map b/tests/baselines/reference/third-output.js.map
diff --git a/tests/projects/outfile-concat/first/tsconfig.json b/tests/projects/outfile-concat/first/tsconfig.json
@@ -7,7 +7,7 @@
     "sourceMap": true,
     "declarationMap": true,
     "declaration": true,
-    "outFile": "./first-output.js"
+    "outFile": "./bin/first-output.js"
   },
   "references": [
   ]
diff --git a/tests/projects/outfile-concat/second/tsconfig.json b/tests/projects/outfile-concat/second/tsconfig.json
@@ -7,7 +7,7 @@
     "sourceMap": true,
     "declarationMap": true,
     "declaration": true,
-    "outFile": "./second-output.js"
+    "outFile": "../2/second-output.js"
   },
   "references": [
   ]
diff --git a/tests/projects/outfile-concat/third/tsconfig.json b/tests/projects/outfile-concat/third/tsconfig.json
@@ -7,7 +7,7 @@
     "sourceMap": true,
     "declarationMap": true,
     "declaration": true,
-    "outFile": "./third-output.js"
+    "outFile": "./thirdjs/output/third-output.js"
   },
   "references": [
     { "path": "../first", "prepend": true },

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"sourceMap": true,`
`8`	`8`	`"declarationMap": true,`
`9`	`9`	`"declaration": true,`
`10`		`- "outFile": "./first-output.js"`
	`10`	`+ "outFile": "./bin/first-output.js"`
`11`	`11`	`},`
`12`	`12`	`"references": [`
`13`	`13`	`]`