Merge branch 'main' into highlight-emulated-grep

UdeshyaDhungana · UdeshyaDhungana · commit d141727d45ed · 2025-12-10T12:06:26.000+05:45
diff --git a/internal/assertions/ordered_lines_assertion.go b/internal/assertions/ordered_lines_assertion.go
@@ -66,8 +66,10 @@ func (a OrderedLinesAssertion) Run(result executable.ExecutableResult, logger *l
 
 	if len(a.ExpectedOutputLines) == 0 {
 		logger.Successf("✓ No output found")
-	} else {
-		logger.Successf("✓ Stdout contains %s in order", english.Plural(len(a.ExpectedOutputLines), "expected line", "expected lines"))
+	}
+
+	if len(a.ExpectedOutputLines) > 1 {
+		logger.Successf("✓ Stdout contains %d expected lines in order", len(a.ExpectedOutputLines))
 	}
 
 	return nil
diff --git a/internal/grep/file_search.go b/internal/grep/file_search.go
@@ -42,8 +42,8 @@ func searchFiles(pattern string, files []string, opts fileSearchOptions) Result
 
 	return Result{
 		ExitCode: exitCode,
-		Stdout:   []byte(strings.Join(stdout, "\n")),
-		Stderr:   []byte(strings.Join(stderr, "\n")),
+		Stdout:   []byte(linesToProgramOutput(stdout)),
+		Stderr:   []byte(linesToProgramOutput(stderr)),
 	}
 }
 
diff --git a/internal/grep/stdin_search.go b/internal/grep/stdin_search.go
@@ -54,8 +54,8 @@ func searchStdin(pattern string, input string, searchOptions searchOptions) Resu
 
 	return Result{
 		ExitCode: exitCode,
-		Stdout:   []byte(strings.Join(stdout, "\n")),
-		Stderr:   []byte(strings.Join(stderr, "\n")),
+		Stdout:   []byte(linesToProgramOutput(stdout)),
+		Stderr:   []byte(linesToProgramOutput(stderr)),
 	}
 }
 
diff --git a/internal/grep/utils.go b/internal/grep/utils.go
@@ -0,0 +1,15 @@
+package grep
+
+import "strings"
+
+// linesToProgramOutput converts lines produced by emulated grep to the actual output string
+func linesToProgramOutput(lines []string) string {
+	result := strings.Join(lines, "\n")
+
+	// Add newline in case of non-empty output
+	if result != "" {
+		result += "\n"
+	}
+
+	return result
+}
diff --git a/internal/test_helpers/fixtures/multiple_matches/success b/internal/test_helpers/fixtures/multiple_matches/success
@@ -3,28 +3,24 @@
 [33m[your_program] [0m1
 [33m[tester::#CJ0] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#CJ0] [0m[92m✓ Found line "1"[0m
-[33m[tester::#CJ0] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#CJ0] [0m[94m$ echo -ne "cherry" | ./your_grep.sh -o -E '\d'[0m
 [33m[tester::#CJ0] [0m[92m✓ Received exit code 1.[0m
 [33m[tester::#CJ0] [0m[92m✓ No output found[0m
 [33m[tester::#CJ0] [0m[94m$ echo -ne "apple_suffix" | ./your_grep.sh -o -E '^apple'[0m
 [33m[your_program] [0mapple
 [33m[tester::#CJ0] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#CJ0] [0m[92m✓ Found line "apple"[0m
-[33m[tester::#CJ0] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#CJ0] [0m[94m$ echo -ne "prefix_apple" | ./your_grep.sh -o -E '^apple'[0m
 [33m[tester::#CJ0] [0m[92m✓ Received exit code 1.[0m
 [33m[tester::#CJ0] [0m[92m✓ No output found[0m
 [33m[tester::#CJ0] [0m[94m$ echo -ne "cat" | ./your_grep.sh -o -E 'ca?t'[0m
 [33m[your_program] [0mcat
 [33m[tester::#CJ0] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#CJ0] [0m[92m✓ Found line "cat"[0m
-[33m[tester::#CJ0] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#CJ0] [0m[94m$ echo -ne "I see 42 dogs" | ./your_grep.sh -o -E '^I see \d+ (cat|dog)s?$'[0m
 [33m[your_program] [0mI see 42 dogs
 [33m[tester::#CJ0] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#CJ0] [0m[92m✓ Found line "I see 42 dogs"[0m
-[33m[tester::#CJ0] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#CJ0] [0m[92mTest passed.[0m
 
 [33m[tester::#SS2] [0m[94mRunning tests for Stage #SS2 (ss2)[0m
diff --git a/internal/test_helpers/fixtures/printing_matches/extra_empty_line b/internal/test_helpers/fixtures/printing_matches/extra_empty_line
@@ -5,7 +5,6 @@ Debug = true
 [33m[your_program] [0mbanana123
 [33m[tester::#KU5] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#KU5] [0m[92m✓ Found line "banana123"[0m
-[33m[tester::#KU5] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#KU5] [0m[94m$ echo -ne "cherry" | ./your_grep.sh -E '\d'[0m
 [33m[your_program] [0m
 [33m[tester::#KU5] [0m[92m✓ Received exit code 1.[0m
diff --git a/internal/test_helpers/fixtures/printing_matches/success b/internal/test_helpers/fixtures/printing_matches/success
@@ -3,28 +3,24 @@
 [33m[your_program] [0mbanana123
 [33m[tester::#KU5] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#KU5] [0m[92m✓ Found line "banana123"[0m
-[33m[tester::#KU5] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#KU5] [0m[94m$ echo -ne "cherry" | ./your_grep.sh -E '\d'[0m
 [33m[tester::#KU5] [0m[92m✓ Received exit code 1.[0m
 [33m[tester::#KU5] [0m[92m✓ No output found[0m
 [33m[tester::#KU5] [0m[94m$ echo -ne "apple_suffix" | ./your_grep.sh -E '^apple'[0m
 [33m[your_program] [0mapple_suffix
 [33m[tester::#KU5] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#KU5] [0m[92m✓ Found line "apple_suffix"[0m
-[33m[tester::#KU5] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#KU5] [0m[94m$ echo -ne "prefix_apple" | ./your_grep.sh -E '^apple'[0m
 [33m[tester::#KU5] [0m[92m✓ Received exit code 1.[0m
 [33m[tester::#KU5] [0m[92m✓ No output found[0m
 [33m[tester::#KU5] [0m[94m$ echo -ne "cat" | ./your_grep.sh -E 'ca+t'[0m
 [33m[your_program] [0mcat
 [33m[tester::#KU5] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#KU5] [0m[92m✓ Found line "cat"[0m
-[33m[tester::#KU5] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#KU5] [0m[94m$ echo -ne "ptest" | ./your_grep.sh -E '[pineapple]'[0m
 [33m[your_program] [0mptest
 [33m[tester::#KU5] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#KU5] [0m[92m✓ Found line "ptest"[0m
-[33m[tester::#KU5] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#KU5] [0m[92mTest passed.[0m
 
 [33m[tester::#PZ6] [0m[94mRunning tests for Stage #PZ6 (pz6)[0m
diff --git a/internal/test_helpers/fixtures/printing_matches/unexpected_output b/internal/test_helpers/fixtures/printing_matches/unexpected_output
@@ -5,7 +5,6 @@ Debug = true
 [33m[your_program] [0mbanana123
 [33m[tester::#KU5] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#KU5] [0m[92m✓ Found line "banana123"[0m
-[33m[tester::#KU5] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#KU5] [0m[94m$ echo -ne "cherry" | ./your_grep.sh -E '\d'[0m
 [33m[your_program] [0mcherry
 [33m[tester::#KU5] [0m[92m✓ Received exit code 1.[0m

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ func searchFiles(pattern string, files []string, opts fileSearchOptions) Result`
`42`	`42`
`43`	`43`	`return Result{`
`44`	`44`	`ExitCode: exitCode,`
`45`		`- Stdout: []byte(strings.Join(stdout, "\n")),`
`46`		`- Stderr: []byte(strings.Join(stderr, "\n")),`
	`45`	`+ Stdout: []byte(linesToProgramOutput(stdout)),`
	`46`	`+ Stderr: []byte(linesToProgramOutput(stderr)),`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ func searchStdin(pattern string, input string, searchOptions searchOptions) Resu`
`54`	`54`
`55`	`55`	`return Result{`
`56`	`56`	`ExitCode: exitCode,`
`57`		`- Stdout: []byte(strings.Join(stdout, "\n")),`
`58`		`- Stderr: []byte(strings.Join(stderr, "\n")),`
	`57`	`+ Stdout: []byte(linesToProgramOutput(stdout)),`
	`58`	`+ Stderr: []byte(linesToProgramOutput(stderr)),`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
-Original file line number
+Diff line change
 [33m[your_program] [0m1
 [33m[tester::#CJ0] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#CJ0] [0m[92m✓ Found line "1"[0m
 -[33m[tester::#CJ0] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#CJ0] [0m[94m$ echo -ne "cherry" | ./your_grep.sh -o -E '\d'[0m
 [33m[tester::#CJ0] [0m[92m✓ Received exit code 1.[0m
 [33m[tester::#CJ0] [0m[92m✓ No output found[0m
 [33m[tester::#CJ0] [0m[94m$ echo -ne "apple_suffix" | ./your_grep.sh -o -E '^apple'[0m
 [33m[your_program] [0mapple
 [33m[tester::#CJ0] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#CJ0] [0m[92m✓ Found line "apple"[0m
 -[33m[tester::#CJ0] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#CJ0] [0m[94m$ echo -ne "prefix_apple" | ./your_grep.sh -o -E '^apple'[0m
 [33m[tester::#CJ0] [0m[92m✓ Received exit code 1.[0m
 [33m[tester::#CJ0] [0m[92m✓ No output found[0m
 [33m[tester::#CJ0] [0m[94m$ echo -ne "cat" | ./your_grep.sh -o -E 'ca?t'[0m
 [33m[your_program] [0mcat
 [33m[tester::#CJ0] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#CJ0] [0m[92m✓ Found line "cat"[0m
 -[33m[tester::#CJ0] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#CJ0] [0m[94m$ echo -ne "I see 42 dogs" | ./your_grep.sh -o -E '^I see \d+ (cat|dog)s?$'[0m
 [33m[your_program] [0mI see 42 dogs
 [33m[tester::#CJ0] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#CJ0] [0m[92m✓ Found line "I see 42 dogs"[0m
 -[33m[tester::#CJ0] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#CJ0] [0m[92mTest passed.[0m
 [33m[tester::#SS2] [0m[94mRunning tests for Stage #SS2 (ss2)[0m
-Original file line number
+Diff line change
 [33m[your_program] [0mbanana123
 [33m[tester::#KU5] [0m[92m✓ Received exit code 0.[0m
 [33m[tester::#KU5] [0m[92m✓ Found line "banana123"[0m
 -[33m[tester::#KU5] [0m[92m✓ Stdout contains 1 expected line in order[0m
 [33m[tester::#KU5] [0m[94m$ echo -ne "cherry" | ./your_grep.sh -E '\d'[0m
 [33m[your_program] [0m
 [33m[tester::#KU5] [0m[92m✓ Received exit code 1.[0m