Unify verifyTsc and verifyTscWithEdits and make them look like verifyTscWatch for easy copy paste

src/testRunner/unittests/tsbuild/amdModulesWithOut.ts

@@ -12,7 +12,6 @@ import {
     removeRest,
     replaceText,
     verifyTsc,
-    verifyTscWithEdits,
 } from "../tsc/helpers";
 
 describe("unittests:: tsbuild:: outFile:: on amd modules with --out", () => {
@@ -35,7 +34,7 @@ describe("unittests:: tsbuild:: outFile:: on amd modules with --out", () => {
         modifyFs,
         modifyAgainFs
     }: VerifyOutFileScenarioInput) {
-        verifyTscWithEdits({
+        verifyTsc({
             scenario: "amdModulesWithOut",
             subScenario,
             fs: () => outFileFs,
@@ -44,12 +43,12 @@ describe("unittests:: tsbuild:: outFile:: on amd modules with --out", () => {
             modifyFs,
             edits: [
                 {
-                    subScenario: "incremental-declaration-doesnt-change",
-                    modifyFs: fs => appendText(fs, "/src/lib/file1.ts", "console.log(x);")
+                    caption: "incremental-declaration-doesnt-change",
+                    edit: fs => appendText(fs, "/src/lib/file1.ts", "console.log(x);")
                 },
                 ...(modifyAgainFs ? [{
-                    subScenario: "incremental-headers-change-without-dts-changes",
-                    modifyFs: modifyAgainFs
+                    caption: "incremental-headers-change-without-dts-changes",
+                    edit: modifyAgainFs
                 }] : ts.emptyArray),
             ]
         });

src/testRunner/unittests/tsbuild/configFileErrors.ts

@@ -5,7 +5,6 @@ import {
     noChangeRun,
     replaceText,
     verifyTsc,
-    verifyTscWithEdits,
 } from "../tsc/helpers";
 import { dedent } from "../../_namespaces/Utils";
 
@@ -19,7 +18,7 @@ describe("unittests:: tsbuild:: configFileErrors:: when tsconfig extends the mis
 });
 
 describe("unittests:: tsbuild:: configFileErrors:: reports syntax errors in config file", () => {
-    verifyTscWithEdits({
+    verifyTsc({
         scenario: "configFileErrors",
         subScenario: "reports syntax errors in config file",
         fs: () => loadProjectFromFiles({
@@ -39,28 +38,28 @@ describe("unittests:: tsbuild:: configFileErrors:: reports syntax errors in conf
         commandLineArgs: ["--b", "/src/tsconfig.json"],
         edits: [
             {
-                modifyFs: fs => replaceText(fs, "/src/tsconfig.json", ",", `,
+                edit: fs => replaceText(fs, "/src/tsconfig.json", ",", `,
         "declaration": true,`),
-                subScenario: "reports syntax errors after change to config file",
+                caption: "reports syntax errors after change to config file",
                 discrepancyExplanation: () => [
                     "During incremental build, tsbuildinfo is not emitted, so declaration option is not present",
                     "Clean build has declaration option in tsbuildinfo",
                 ],
             },
             {
-                modifyFs: fs => appendText(fs, "/src/a.ts", "export function fooBar() { }"),
-                subScenario: "reports syntax errors after change to ts file",
+                edit: fs => appendText(fs, "/src/a.ts", "export function fooBar() { }"),
+                caption: "reports syntax errors after change to ts file",
             },
             noChangeRun,
             {
-                modifyFs: fs => fs.writeFileSync(
+                edit: fs => fs.writeFileSync(
                     "/src/tsconfig.json",
                     JSON.stringify({
                         compilerOptions: { composite: true, declaration: true },
                         files: ["a.ts", "b.ts"]
                     })
                 ),
-                subScenario: "builds after fixing config file errors"
+                caption: "builds after fixing config file errors"
             },
         ]
     });

src/testRunner/unittests/tsbuild/containerOnlyReferenced.ts

@@ -3,19 +3,19 @@ import {
     loadProjectFromFiles,
     noChangeOnlyRuns,
     replaceText,
-    verifyTscWithEdits,
+    verifyTsc,
 } from "../tsc/helpers";
 
 describe("unittests:: tsbuild:: when containerOnly project is referenced", () => {
-    verifyTscWithEdits({
+    verifyTsc({
         scenario: "containerOnlyReferenced",
         subScenario: "verify that subsequent builds after initial build doesnt build anything",
         fs: () => loadProjectFromDisk("tests/projects/containerOnlyReferenced"),
         commandLineArgs: ["--b", "/src", "--verbose"],
         edits: noChangeOnlyRuns
     });
 
-    verifyTscWithEdits({
+    verifyTsc({
         scenario: "containerOnlyReferenced",
         subScenario: "when solution is referenced indirectly",
         fs: () => loadProjectFromFiles({
@@ -41,8 +41,8 @@ describe("unittests:: tsbuild:: when containerOnly project is referenced", () =>
         }),
         commandLineArgs: ["--b", "/src/project4", "--verbose", "--explainFiles"],
         edits: [{
-            subScenario: "modify project3 file",
-            modifyFs: fs => replaceText(fs, "/src/project3/src/c.ts", "c = ", "cc = "),
+            caption: "modify project3 file",
+            edit: fs => replaceText(fs, "/src/project3/src/c.ts", "c = ", "cc = "),
         }],
     });
 });

src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts

@@ -2,7 +2,7 @@ import * as vfs from "../../_namespaces/vfs";
 import {
     loadProjectFromDisk,
     replaceText,
-    verifyTscWithEdits,
+    verifyTsc,
 } from "../tsc/helpers";
 
 describe("unittests:: tsbuild:: on project with emitDeclarationOnly set to true", () => {
@@ -15,7 +15,7 @@ describe("unittests:: tsbuild:: on project with emitDeclarationOnly set to true"
     });
 
     function verifyEmitDeclarationOnly(disableMap?: true) {
-        verifyTscWithEdits({
+        verifyTsc({
             subScenario: `only dts output in circular import project with emitDeclarationOnly${disableMap ? "" : " and declarationMap"}`,
             fs: () => projFs,
             scenario: "emitDeclarationOnly",
@@ -24,15 +24,15 @@ describe("unittests:: tsbuild:: on project with emitDeclarationOnly set to true"
                 (fs => replaceText(fs, "/src/tsconfig.json", `"declarationMap": true,`, "")) :
                 undefined,
             edits: [{
-                subScenario: "incremental-declaration-changes",
-                modifyFs: fs => replaceText(fs, "/src/src/a.ts", "b: B;", "b: B; foo: any;"),
+                caption: "incremental-declaration-changes",
+                edit: fs => replaceText(fs, "/src/src/a.ts", "b: B;", "b: B; foo: any;"),
             }],
         });
     }
     verifyEmitDeclarationOnly();
     verifyEmitDeclarationOnly(/*disableMap*/ true);
 
-    verifyTscWithEdits({
+    verifyTsc({
         subScenario: `only dts output in non circular imports project with emitDeclarationOnly`,
         fs: () => projFs,
         scenario: "emitDeclarationOnly",
@@ -43,14 +43,14 @@ describe("unittests:: tsbuild:: on project with emitDeclarationOnly set to true"
         },
         edits: [
             {
-                subScenario: "incremental-declaration-doesnt-change",
-                modifyFs: fs => replaceText(fs, "/src/src/a.ts", "export interface A {", `class C { }
+                caption: "incremental-declaration-doesnt-change",
+                edit: fs => replaceText(fs, "/src/src/a.ts", "export interface A {", `class C { }
 export interface A {`),
 
             },
             {
-                subScenario: "incremental-declaration-changes",
-                modifyFs: fs => replaceText(fs, "/src/src/a.ts", "b: B;", "b: B; foo: any;"),
+                caption: "incremental-declaration-changes",
+                edit: fs => replaceText(fs, "/src/src/a.ts", "b: B;", "b: B; foo: any;"),
             },
         ],
     });

src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts

@@ -3,7 +3,7 @@ import {
     appendText,
     loadProjectFromDisk,
     replaceText,
-    verifyTscWithEdits,
+    verifyTsc,
 } from "../tsc/helpers";
 
 describe("unittests:: tsbuild:: inferredTypeFromTransitiveModule::", () => {
@@ -15,42 +15,42 @@ describe("unittests:: tsbuild:: inferredTypeFromTransitiveModule::", () => {
         projFs = undefined!;
     });
 
-    verifyTscWithEdits({
+    verifyTsc({
         scenario: "inferredTypeFromTransitiveModule",
         subScenario: "inferred type from transitive module",
         fs: () => projFs,
         commandLineArgs: ["--b", "/src", "--verbose"],
         edits: [
             {
-                subScenario: "incremental-declaration-changes",
-                modifyFs: changeBarParam,
+                caption: "incremental-declaration-changes",
+                edit: changeBarParam,
             },
             {
-                subScenario: "incremental-declaration-changes",
-                modifyFs: changeBarParamBack,
+                caption: "incremental-declaration-changes",
+                edit: changeBarParamBack,
             },
         ],
     });
 
-    verifyTscWithEdits({
+    verifyTsc({
         subScenario: "inferred type from transitive module with isolatedModules",
         fs: () => projFs,
         scenario: "inferredTypeFromTransitiveModule",
         commandLineArgs: ["--b", "/src", "--verbose"],
         modifyFs: changeToIsolatedModules,
         edits: [
             {
-                subScenario: "incremental-declaration-changes",
-                modifyFs: changeBarParam
+                caption: "incremental-declaration-changes",
+                edit: changeBarParam
             },
             {
-                subScenario: "incremental-declaration-changes",
-                modifyFs: changeBarParamBack,
+                caption: "incremental-declaration-changes",
+                edit: changeBarParamBack,
             },
         ]
     });
 
-    verifyTscWithEdits({
+    verifyTsc({
         scenario: "inferredTypeFromTransitiveModule",
         subScenario: "reports errors in files affected by change in signature with isolatedModules",
         fs: () => projFs,
@@ -63,20 +63,20 @@ bar("hello");`);
         },
         edits: [
             {
-                subScenario: "incremental-declaration-changes",
-                modifyFs: changeBarParam
+                caption: "incremental-declaration-changes",
+                edit: changeBarParam
             },
             {
-                subScenario: "incremental-declaration-changes",
-                modifyFs: changeBarParamBack,
+                caption: "incremental-declaration-changes",
+                edit: changeBarParamBack,
             },
             {
-                subScenario: "incremental-declaration-changes",
-                modifyFs: changeBarParam
+                caption: "incremental-declaration-changes",
+                edit: changeBarParam
             },
             {
-                subScenario: "Fix Error",
-                modifyFs: fs => replaceText(fs, "/src/lazyIndex.ts", `bar("hello")`, "bar()")
+                caption: "Fix Error",
+                edit: fs => replaceText(fs, "/src/lazyIndex.ts", `bar("hello")`, "bar()")
             },
         ]
     });

src/testRunner/unittests/tsbuild/javascriptProjectEmit.ts

@@ -4,7 +4,6 @@ import {
     replaceText,
     symbolLibContent,
     verifyTsc,
-    verifyTscWithEdits,
 } from "../tsc/helpers";
 
 describe("unittests:: tsbuild:: javascriptProjectEmit::", () => {
@@ -96,7 +95,7 @@ describe("unittests:: tsbuild:: javascriptProjectEmit::", () => {
         commandLineArgs: ["-b", "/src"]
     });
 
-    verifyTscWithEdits({
+    verifyTsc({
         scenario: "javascriptProjectEmit",
         subScenario: `modifies outfile js projects and concatenates them correctly`,
         fs: () => loadProjectFromFiles({
@@ -185,8 +184,8 @@ describe("unittests:: tsbuild:: javascriptProjectEmit::", () => {
         }, symbolLibContent),
         commandLineArgs: ["-b", "/src"],
         edits: [{
-            subScenario: "incremental-declaration-doesnt-change",
-            modifyFs: fs => replaceText(fs, "/src/sub-project/index.js", "null", "undefined")
+            caption: "incremental-declaration-doesnt-change",
+            edit: fs => replaceText(fs, "/src/sub-project/index.js", "null", "undefined")
         }]
     });
 

src/testRunner/unittests/tsbuild/lateBoundSymbol.ts

@@ -2,23 +2,23 @@ import {
     appendText,
     loadProjectFromDisk,
     replaceText,
-    verifyTscWithEdits,
+    verifyTsc,
 } from "../tsc/helpers";
 
 describe("unittests:: tsbuild:: lateBoundSymbol:: interface is merged and contains late bound member", () => {
-    verifyTscWithEdits({
+    verifyTsc({
         subScenario: "interface is merged and contains late bound member",
         fs: () => loadProjectFromDisk("tests/projects/lateBoundSymbol"),
         scenario: "lateBoundSymbol",
         commandLineArgs: ["--b", "/src/tsconfig.json", "--verbose"],
         edits: [
             {
-                subScenario: "incremental-declaration-doesnt-change",
-                modifyFs: fs => replaceText(fs, "/src/src/main.ts", "const x = 10;", ""),
+                caption: "incremental-declaration-doesnt-change",
+                edit: fs => replaceText(fs, "/src/src/main.ts", "const x = 10;", ""),
             },
             {
-                subScenario: "incremental-declaration-doesnt-change",
-                modifyFs: fs => appendText(fs, "/src/src/main.ts", "const x = 10;"),
+                caption: "incremental-declaration-doesnt-change",
+                edit: fs => appendText(fs, "/src/src/main.ts", "const x = 10;"),
             },
         ]
     });

src/testRunner/unittests/tsbuild/moduleResolution.ts

@@ -8,7 +8,6 @@ import {
     loadProjectFromFiles,
     noChangeOnlyRuns,
     verifyTsc,
-    verifyTscWithEdits,
 } from "../tsc/helpers";
 import { verifyTscWatch } from "../tscWatch/helpers";
 
@@ -68,15 +67,13 @@ describe("unittests:: tsbuild:: moduleResolution:: handles the modules and optio
         subScenario: `resolves specifier in output declaration file from referenced project correctly`,
         sys,
         commandLineArgs: ["-b", "packages/pkg1", "--verbose", "--traceResolution"],
-        changes: ts.emptyArray
     });
 
     verifyTscWatch({
         scenario: "moduleResolution",
         subScenario: `resolves specifier in output declaration file from referenced project correctly with preserveSymlinks`,
         sys: () => sys({ preserveSymlinks: true }),
         commandLineArgs: ["-b", "packages/pkg1", "--verbose", "--traceResolution"],
-        changes: ts.emptyArray
     });
 
     verifyTsc({
@@ -101,7 +98,7 @@ describe("unittests:: tsbuild:: moduleResolution:: handles the modules and optio
 });
 
 describe("unittests:: tsbuild:: moduleResolution:: impliedNodeFormat differs between projects for shared file", () => {
-    verifyTscWithEdits({
+    verifyTsc({
         scenario: "moduleResolution",
         subScenario: "impliedNodeFormat differs between projects for shared file",
         fs: () => loadProjectFromFiles({

src/testRunner/unittests/tsbuild/noEmit.ts

@@ -1,12 +1,12 @@
 import {
     loadProjectFromFiles,
     noChangeRun,
-    verifyTscWithEdits,
+    verifyTsc,
 } from "../tsc/helpers";
 
 describe("unittests:: tsbuild:: noEmit", () => {
     function verifyNoEmitWorker(subScenario: string, aTsContent: string, commandLineArgs: readonly string[]) {
-        verifyTscWithEdits({
+        verifyTsc({
             scenario: "noEmit",
             subScenario,
             fs: () => loadProjectFromFiles({
@@ -19,8 +19,8 @@ describe("unittests:: tsbuild:: noEmit", () => {
             edits: [
                 noChangeRun,
                 {
-                    subScenario: "Fix error",
-                    modifyFs: fs => fs.writeFileSync("/src/a.ts", `const a = "hello"`),
+                    caption: "Fix error",
+                    edit: fs => fs.writeFileSync("/src/a.ts", `const a = "hello"`),
                 },
                 noChangeRun,
             ],