feat: Improve handling of skipped lines in stderr assertion and update test fixtures

Author: andy1li

internal/assertions/stderr_assertion.go

@@ -22,14 +22,14 @@ func (a StderrAssertion) Run(result executable.ExecutableResult, logger *logger.
 	stderr := getStderrLinesFromExecutableResult(result)
 	skippedLines := getSkippedLinesCount(result)
 
+	if skippedLines > 0 {
+		logger.Plainf("[stderr] Skipped %d lines that didn't start with [line N]", skippedLines)
+	}
+
 	for i, expectedLine := range a.ExpectedLines {
 		if i >= len(stderr) {
 			logAllSuccessLogs(successLogs, logger)
 
-			if skippedLines > 0 {
-				logger.Plainf("[stderr] Skipped %d lines that didn't start with [line N]", skippedLines)
-			}
-
 			return fmt.Errorf(`
 [stderr] Missing line #%d from stderr: %q
 [stderr] Perhaps it's printed to stdout? It should be printed to stderr.

internal/test_helpers/fixtures/fail_scanning_multiline_errors/1_missing_line

@@ -3,9 +3,9 @@
 [stage-11] [test-1] Writing contents to ./test.lox:
 [stage-11] [test-1] [test.lox] ()<|SPACE|><|TAB|>@
 [stage-11] [test-1] $ ./your_program.sh tokenize test.lox
-[your_program] [line 2] Error: Unexpected character: @
 [your_program] LEFT_PAREN ( null
 [your_program] RIGHT_PAREN ) null
+[your_program] [line 2] Error: Unexpected character: @
 [your_program] EOF  null
 [stage-11] [test-1] ✓ 1 line(s) match on stderr
 [stage-11] [test-1] ✓ 3 line(s) match on stdout

internal/test_helpers/fixtures/fail_scanning_multiline_errors/2_mismatch

@@ -3,11 +3,10 @@
 [stage-11] [test-1] Writing contents to ./test.lox:
 [stage-11] [test-1] [test.lox] ()<|SPACE|><|TAB|>@
 [stage-11] [test-1] $ ./your_program.sh tokenize test.lox
+[your_program] [line 2] Error: Unexpected character: @
 [your_program] LEFT_PAREN ( null
 [your_program] RIGHT_PAREN ) null
 [your_program] EOF  null
-[your_program] This line will be skipped in stderr
-[your_program] [line 2] Error: Unexpected character: @
 [stage-11] [test-1] ✓ 1 line(s) match on stderr
 [stage-11] [test-1] ✓ 3 line(s) match on stdout
 [stage-11] [test-1] ✓ Received exit code 65.
@@ -17,9 +16,7 @@
 [stage-11] [test-2] [test.lox] <|SPACE|>
 [stage-11] [test-2] $ ./your_program.sh tokenize test.lox
 [your_program] EOF  null
-[your_program] This line will be skipped in stderr
 [your_program] [line 1] Error: Unexpected character: @
-[your_program] This line will be skipped in stderr
 [your_program] [line 1] eRrRr: Unexpected character: #
 [stage-11] [test-2] ✓ [line 1] Error: Unexpected character: @
 [stage-11] [test-2] 

internal/test_helpers/fixtures/fail_scanning_multiline_errors/3_extra_line

@@ -3,9 +3,8 @@
 [stage-11] [test-1] Writing contents to ./test.lox:
 [stage-11] [test-1] [test.lox] ()<|SPACE|><|TAB|>@
 [stage-11] [test-1] $ ./your_program.sh tokenize test.lox
-[your_program] LEFT_PAREN ( null
-[your_program] This line will be skipped in stderr
 [your_program] [line 2] Error: Unexpected character: @
+[your_program] LEFT_PAREN ( null
 [your_program] RIGHT_PAREN ) null
 [your_program] EOF  null
 [stage-11] [test-1] ✓ 1 line(s) match on stderr
@@ -16,10 +15,8 @@
 [stage-11] [test-2] [test.lox] @#
 [stage-11] [test-2] [test.lox] <|SPACE|>
 [stage-11] [test-2] $ ./your_program.sh tokenize test.lox
-[your_program] This line will be skipped in stderr
-[your_program] EOF  null
 [your_program] [line 1] Error: Unexpected character: @
-[your_program] This line will be skipped in stderr
+[your_program] EOF  null
 [your_program] [line 1] Error: Unexpected character: #
 [your_program] [line 888] extra line
 [stage-11] [test-2] ✓ [line 1] Error: Unexpected character: @

internal/test_helpers/scenarios/fail_scanning_multiline_errors/2_mismatch/lox/lox.py

@@ -53,8 +53,6 @@ def _check_errror_exit(self):
 
     def _error_report(self, line: int, where: str, message: str):
         self._had_error = True
-        print(f"This line will be skipped in stderr", file=sys.stderr)
-
         if message.endswith("@"):
             output = f"[line {line}] Error{where}: {message}"
             print(output, file=sys.stderr)

internal/test_helpers/scenarios/fail_scanning_multiline_errors/3_extra_line/lox/lox.py

@@ -53,8 +53,6 @@ def _check_errror_exit(self):
 
     def _error_report(self, line: int, where: str, message: str):
         self._had_error = True
-        print(f"This line will be skipped in stderr", file=sys.stderr)
-
         output = f"[line {line}] Error{where}: {message}"
         print(output, file=sys.stderr)
         if message.endswith("#"):