Prefer _1 and _2 naming for test files

This is less to type, and it's now alphabetical, so e.g. sample_files/*.kt just works as a test argument.
Wilfred · Apr 29, 2024 · 5c40cd0 · 5c40cd0
1 parent cce7b2e
commit 5c40cd0
Show file tree

Hide file tree

Showing 229 changed files with 256 additions and 260 deletions.
diff --git a/manual/src/adding_a_parser.md b/manual/src/adding_a_parser.md
@@ -125,11 +125,11 @@ Finally, add a regression test for your language. This ensures that
 the output for your test file doesn't change unexpectedly.
 
 Regression test files live in `sample_files/` and have the form
-`foo_before.abc` and `foo_after.abc`.
+`foo_1.abc` and `foo_2.abc`.
 
 ```
-$ nano simple_before.json
-$ nano simple_after.json
+$ nano simple_1.json
+$ nano simple_2.json
 ```
 
 Run the regression test script and update the `.expected` file.

diff --git a/manual/src/line_diffing.md b/manual/src/line_diffing.md
@@ -18,7 +18,7 @@ Variations, Myers
 ```
 # Modern diff supports colour, but see also
 # https://www.colordiff.org/
-$ diff --color=always -u sample_files/css_before.css sample_files/css_after.css
+$ diff --color=always -u sample_files/css_1.css sample_files/css_2.css
 ```
 
 Note that GNU diff [originally used the Hunt-McIlroy
@@ -64,11 +64,11 @@ work](https://stackoverflow.com/questions/40133534/is-gits-implementation-of-the
 
 ```
 # Original behaviour
-$ git diff --no-indent-heuristic --no-index sample_files/css_before.css sample_files/css_after.css
+$ git diff --no-indent-heuristic --no-index sample_files/css_1.css sample_files/css_2.css
 # As of git 2.11, this heuristic is enabled by default.
-$ git diff --indent-heuristic --no-index sample_files/css_before.css sample_files/css_after.css
+$ git diff --indent-heuristic --no-index sample_files/css_1.css sample_files/css_2.css
 # Patience algorithm does a better a job in this example.
-$ git diff --patience --no-index sample_files/css_before.css sample_files/css_after.css
+$ git diff --patience --no-index sample_files/css_1.css sample_files/css_2.css
 ```
 
 [Diff Match Patch](https://github.com/google/diff-match-patch) also
@@ -84,7 +84,7 @@ of the patience algorithm](https://github.com/git/git/commit/85551232b56e763ecfc
 
 ```
 # Inferior to patience on this example file.
-$ git diff --histogram --no-index sample_files/css_before.css sample_files/css_after.css
+$ git diff --histogram --no-index sample_files/css_1.css sample_files/css_2.css
 ```
 
 ### prettydiff

diff --git a/manual/src/parsing.md b/manual/src/parsing.md
@@ -12,7 +12,7 @@ the parse tree that tree-sitter produces using the `--dump-ts`
 flag.
 
 ```
-$ difft --dump-ts sample_files/javascript_simple_before.js | head
+$ difft --dump-ts sample_files/javascript_simple_1.js | head
 program (0, 0) - (7, 0)
   comment (0, 0) - (0, 8) "// hello"
   expression_statement (1, 0) - (1, 6)

diff --git a/manual/src/profiling.md b/manual/src/profiling.md
@@ -5,22 +5,22 @@ If you have a file that's particularly slow, you can use
 which functions are slow.
 
 ```
-$ CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph --bin difft sample_files/slow_before.rs sample_files/slow_after.rs
+$ CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph --bin difft sample_files/slow_1.rs sample_files/slow_2.rs
 ```
 
 It's also worth looking at memory usage, as graph traversal bugs can
 lead to huge memory consumption.
 
 ```
-$ /usr/bin/time -v ./target/release/difft sample_files/slow_before.rs sample_files/slow_after.rs
+$ /usr/bin/time -v ./target/release/difft sample_files/slow_1.rs sample_files/slow_2.rs
 ```
 
 If timing measurement are noisy, Linux's `perf` tool will report
 instructions executed, which is more stable.
 
 ```
-$ perf stat ./target/release/difft sample_files/slow_before.rs sample_files/slow_after.rs
-$ perf stat ./target/release/difft sample_files/typing_old.ml sample_files/typing_new.ml
+$ perf stat ./target/release/difft sample_files/slow_1.rs sample_files/slow_2.rs
+$ perf stat ./target/release/difft sample_files/typing_1.ml sample_files/typing_2.ml
 ```
 
 Many more profiling techniques are discussed in [The Rust Performance

diff --git a/manual/src/tricky_cases.md b/manual/src/tricky_cases.md
@@ -437,7 +437,7 @@ parse errors occur, to avoid diffing incomplete syntax trees. When
 this occurs, the file header reports the error count.
 
 ```
-$ difft sample_files/syntax_error_before.js sample_files/syntax_error_after.js
+$ difft sample_files/syntax_error_1.js sample_files/syntax_error_2.js
 sample_files/syntax_error_after.js --- Text (2 errors, exceeded DFT_PARSE_ERROR_LIMIT)
 ...
 ```

diff --git a/manual/src/usage.md b/manual/src/usage.md
@@ -11,7 +11,7 @@ $ difft sample_files/before.js sample_files/after.js
 ### Diffing Directories
 
 ```
-$ difft sample_files/dir_before/ sample_files/dir_after/
+$ difft sample_files/dir_1/ sample_files/dir_2/
 ```
 
 Difftastic will recursively walk the two directories, diffing files

diff --git a/sample_files/Session_before.kt → sample_files/Session_1.kt b/sample_files/Session_before.kt → sample_files/Session_1.kt
diff --git a/sample_files/Session_after.kt → sample_files/Session_2.kt b/sample_files/Session_after.kt → sample_files/Session_2.kt
diff --git a/sample_files/ada_before.adb → sample_files/ada_1.adb b/sample_files/ada_before.adb → sample_files/ada_1.adb
diff --git a/sample_files/ada_after.adb → sample_files/ada_2.adb b/sample_files/ada_after.adb → sample_files/ada_2.adb
diff --git a/sample_files/added_line_before.txt → sample_files/added_line_1.txt b/sample_files/added_line_before.txt → sample_files/added_line_1.txt
diff --git a/sample_files/added_line_after.txt → sample_files/added_line_2.txt b/sample_files/added_line_after.txt → sample_files/added_line_2.txt
diff --git a/sample_files/align_footer_before.txt → sample_files/align_footer_1.txt b/sample_files/align_footer_before.txt → sample_files/align_footer_1.txt
diff --git a/sample_files/align_footer_after.txt → sample_files/align_footer_2.txt b/sample_files/align_footer_after.txt → sample_files/align_footer_2.txt
diff --git a/sample_files/apex_before.cls → sample_files/apex_1.cls b/sample_files/apex_before.cls → sample_files/apex_1.cls
diff --git a/sample_files/apex_after.cls → sample_files/apex_2.cls b/sample_files/apex_after.cls → sample_files/apex_2.cls
diff --git a/sample_files/b2_math_before.h → sample_files/b2_math_1.h b/sample_files/b2_math_before.h → sample_files/b2_math_1.h
diff --git a/sample_files/b2_math_after.h → sample_files/b2_math_2.h b/sample_files/b2_math_after.h → sample_files/b2_math_2.h
diff --git a/sample_files/bad_combine_before.rs → sample_files/bad_combine_1.rs b/sample_files/bad_combine_before.rs → sample_files/bad_combine_1.rs
diff --git a/sample_files/bad_combine_after.rs → sample_files/bad_combine_2.rs b/sample_files/bad_combine_after.rs → sample_files/bad_combine_2.rs
diff --git a/sample_files/change_outer_before.el → sample_files/change_outer_1.el b/sample_files/change_outer_before.el → sample_files/change_outer_1.el
diff --git a/sample_files/change_outer_after.el → sample_files/change_outer_2.el b/sample_files/change_outer_after.el → sample_files/change_outer_2.el
diff --git a/sample_files/chinese_before.po → sample_files/chinese_1.po b/sample_files/chinese_before.po → sample_files/chinese_1.po
diff --git a/sample_files/chinese_after.po → sample_files/chinese_2.po b/sample_files/chinese_after.po → sample_files/chinese_2.po
diff --git a/sample_files/cli_tests/bad_yaml_before.yml → sample_files/cli_tests/bad_yaml_1.yml b/sample_files/cli_tests/bad_yaml_before.yml → sample_files/cli_tests/bad_yaml_1.yml
diff --git a/sample_files/cli_tests/bad_yaml_after.yml → sample_files/cli_tests/bad_yaml_2.yml b/sample_files/cli_tests/bad_yaml_after.yml → sample_files/cli_tests/bad_yaml_2.yml
diff --git a/sample_files/cli_tests/makefile_before.mk → sample_files/cli_tests/makefile_1.mk b/sample_files/cli_tests/makefile_before.mk → sample_files/cli_tests/makefile_1.mk
diff --git a/sample_files/cli_tests/makefile_after.mk → sample_files/cli_tests/makefile_2.mk b/sample_files/cli_tests/makefile_after.mk → sample_files/cli_tests/makefile_2.mk
diff --git a/sample_files/clojure_before.clj → sample_files/clojure_1.clj b/sample_files/clojure_before.clj → sample_files/clojure_1.clj
diff --git a/sample_files/clojure_after.clj → sample_files/clojure_2.clj b/sample_files/clojure_after.clj → sample_files/clojure_2.clj
diff --git a/sample_files/comma_before.js → sample_files/comma_1.js b/sample_files/comma_before.js → sample_files/comma_1.js
diff --git a/sample_files/comma_after.js → sample_files/comma_2.js b/sample_files/comma_after.js → sample_files/comma_2.js
diff --git a/sample_files/comma_and_comment_before.js → sample_files/comma_and_comment_1.js b/sample_files/comma_and_comment_before.js → sample_files/comma_and_comment_1.js
diff --git a/sample_files/comma_and_comment_after.js → sample_files/comma_and_comment_2.js b/sample_files/comma_and_comment_after.js → sample_files/comma_and_comment_2.js
diff --git a/sample_files/comments_before.rs → sample_files/comments_1.rs b/sample_files/comments_before.rs → sample_files/comments_1.rs
diff --git a/sample_files/comments_after.rs → sample_files/comments_2.rs b/sample_files/comments_after.rs → sample_files/comments_2.rs