Rename error.txt diff to output.txt

Author: sheetalkamat

internal/execute/tsctestrunner_test.go

@@ -63,7 +63,7 @@ func (test *tscInput) executeCommand(sys *testSys, baselineBuilder *strings.Buil
 
 func (test *tscInput) run(t *testing.T, scenario string) {
 	t.Helper()
-	t.Run(test.subScenario+" tsc baseline", func(t *testing.T) {
+	t.Run(test.subScenario, func(t *testing.T) {
 		t.Parallel()
 		// initial test tsc compile
 		baselineBuilder := &strings.Builder{}
@@ -80,6 +80,7 @@ func (test *tscInput) run(t *testing.T, scenario string) {
 		result := test.executeCommand(sys, baselineBuilder, test.commandLineArgs)
 		sys.serializeState(baselineBuilder)
 		sys.baselineProgram(baselineBuilder, result.IncrementalProgram, result.Watcher)
+		var unexpectedDiff string
 
 		for index, do := range test.edits {
 			sys.clearOutput()
@@ -118,11 +119,18 @@ func (test *tscInput) run(t *testing.T, scenario string) {
 			if diff != "" {
 				baselineBuilder.WriteString(fmt.Sprintf("\n\nDiff:: %s\n", core.IfElse(do.expectedDiff == "", "!!! Unexpected diff, please review and either fix or write explanation as expectedDiff !!!", do.expectedDiff)))
 				baselineBuilder.WriteString(diff)
+				if do.expectedDiff == "" {
+					unexpectedDiff += fmt.Sprintf("Edit [%d]:: %s\n!!! Unexpected diff, please review and either fix or write explanation as expectedDiff !!!\n%s\n", index, do.caption, diff)
+				}
 			} else if do.expectedDiff != "" {
 				baselineBuilder.WriteString(fmt.Sprintf("\n\nDiff:: %s !!! Diff not found but explanation present, please review and remove the explanation !!!\n", do.expectedDiff))
+				unexpectedDiff += fmt.Sprintf("Edit [%d]:: %s\n!!! Diff not found but explanation present, please review and remove the explanation !!!\n", index, do.caption)
 			}
 		}
 		baseline.Run(t, strings.ReplaceAll(test.subScenario, " ", "-")+".js", baselineBuilder.String(), baseline.Options{Subfolder: filepath.Join(test.getBaselineSubFolder(), scenario)})
+		if unexpectedDiff != "" {
+			t.Errorf("Test %s has unexpected diff %s with incremental build, please review the baseline file", test.subScenario, unexpectedDiff)
+		}
 	})
 }
 
@@ -152,10 +160,10 @@ func getDiffForIncremental(incrementalSys *testSys, nonIncrementalSys *testSys)
 		}
 	}
 
-	incrementalErrors := strings.Join(incrementalSys.output, "")
-	nonIncrementalErrors := strings.Join(nonIncrementalSys.output, "")
-	if incrementalErrors != nonIncrementalErrors {
-		diffBuilder.WriteString(baseline.DiffText("nonIncremental errors.txt", "incremental errors.txt", nonIncrementalErrors, incrementalErrors))
+	incrementalOutput := strings.Join(incrementalSys.output, "")
+	nonIncrementalOutput := strings.Join(nonIncrementalSys.output, "")
+	if incrementalOutput != nonIncrementalOutput {
+		diffBuilder.WriteString(baseline.DiffText("nonIncremental.output.txt", "incremental.output.txt", nonIncrementalOutput, incrementalOutput))
 	}
 	return diffBuilder.String()
 }

testdata/baselines/reference/tsc/incremental/change-to-type-that-gets-used-as-global-through-export-in-another-file-through-indirect-import.js

@@ -299,8 +299,8 @@ Diff:: Currently there is issue with d.ts emit for export default = 1 to widen i
 @@ -1,1 +1,1 @@
 -declare const a = 2;
 +declare const a = 1;
---- nonIncremental errors.txt
-+++ incremental errors.txt
+--- nonIncremental.output.txt
++++ incremental.output.txt
 @@ -1,7 +0,0 @@
 -class1.ts:1:7 - error TS2322: Type '1' is not assignable to type '2'.
 -

testdata/baselines/reference/tsc/incremental/change-to-type-that-gets-used-as-global-through-export-in-another-file.js

@@ -249,8 +249,8 @@ Diff:: Currently there is issue with d.ts emit for export default = 1 to widen i
 @@ -1,1 +1,1 @@
 -declare const a = 2;
 +declare const a = 1;
---- nonIncremental errors.txt
-+++ incremental errors.txt
+--- nonIncremental.output.txt
++++ incremental.output.txt
 @@ -1,7 +0,0 @@
 -class1.ts:1:7 - error TS2322: Type '1' is not assignable to type '2'.
 -