Merge pull request #164 from codecrafters-io/andy/tweak

andy1li · web-flow · commit f8d72557fd62 · 2025-09-16T01:17:24.000+08:00
Move writeFiles #tg6 Double quotes
diff --git a/internal/stage_q2.go b/internal/stage_q2.go
@@ -59,9 +59,6 @@ func testQ2(stageHarness *test_case_harness.TestCaseHarness) error {
 		fmt.Sprintf(`%s %s's %s%s`, L[3], L[4], L[1], L[2]),
 		fileContents[0] + fileContents[1] + strings.TrimRight(fileContents[2], "\n"),
 	}
-	if err := writeFiles(filePaths, fileContents, logger); err != nil {
-		return err
-	}
 
 	testCaseContents := newTestCaseContents(inputs, expectedOutputs)
 
@@ -77,6 +74,10 @@ func testQ2(stageHarness *test_case_harness.TestCaseHarness) error {
 		}
 	}
 
+	if err := writeFiles(filePaths, fileContents, logger); err != nil {
+		return err
+	}
+
 	testCase := test_cases.CommandResponseTestCase{
 		Command:          testCaseContents[3].Input,
 		ExpectedOutput:   testCaseContents[3].ExpectedOutput,
diff --git a/internal/test_helpers/fixtures/ash/quoting/pass b/internal/test_helpers/fixtures/ash/quoting/pass
@@ -24,9 +24,6 @@ Debug = true
 [33m[tester::#TG6] [0m[94mRunning tests for Stage #TG6 (tg6)[0m
 [33m[tester::#TG6] [setup] [0m[94mexport PATH=/tmp/raspberry/banana/blueberry:$PATH[0m
 [33m[tester::#TG6] [0m[94mRunning ./your_shell.sh[0m
-[33m[tester::#TG6] [setup] [0m[94mecho -n "orange blueberry." > "/tmp/bar/f 58"[0m
-[33m[tester::#TG6] [setup] [0m[94mecho -n "grape pineapple." > "/tmp/bar/f   73"[0m
-[33m[tester::#TG6] [setup] [0m[94mecho "raspberry mango." > "/tmp/bar/f's38"[0m
 [33m[your-program] [0m$ echo "shell world"
 [33m[your-program] [0mshell world
 [33m[tester::#TG6] [0m[92m✓ Received expected response[0m
@@ -36,6 +33,9 @@ Debug = true
 [33m[your-program] [0m$ echo "script"  "hello's"  world""example
 [33m[your-program] [0mscript hello's worldexample
 [33m[tester::#TG6] [0m[92m✓ Received expected response[0m
+[33m[tester::#TG6] [setup] [0m[94mecho -n "orange blueberry." > "/tmp/bar/f 58"[0m
+[33m[tester::#TG6] [setup] [0m[94mecho -n "grape pineapple." > "/tmp/bar/f   73"[0m
+[33m[tester::#TG6] [setup] [0m[94mecho "raspberry mango." > "/tmp/bar/f's38"[0m
 [33m[your-program] [0m$ cat "/tmp/bar/f 58" "/tmp/bar/f   73" "/tmp/bar/f's38"
 [33m[your-program] [0morange blueberry.grape pineapple.raspberry mango.
 [33m[tester::#TG6] [0m[92m✓ Received expected response[0m
diff --git a/internal/test_helpers/fixtures/bash/quoting/pass b/internal/test_helpers/fixtures/bash/quoting/pass
@@ -24,9 +24,6 @@ Debug = true
 [33m[tester::#TG6] [0m[94mRunning tests for Stage #TG6 (tg6)[0m
 [33m[tester::#TG6] [setup] [0m[94mexport PATH=/tmp/raspberry/banana/blueberry:$PATH[0m
 [33m[tester::#TG6] [0m[94mRunning ./your_shell.sh[0m
-[33m[tester::#TG6] [setup] [0m[94mecho -n "orange blueberry." > "/tmp/bar/f 58"[0m
-[33m[tester::#TG6] [setup] [0m[94mecho -n "grape pineapple." > "/tmp/bar/f   73"[0m
-[33m[tester::#TG6] [setup] [0m[94mecho "raspberry mango." > "/tmp/bar/f's38"[0m
 [33m[your-program] [0m$ echo "shell world"
 [33m[your-program] [0mshell world
 [33m[tester::#TG6] [0m[92m✓ Received expected response[0m
@@ -36,6 +33,9 @@ Debug = true
 [33m[your-program] [0m$ echo "script"  "hello's"  world""example
 [33m[your-program] [0mscript hello's worldexample
 [33m[tester::#TG6] [0m[92m✓ Received expected response[0m
+[33m[tester::#TG6] [setup] [0m[94mecho -n "orange blueberry." > "/tmp/bar/f 58"[0m
+[33m[tester::#TG6] [setup] [0m[94mecho -n "grape pineapple." > "/tmp/bar/f   73"[0m
+[33m[tester::#TG6] [setup] [0m[94mecho "raspberry mango." > "/tmp/bar/f's38"[0m
 [33m[your-program] [0m$ cat "/tmp/bar/f 58" "/tmp/bar/f   73" "/tmp/bar/f's38"
 [33m[your-program] [0morange blueberry.grape pineapple.raspberry mango.
 [33m[tester::#TG6] [0m[92m✓ Received expected response[0m

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,6 @@ func testQ2(stageHarness *test_case_harness.TestCaseHarness) error {`
`59`	`59`	fmt.Sprintf(`%s %s's %s%s`, L[3], L[4], L[1], L[2]),
`60`	`60`	`fileContents[0] + fileContents[1] + strings.TrimRight(fileContents[2], "\n"),`
`61`	`61`	`}`
`62`		`- if err := writeFiles(filePaths, fileContents, logger); err != nil {`
`63`		`- return err`
`64`		`- }`
`65`	`62`
`66`	`63`	`testCaseContents := newTestCaseContents(inputs, expectedOutputs)`
`67`	`64`
`@@ -77,6 +74,10 @@ func testQ2(stageHarness *test_case_harness.TestCaseHarness) error {`
`77`	`74`	`}`
`78`	`75`	`}`
`79`	`76`
	`77`	`+ if err := writeFiles(filePaths, fileContents, logger); err != nil {`
	`78`	`+ return err`
	`79`	`+ }`
	`80`	`+`
`80`	`81`	`testCase := test_cases.CommandResponseTestCase{`
`81`	`82`	`Command: testCaseContents[3].Input,`
`82`	`83`	`ExpectedOutput: testCaseContents[3].ExpectedOutput,`
-Original file line number
+Diff line change
 [33m[tester::#TG6] [0m[94mRunning tests for Stage #TG6 (tg6)[0m
 [33m[tester::#TG6] [setup] [0m[94mexport PATH=/tmp/raspberry/banana/blueberry:$PATH[0m
 [33m[tester::#TG6] [0m[94mRunning ./your_shell.sh[0m
 -[33m[tester::#TG6] [setup] [0m[94mecho -n "orange blueberry." > "/tmp/bar/f 58"[0m
 -[33m[tester::#TG6] [setup] [0m[94mecho -n "grape pineapple." > "/tmp/bar/f   73"[0m
 -[33m[tester::#TG6] [setup] [0m[94mecho "raspberry mango." > "/tmp/bar/f's38"[0m
 [33m[your-program] [0m$ echo "shell world"
 [33m[your-program] [0mshell world
 [33m[tester::#TG6] [0m[92m✓ Received expected response[0m
 [33m[your-program] [0m$ echo "script"  "hello's"  world""example
 [33m[your-program] [0mscript hello's worldexample
 [33m[tester::#TG6] [0m[92m✓ Received expected response[0m
 +[33m[tester::#TG6] [setup] [0m[94mecho -n "orange blueberry." > "/tmp/bar/f 58"[0m
 +[33m[tester::#TG6] [setup] [0m[94mecho -n "grape pineapple." > "/tmp/bar/f   73"[0m
 +[33m[tester::#TG6] [setup] [0m[94mecho "raspberry mango." > "/tmp/bar/f's38"[0m
 [33m[your-program] [0m$ cat "/tmp/bar/f 58" "/tmp/bar/f   73" "/tmp/bar/f's38"
 [33m[your-program] [0morange blueberry.grape pineapple.raspberry mango.
 [33m[tester::#TG6] [0m[92m✓ Received expected response[0m