Skip to content

Commit d31af0f

Browse files
ryan-gangryan-gang
authored
Merge pull request #47 from codecrafters-io/ryan/fixes
Fixes to grep-file-search after testing
2 parents be455df + 6c778af commit d31af0f

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

‎internal/stage_file_search_1.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func testSingleLineFileSearch(stageHarness *test_case_harness.TestCaseHarness) e
2323

2424
testCaseCollection := test_cases.FileSearchTestCaseCollection{
2525
{
26-
Pattern: fruit_1[:len(fruit_1)/2] + ".*",
26+
Pattern: fruit_1[:len(fruit_1)/2] + ".+",
2727
FilePaths: []string{file_name},
2828
ExpectedExitCode: 0,
2929
},
@@ -33,7 +33,7 @@ func testSingleLineFileSearch(stageHarness *test_case_harness.TestCaseHarness) e
3333
ExpectedExitCode: 1,
3434
},
3535
{
36-
Pattern: ".*" + fruit_1[len(fruit_1)/2:],
36+
Pattern: ".+" + fruit_1[len(fruit_1)/2:],
3737
FilePaths: []string{file_name},
3838
ExpectedExitCode: 0,
3939
},

‎internal/stage_file_search_2.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func testMultiLineFileSearch(stageHarness *test_case_harness.TestCaseHarness) er
2424

2525
testCaseCollection := test_cases.FileSearchTestCaseCollection{
2626
{
27-
Pattern: ".*berry",
27+
Pattern: ".+berry",
2828
FilePaths: []string{file_name},
2929
ExpectedExitCode: 0,
3030
},

‎internal/stage_file_search_3.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func testMultiFileSearch(stageHarness *test_case_harness.TestCaseHarness) error
2626

2727
testCaseCollection := test_cases.FileSearchTestCaseCollection{
2828
{
29-
Pattern: fruits[0][:2] + ".*$",
29+
Pattern: fruits[0][:2] + ".+$",
3030
FilePaths: []string{file_name_1, file_name_2},
3131
ExpectedExitCode: 0,
3232
},

‎internal/stage_file_search_4.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ func testRecursiveFileSearch(stageHarness *test_case_harness.TestCaseHarness) er
3030

3131
testCaseCollection := test_cases.FileSearchTestCaseCollection{
3232
{
33-
Pattern: ".*er",
33+
Pattern: ".+er",
3434
FilePaths: []string{"dir/"},
3535
ShouldEnableRecursiveFlag: true,
3636
ExpectedExitCode: 0,
3737
},
3838
{
39-
Pattern: ".*ar",
39+
Pattern: ".+ar",
4040
FilePaths: []string{"dir/"},
4141
ShouldEnableRecursiveFlag: true,
4242
ExpectedExitCode: 0,

‎internal/test_cases/file_search_test_case.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (c FileSearchTestCaseCollection) Run(stageHarness *test_case_harness.TestCa
7979
}
8080

8181
if len(missingLines) > 0 {
82-
logger.Infof("Expected %d line(s) in output, only found %d. Missing line(s):", len(expectedOutputLines), len(foundLines))
82+
logger.Infof("Expected %d line(s) in output, only found %d matching line(s). Missing match(es):", len(expectedOutputLines), len(foundLines))
8383
errorMessage := []string{}
8484
for _, line := range missingLines {
8585
errorMessage = append(errorMessage, fmt.Sprintf("⨯ Line not found: \"%s\"", line))

‎internal/test_helpers/fixtures/extra_logs/failure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[tester::#YX6] [setup] echo "spinach" > "dir/vegetables-6698.txt"
88
[tester::#YX6] [setup] echo "pumpkin" >> "dir/vegetables-6698.txt"
99
[tester::#YX6] [setup] echo "cucumber" >> "dir/vegetables-6698.txt"
10-
[tester::#YX6] $ ./your_grep.sh -r -E .*er dir/
10+
[tester::#YX6] $ ./your_grep.sh -r -E .+er dir/
1111
[your_program] [DEBUB] extra log line-1
1212
[your_program] dir/vegetables-6698.txt:cucumber
1313
[your_program] dir/subdir/vegetables-5461.txt:celery

‎internal/test_helpers/fixtures/file_search/success

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[tester::#DR5] Running tests for Stage #DR5 (dr5)
22
[tester::#DR5] [setup] echo "banana" > "fruits-8623.txt"
3-
[tester::#DR5] $ ./your_grep.sh -E ban.* fruits-8623.txt
3+
[tester::#DR5] $ ./your_grep.sh -E ban.+ fruits-8623.txt
44
[your_program] banana
55
[tester::#DR5] ✓ Received exit code 0.
66
[tester::#DR5] ✓ Stdout contains 1 expected line(s)
77
[tester::#DR5] $ ./your_grep.sh -E asparagus fruits-8623.txt
88
[tester::#DR5] ✓ Received exit code 1.
99
[tester::#DR5] ✓ Stdout contains 1 expected line(s)
10-
[tester::#DR5] $ ./your_grep.sh -E .*ana fruits-8623.txt
10+
[tester::#DR5] $ ./your_grep.sh -E .+ana fruits-8623.txt
1111
[your_program] banana
1212
[tester::#DR5] ✓ Received exit code 0.
1313
[tester::#DR5] ✓ Stdout contains 1 expected line(s)
@@ -18,7 +18,7 @@
1818
[tester::#OL9] [setup] echo "mango" >> "fruits-9289.txt"
1919
[tester::#OL9] [setup] echo "blueberry" >> "fruits-9289.txt"
2020
[tester::#OL9] [setup] echo "strawberry" >> "fruits-9289.txt"
21-
[tester::#OL9] $ ./your_grep.sh -E .*berry fruits-9289.txt
21+
[tester::#OL9] $ ./your_grep.sh -E .+berry fruits-9289.txt
2222
[your_program] blueberry
2323
[your_program] strawberry
2424
[tester::#OL9] ✓ Received exit code 0.
@@ -37,7 +37,7 @@
3737
[tester::#IS6] [setup] echo "plum" >> "fruits-3770.txt"
3838
[tester::#IS6] [setup] echo "cabbage" > "vegetables-4789.txt"
3939
[tester::#IS6] [setup] echo "peas" >> "vegetables-4789.txt"
40-
[tester::#IS6] $ ./your_grep.sh -E pe.*$ fruits-3770.txt vegetables-4789.txt
40+
[tester::#IS6] $ ./your_grep.sh -E pe.+$ fruits-3770.txt vegetables-4789.txt
4141
[your_program] fruits-3770.txt:pear
4242
[your_program] vegetables-4789.txt:peas
4343
[tester::#IS6] ✓ Received exit code 0.
@@ -60,13 +60,13 @@
6060
[tester::#YX6] [setup] echo "pumpkin" > "dir/vegetables-2199.txt"
6161
[tester::#YX6] [setup] echo "carrot" >> "dir/vegetables-2199.txt"
6262
[tester::#YX6] [setup] echo "cucumber" >> "dir/vegetables-2199.txt"
63-
[tester::#YX6] $ ./your_grep.sh -r -E .*er dir/
63+
[tester::#YX6] $ ./your_grep.sh -r -E .+er dir/
6464
[your_program] dir/subdir/vegetables-9582.txt:celery
6565
[your_program] dir/subdir/vegetables-9582.txt:cauliflower
6666
[your_program] dir/vegetables-2199.txt:cucumber
6767
[tester::#YX6] ✓ Received exit code 0.
6868
[tester::#YX6] ✓ Stdout contains 3 expected line(s)
69-
[tester::#YX6] $ ./your_grep.sh -r -E .*ar dir/
69+
[tester::#YX6] $ ./your_grep.sh -r -E .+ar dir/
7070
[your_program] dir/fruits-5329.txt:pear
7171
[your_program] dir/vegetables-2199.txt:carrot
7272
[tester::#YX6] ✓ Received exit code 0.

‎internal/test_helpers/fixtures/missing_and_extra_logs/failure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
[tester::#YX6] [setup] echo "spinach" > "dir/vegetables-6698.txt"
88
[tester::#YX6] [setup] echo "pumpkin" >> "dir/vegetables-6698.txt"
99
[tester::#YX6] [setup] echo "cucumber" >> "dir/vegetables-6698.txt"
10-
[tester::#YX6] $ ./your_grep.sh -r -E .*er dir/
10+
[tester::#YX6] $ ./your_grep.sh -r -E .+er dir/
1111
[your_program] [DEBUB] extra log line-1
1212
[your_program] dir/vegetables-6698.txt:cucumber
1313
[your_program] [DEBUB] extra log line-2
1414
[tester::#YX6] ✓ Received exit code 0.
1515
[tester::#YX6] ✓ Found line 'dir/vegetables-6698.txt:cucumber'
16-
[tester::#YX6] Expected 3 line(s) in output, only found 1. Missing line(s):
16+
[tester::#YX6] Expected 3 line(s) in output, only found 1 matching line(s). Missing match(es):
1717
[tester::#YX6] ⨯ Line not found: "dir/subdir/vegetables-5461.txt:celery"
1818
[tester::#YX6] ⨯ Line not found: "dir/subdir/vegetables-5461.txt:cauliflower"
1919
[tester::#YX6] Test failed (try setting 'debug: true' in your codecrafters.yml to see more details)

0 commit comments

Comments
 (0)