Skip to content

Commit 1f149cc

Browse files
sheetalkamatsheetalkamat
committed
Use clean and written files to verify the tsbuild incremental compilation = clean build compilation
1 parent 566d32b commit 1f149cc

File tree

7 files changed

+7
-122
lines changed

7 files changed

+7
-122
lines changed

‎src/testRunner/unittests/tsbuild/amdModulesWithOut.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ namespace ts {
8282
incrementalHeaderChangedBuild: modifyAgainFs ? {
8383
modifyFs: modifyAgainFs
8484
} : undefined,
85-
outputFiles: [
86-
...outputFiles[project.lib],
87-
...outputFiles[project.app]
88-
],
8985
baselineOnly: true
9086
});
9187
}
@@ -232,10 +228,6 @@ ${internal} export enum internalEnum { a, b, c }`);
232228
[Diagnostics.Building_project_0, sources[project.app][source.config]],
233229
]
234230
},
235-
outputFiles: [
236-
...libOutputFile,
237-
...outputFiles[project.app]
238-
],
239231
baselineOnly: true,
240232
verifyDiagnostics: true
241233
});

‎src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,6 @@ namespace ts {
1818
proj: "emitDeclarationOnly",
1919
rootNames: ["/src"],
2020
lastProjectOutput: `/src/lib/index.d.ts`,
21-
outputFiles: [
22-
"/src/lib/a.d.ts",
23-
"/src/lib/b.d.ts",
24-
"/src/lib/c.d.ts",
25-
"/src/lib/index.d.ts",
26-
"/src/tsconfig.tsbuildinfo",
27-
...(disableMap ? emptyArray : [
28-
"/src/lib/a.d.ts.map",
29-
"/src/lib/b.d.ts.map",
30-
"/src/lib/c.d.ts.map",
31-
"/src/lib/index.d.ts.map"
32-
])
33-
],
3421
initialBuild: {
3522
modifyFs: disableMap ?
3623
(fs => replaceText(fs, "/src/tsconfig.json", `"declarationMap": true,`, "")) :
@@ -64,15 +51,6 @@ namespace ts {
6451
proj: "emitDeclarationOnly",
6552
rootNames: ["/src"],
6653
lastProjectOutput: `/src/lib/a.d.ts`,
67-
outputFiles: [
68-
"/src/lib/a.d.ts",
69-
"/src/lib/b.d.ts",
70-
"/src/lib/c.d.ts",
71-
"/src/tsconfig.tsbuildinfo",
72-
"/src/lib/a.d.ts.map",
73-
"/src/lib/b.d.ts.map",
74-
"/src/lib/c.d.ts.map",
75-
],
7654
initialBuild: {
7755
modifyFs: fs => {
7856
fs.rimrafSync("/src/src/index.ts");

‎src/testRunner/unittests/tsbuild/helpers.ts‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ interface Symbol {
267267
if (baselineSourceMap) generateSourceMapBaselineFiles(fs, mapDefinedIterator(writtenFiles.keys(), f => f.endsWith(".map") ? f : undefined));
268268
generateBuildInfoSectionBaselineFiles(fs, expectedBuildInfoFilesForSectionBaselines || emptyArray);
269269
fs.makeReadonly();
270-
return { fs, actualReadFileMap, host, builder };
270+
return { fs, actualReadFileMap, host, builder, writtenFiles };
271271
}
272272

273273
function generateBaseline(fs: vfs.FileSystem, proj: string, scenario: string, subScenario: string, baseFs: vfs.FileSystem) {
@@ -314,7 +314,6 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
314314
expectedBuildInfoFilesForSectionBaselines?: ReadonlyArray<BuildInfoSectionBaselineFiles>;
315315
lastProjectOutput: string;
316316
initialBuild: BuildState;
317-
outputFiles?: ReadonlyArray<string>;
318317
incrementalDtsChangedBuild?: BuildState;
319318
incrementalDtsUnchangedBuild?: BuildState;
320319
incrementalHeaderChangedBuild?: BuildState;
@@ -324,7 +323,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
324323
}
325324

326325
export function verifyTsbuildOutput({
327-
scenario, projFs, time, tick, proj, rootNames, outputFiles, baselineOnly, verifyDiagnostics,
326+
scenario, projFs, time, tick, proj, rootNames, baselineOnly, verifyDiagnostics,
328327
baselineSourceMap, expectedBuildInfoFilesForSectionBaselines, lastProjectOutput,
329328
initialBuild, incrementalDtsChangedBuild, incrementalDtsUnchangedBuild, incrementalHeaderChangedBuild
330329
}: VerifyTsBuildInput) {
@@ -417,22 +416,19 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
417416
});
418417
}
419418
it(`Verify emit output file text is same when built clean`, () => {
420-
const expectedOutputFiles = Debug.assertDefined(outputFiles);
421-
const { fs } = build({
419+
const { fs, writtenFiles } = build({
422420
fs: newFs.shadow(),
423421
tick,
424422
rootNames,
425423
modifyFs: fs => {
426424
// Delete output files
427-
for (const outputFile of expectedOutputFiles) {
428-
if (fs.existsSync(outputFile)) {
429-
fs.rimrafSync(outputFile);
430-
}
431-
}
425+
const host = new fakes.SolutionBuilderHost(fs);
426+
const builder = createSolutionBuilder(host, rootNames, { clean: true });
427+
builder.clean();
432428
},
433429
});
434430

435-
for (const outputFile of expectedOutputFiles) {
431+
for (const outputFile of arrayFrom(writtenFiles.keys())) {
436432
const expectedText = fs.existsSync(outputFile) ? fs.readFileSync(outputFile, "utf8") : undefined;
437433
const actualText = newFs.existsSync(outputFile) ? newFs.readFileSync(outputFile, "utf8") : undefined;
438434
assert.equal(actualText, expectedText, `File: ${outputFile}`);

‎src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ namespace ts {
1717
proj: "inferredTypeFromTransitiveModule",
1818
rootNames: ["/src"],
1919
lastProjectOutput: `/src/obj/index.js`,
20-
outputFiles: [
21-
"/src/obj/bar.js", "/src/obj/bar.d.ts",
22-
"/src/obj/bundling.js", "/src/obj/bundling.d.ts",
23-
"/src/obj/lazyIndex.js", "/src/obj/lazyIndex.d.ts",
24-
"/src/obj/index.js", "/src/obj/index.d.ts",
25-
"/src/obj/tsconfig.tsbuildinfo"
26-
],
2720
initialBuild: {
2821
modifyFs: noop,
2922
expectedDiagnostics: [

‎src/testRunner/unittests/tsbuild/lateBoundSymbol.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ namespace ts {
1717
proj: "lateBoundSymbol",
1818
rootNames: ["/src/tsconfig.json"],
1919
lastProjectOutput: "/src/src/main.js",
20-
outputFiles: [
21-
"/src/src/hkt.js",
22-
"/src/src/main.js",
23-
"/src/tsconfig.tsbuildinfo",
24-
],
2520
initialBuild: {
2621
modifyFs: noop,
2722
expectedDiagnostics: [

‎src/testRunner/unittests/tsbuild/outFile.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ namespace ts {
303303
expectedDiagnostics: dtsUnchanged && dtsUnchanged.expectedDiagnostics,
304304
expectedReadFiles: dtsUnchanged && dtsUnchanged.expectedReadFiles
305305
} : undefined,
306-
outputFiles: expectedOutputFiles,
307306
baselineOnly
308307
});
309308
}

‎src/testRunner/unittests/tsbuild/sample.ts‎

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -693,22 +693,6 @@ class someClass { }`),
693693
],
694694
)
695695
},
696-
outputFiles: [
697-
"/src/core/anotherModule.js",
698-
"/src/core/anotherModule.d.ts",
699-
"/src/core/anotherModule.d.ts.map",
700-
"/src/core/index.js",
701-
"/src/core/index.d.ts",
702-
"/src/core/index.d.ts.map",
703-
"/src/core/tsconfig.tsbuildinfo",
704-
"/src/logic/index.js",
705-
"/src/logic/index.js.map",
706-
"/src/logic/index.d.ts",
707-
"/src/logic/tsconfig.tsbuildinfo",
708-
"/src/tests/index.js",
709-
"/src/tests/index.d.ts",
710-
"/src/tests/tsconfig.tsbuildinfo",
711-
]
712696
});
713697

714698
verifyTsbuildOutput({
@@ -757,22 +741,6 @@ class someClass { }`),
757741
]
758742
)
759743
},
760-
outputFiles: [
761-
"/src/core/anotherModule.js",
762-
"/src/core/anotherModule.d.ts",
763-
"/src/core/anotherModule.d.ts.map",
764-
"/src/core/index.js",
765-
"/src/core/index.d.ts",
766-
"/src/core/index.d.ts.map",
767-
"/src/core/tsconfig.tsbuildinfo",
768-
"/src/logic/index.js",
769-
"/src/logic/index.js.map",
770-
"/src/logic/decls/index.d.ts",
771-
"/src/logic/tsconfig.tsbuildinfo",
772-
"/src/tests/index.js",
773-
"/src/tests/index.d.ts",
774-
"/src/tests/tsconfig.tsbuildinfo",
775-
],
776744
});
777745

778746
verifyTsbuildOutput({
@@ -814,22 +782,6 @@ class someClass { }`),
814782
]
815783
)
816784
},
817-
outputFiles: [
818-
"/src/core/anotherModule.js",
819-
"/src/core/anotherModule.d.ts",
820-
"/src/core/anotherModule.d.ts.map",
821-
"/src/core/index.js",
822-
"/src/core/index.d.ts",
823-
"/src/core/index.d.ts.map",
824-
"/src/core/tsconfig.tsbuildinfo",
825-
"/src/logic/index.js",
826-
"/src/logic/index.js.map",
827-
"/src/logic/index.d.ts",
828-
"/src/logic/ownFile.tsbuildinfo",
829-
"/src/tests/index.js",
830-
"/src/tests/index.d.ts",
831-
"/src/tests/tsconfig.tsbuildinfo",
832-
]
833785
});
834786

835787
verifyTsbuildOutput({
@@ -861,13 +813,6 @@ class someClass { }`),
861813
[Diagnostics.Building_project_0, "/src/core/tsconfig.json"]
862814
]
863815
},
864-
outputFiles: [
865-
"/src/core/anotherModule.js",
866-
"/src/core/anotherModule.d.ts",
867-
"/src/core/index.js",
868-
"/src/core/index.d.ts",
869-
"/src/core/tsconfig.tsbuildinfo",
870-
],
871816
baselineOnly: true,
872817
verifyDiagnostics: true
873818
});
@@ -910,13 +855,6 @@ class someClass { }`),
910855
[Diagnostics.Building_project_0, "/src/core/tsconfig.json"]
911856
]
912857
},
913-
outputFiles: [
914-
"/src/core/anotherModule.js",
915-
"/src/core/anotherModule.d.ts",
916-
"/src/core/index.js",
917-
"/src/core/index.d.ts",
918-
"/src/core/tsconfig.tsbuildinfo",
919-
],
920858
baselineOnly: true,
921859
verifyDiagnostics: true
922860
});
@@ -950,11 +888,6 @@ class someClass { }`),
950888
[Diagnostics.Building_project_0, "/src/core/tsconfig.json"]
951889
]
952890
},
953-
outputFiles: [
954-
"/src/core/anotherModule.js",
955-
"/src/core/index.js",
956-
"/src/core/tsconfig.tsbuildinfo",
957-
],
958891
baselineOnly: true,
959892
verifyDiagnostics: true
960893
});
@@ -1002,7 +935,6 @@ class someClass { }`),
1002935
[Diagnostics.Building_project_0, "/src/tests/tsconfig.json"]
1003936
]
1004937
},
1005-
outputFiles: [],
1006938
baselineOnly: true,
1007939
verifyDiagnostics: true
1008940
});

0 commit comments

Comments
 (0)