Some refactoring of baselines

Author: sheetalkamat

src/testRunner/unittests/tsbuild/amdModulesWithOut.ts

@@ -19,7 +19,7 @@ namespace ts {
             modifyFs,
             modifyAgainFs
         }: VerifyOutFileScenarioInput) {
-            verifyTscIncrementalEdits({
+            verifyTscSerializedIncrementalEdits({
                 scenario: "amdModulesWithOut",
                 subScenario,
                 fs: () => outFileFs,

src/testRunner/unittests/tsbuild/configFileErrors.ts

@@ -9,7 +9,7 @@ namespace ts {
     });
 
     describe("unittests:: tsbuild:: configFileErrors:: reports syntax errors in config file", () => {
-        verifyTscIncrementalEdits({
+        verifyTscSerializedIncrementalEdits({
             scenario: "configFileErrors",
             subScenario: "reports syntax errors in config file",
             fs: () => loadProjectFromFiles({

src/testRunner/unittests/tsbuild/outFile.ts

@@ -1,11 +1,13 @@
 namespace ts {
     describe("unittests:: tsbuild:: outFile::", () => {
         let outFileFs: vfs.FileSystem;
+        let outFileWithBuildFs: vfs.FileSystem;
         before(() => {
             outFileFs = loadProjectFromDisk("tests/projects/outfile-concat");
         });
         after(() => {
             outFileFs = undefined!;
+            outFileWithBuildFs = undefined!;
         });
 
         function createSolutionBuilder(host: fakes.SolutionBuilderHost, baseOptions?: BuildOptions) {
@@ -61,7 +63,7 @@ namespace ts {
                 incrementalScenarios,
             };
             return incrementalScenarios.length ?
-                verifyTscIncrementalEdits(input) :
+                verifyTscSerializedIncrementalEdits(input) :
                 verifyTsc(input);
         }
 
@@ -104,12 +106,13 @@ namespace ts {
         });
 
         function getOutFileFsAfterBuild() {
+            if (outFileWithBuildFs) return outFileWithBuildFs;
             const fs = outFileFs.shadow();
             const host = fakes.SolutionBuilderHost.create(fs);
             const builder = createSolutionBuilder(host);
             builder.build();
             fs.makeReadonly();
-            return fs;
+            return outFileWithBuildFs = fs;
         }
 
         verifyTscSerializedIncrementalEdits({

src/testRunner/unittests/tsbuild/publicApi.ts

@@ -70,7 +70,7 @@ export function f22() { } // trailing`,
                 const baseFsPatch = inputFs.diff(/*base*/ undefined, { baseIsNotShadowRoot: true });
                 const patch = fs.diff(inputFs, { includeChangedFileWithSameContent: true });
                 return {
-                    file: `tsbuild/$publicAPI/${BuildKind.Initial}/${"build with custom transformers".split(" ").join("-")}.js`,
+                    file: `tsbuild/publicAPI/build-with-custom-transformers.js`,
                     text: `Input::
 ${baseFsPatch ? vfs.formatPatch(baseFsPatch) : ""}
 

src/testRunner/unittests/tsbuild/sample.ts

@@ -1,12 +1,14 @@
 namespace ts {
     describe("unittests:: tsbuild:: on 'sample1' project", () => {
         let projFs: vfs.FileSystem;
+        let projFsWithBuild: vfs.FileSystem;
         before(() => {
             projFs = loadProjectFromDisk("tests/projects/sample1");
         });
 
         after(() => {
             projFs = undefined!; // Release the contents
+            projFsWithBuild = undefined!;
         });
 
         function getTsBuildProjectFile(project: string, file: string): tscWatch.File {
@@ -17,12 +19,13 @@ namespace ts {
         }
 
         function getSampleFsAfterBuild() {
+            if (projFsWithBuild) return projFsWithBuild;
             const fs = projFs.shadow();
             const host = fakes.SolutionBuilderHost.create(fs);
             const builder = createSolutionBuilder(host, ["/src/tests"], {});
             builder.build();
             fs.makeReadonly();
-            return fs;
+            return projFsWithBuild = fs;
         }
 
         describe("sanity check of clean build of 'sample1' project", () => {
@@ -111,7 +114,7 @@ namespace ts {
         });
 
         describe("can detect when and what to rebuild", () => {
-            verifyTscIncrementalEdits({
+            verifyTscSerializedIncrementalEdits({
                 scenario: "sample1",
                 subScenario: "can detect when and what to rebuild",
                 fs: getSampleFsAfterBuild,
@@ -129,18 +132,6 @@ namespace ts {
                         buildKind: BuildKind.IncrementalDtsChange,
                         modifyFs: fs => replaceText(fs, "/src/core/index.ts", "HELLO WORLD", "WELCOME PLANET"),
                     },
-                    {
-                        subScenario: "indicates that it would skip builds during a dry build",
-                        buildKind: BuildKind.IncrementalDtsUnchanged,
-                        modifyFs: noop,
-                        commandLineArgs: ["--b", "/src/tests", "--dry"],
-                    },
-                    {
-                        subScenario: "rebuilds from start if force option is set",
-                        buildKind: BuildKind.IncrementalDtsChange,
-                        modifyFs: noop,
-                        commandLineArgs: ["--b", "/src/tests", "--verbose", "--force"],
-                    },
                     {
                         subScenario: "rebuilds when tsconfig changes",
                         buildKind: BuildKind.IncrementalDtsChange,
@@ -149,6 +140,20 @@ namespace ts {
                 ]
             });
 
+            verifyTsc({
+                scenario: "sample1",
+                subScenario: "indicates that it would skip builds during a dry build",
+                fs: getSampleFsAfterBuild,
+                commandLineArgs: ["--b", "/src/tests", "--dry"],
+            });
+
+            verifyTsc({
+                scenario: "sample1",
+                subScenario: "rebuilds from start if force option is set",
+                fs: getSampleFsAfterBuild,
+                commandLineArgs: ["--b", "/src/tests", "--verbose", "--force"],
+            });
+
             verifyTscCompileLike(testTscCompileLike, {
                 scenario: "sample1",
                 subScenario: "rebuilds completely when version in tsbuildinfo doesnt match ts version",