From 6a1cb430651132c09b57d5580e11f5d090cd47fe Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 28 Mar 2025 14:35:33 -0700
Subject: [PATCH] split testdata

---
 rust/pspp/src/format/display.rs                               | 4 ++--
 rust/pspp/src/format/parse.rs                                 | 2 +-
 rust/pspp/src/format/testdata/{ => display}/cca.txt           | 0
 rust/pspp/src/format/testdata/{ => display}/ccb.txt           | 0
 rust/pspp/src/format/testdata/{ => display}/ccc.txt           | 0
 rust/pspp/src/format/testdata/{ => display}/ccd.txt           | 0
 rust/pspp/src/format/testdata/{ => display}/cce.txt           | 0
 rust/pspp/src/format/testdata/{ => display}/comma.txt         | 0
 rust/pspp/src/format/testdata/{ => display}/dollar.txt        | 0
 rust/pspp/src/format/testdata/{ => display}/dot.txt           | 0
 rust/pspp/src/format/testdata/{ => display}/e.txt             | 0
 rust/pspp/src/format/testdata/{ => display}/f.txt             | 0
 rust/pspp/src/format/testdata/{ => display}/ib.txt            | 0
 rust/pspp/src/format/testdata/{ => display}/n.txt             | 0
 rust/pspp/src/format/testdata/{ => display}/p.txt             | 0
 rust/pspp/src/format/testdata/{ => display}/pct.txt           | 0
 rust/pspp/src/format/testdata/{ => display}/pib.txt           | 0
 rust/pspp/src/format/testdata/{ => display}/pibhex.txt        | 0
 rust/pspp/src/format/testdata/{ => display}/pk.txt            | 0
 rust/pspp/src/format/testdata/{ => display}/rb.txt            | 0
 rust/pspp/src/format/testdata/{ => display}/rbhex.txt         | 0
 .../testdata/{ => display}/split-binhex-out.expected.py       | 0
 .../format/testdata/{ => display}/split-num-out.expected.py   | 0
 rust/pspp/src/format/testdata/{ => display}/z.txt             | 0
 rust/pspp/src/format/testdata/{ => parse}/num-in.expected.txt | 0
 rust/pspp/src/format/testdata/{ => parse}/num-in.txt          | 0
 26 files changed, 3 insertions(+), 3 deletions(-)
 rename rust/pspp/src/format/testdata/{ => display}/cca.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/ccb.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/ccc.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/ccd.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/cce.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/comma.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/dollar.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/dot.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/e.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/f.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/ib.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/n.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/p.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/pct.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/pib.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/pibhex.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/pk.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/rb.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/rbhex.txt (100%)
 rename rust/pspp/src/format/testdata/{ => display}/split-binhex-out.expected.py (100%)
 rename rust/pspp/src/format/testdata/{ => display}/split-num-out.expected.py (100%)
 rename rust/pspp/src/format/testdata/{ => display}/z.txt (100%)
 rename rust/pspp/src/format/testdata/{ => parse}/num-in.expected.txt (100%)
 rename rust/pspp/src/format/testdata/{ => parse}/num-in.txt (100%)

diff --git a/rust/pspp/src/format/display.rs b/rust/pspp/src/format/display.rs
index 37b369957b..3784406285 100644
--- a/rust/pspp/src/format/display.rs
+++ b/rust/pspp/src/format/display.rs
@@ -1078,7 +1078,7 @@ mod test {
 
     fn test(name: &str) {
         let filename = Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("src/format/testdata")
+            .join("src/format/testdata/display")
             .join(name);
         let input = BufReader::new(File::open(&filename).unwrap());
         let settings = Settings::default()
@@ -1285,7 +1285,7 @@ mod test {
 
     fn test_binhex(name: &str) {
         let filename = Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("src/format/testdata")
+            .join("src/format/testdata/display")
             .join(name);
         let input = BufReader::new(File::open(&filename).unwrap());
         let mut value = None;
diff --git a/rust/pspp/src/format/parse.rs b/rust/pspp/src/format/parse.rs
index e0ae2de841..4f1c7b8085 100644
--- a/rust/pspp/src/format/parse.rs
+++ b/rust/pspp/src/format/parse.rs
@@ -225,7 +225,7 @@ mod test {
 
     #[test]
     fn number() {
-        let base = Path::new(env!("CARGO_MANIFEST_DIR")).join("src/format/testdata");
+        let base = Path::new(env!("CARGO_MANIFEST_DIR")).join("src/format/testdata/parse");
         let input_stream = BufReader::new(File::open(base.join("num-in.txt")).unwrap());
         let expected_stream = BufReader::new(File::open(base.join("num-in.expected.txt")).unwrap());
         for (line_number, (input, expected)) in input_stream
diff --git a/rust/pspp/src/format/testdata/cca.txt b/rust/pspp/src/format/testdata/display/cca.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/cca.txt
rename to rust/pspp/src/format/testdata/display/cca.txt
diff --git a/rust/pspp/src/format/testdata/ccb.txt b/rust/pspp/src/format/testdata/display/ccb.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/ccb.txt
rename to rust/pspp/src/format/testdata/display/ccb.txt
diff --git a/rust/pspp/src/format/testdata/ccc.txt b/rust/pspp/src/format/testdata/display/ccc.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/ccc.txt
rename to rust/pspp/src/format/testdata/display/ccc.txt
diff --git a/rust/pspp/src/format/testdata/ccd.txt b/rust/pspp/src/format/testdata/display/ccd.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/ccd.txt
rename to rust/pspp/src/format/testdata/display/ccd.txt
diff --git a/rust/pspp/src/format/testdata/cce.txt b/rust/pspp/src/format/testdata/display/cce.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/cce.txt
rename to rust/pspp/src/format/testdata/display/cce.txt
diff --git a/rust/pspp/src/format/testdata/comma.txt b/rust/pspp/src/format/testdata/display/comma.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/comma.txt
rename to rust/pspp/src/format/testdata/display/comma.txt
diff --git a/rust/pspp/src/format/testdata/dollar.txt b/rust/pspp/src/format/testdata/display/dollar.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/dollar.txt
rename to rust/pspp/src/format/testdata/display/dollar.txt
diff --git a/rust/pspp/src/format/testdata/dot.txt b/rust/pspp/src/format/testdata/display/dot.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/dot.txt
rename to rust/pspp/src/format/testdata/display/dot.txt
diff --git a/rust/pspp/src/format/testdata/e.txt b/rust/pspp/src/format/testdata/display/e.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/e.txt
rename to rust/pspp/src/format/testdata/display/e.txt
diff --git a/rust/pspp/src/format/testdata/f.txt b/rust/pspp/src/format/testdata/display/f.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/f.txt
rename to rust/pspp/src/format/testdata/display/f.txt
diff --git a/rust/pspp/src/format/testdata/ib.txt b/rust/pspp/src/format/testdata/display/ib.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/ib.txt
rename to rust/pspp/src/format/testdata/display/ib.txt
diff --git a/rust/pspp/src/format/testdata/n.txt b/rust/pspp/src/format/testdata/display/n.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/n.txt
rename to rust/pspp/src/format/testdata/display/n.txt
diff --git a/rust/pspp/src/format/testdata/p.txt b/rust/pspp/src/format/testdata/display/p.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/p.txt
rename to rust/pspp/src/format/testdata/display/p.txt
diff --git a/rust/pspp/src/format/testdata/pct.txt b/rust/pspp/src/format/testdata/display/pct.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/pct.txt
rename to rust/pspp/src/format/testdata/display/pct.txt
diff --git a/rust/pspp/src/format/testdata/pib.txt b/rust/pspp/src/format/testdata/display/pib.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/pib.txt
rename to rust/pspp/src/format/testdata/display/pib.txt
diff --git a/rust/pspp/src/format/testdata/pibhex.txt b/rust/pspp/src/format/testdata/display/pibhex.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/pibhex.txt
rename to rust/pspp/src/format/testdata/display/pibhex.txt
diff --git a/rust/pspp/src/format/testdata/pk.txt b/rust/pspp/src/format/testdata/display/pk.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/pk.txt
rename to rust/pspp/src/format/testdata/display/pk.txt
diff --git a/rust/pspp/src/format/testdata/rb.txt b/rust/pspp/src/format/testdata/display/rb.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/rb.txt
rename to rust/pspp/src/format/testdata/display/rb.txt
diff --git a/rust/pspp/src/format/testdata/rbhex.txt b/rust/pspp/src/format/testdata/display/rbhex.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/rbhex.txt
rename to rust/pspp/src/format/testdata/display/rbhex.txt
diff --git a/rust/pspp/src/format/testdata/split-binhex-out.expected.py b/rust/pspp/src/format/testdata/display/split-binhex-out.expected.py
similarity index 100%
rename from rust/pspp/src/format/testdata/split-binhex-out.expected.py
rename to rust/pspp/src/format/testdata/display/split-binhex-out.expected.py
diff --git a/rust/pspp/src/format/testdata/split-num-out.expected.py b/rust/pspp/src/format/testdata/display/split-num-out.expected.py
similarity index 100%
rename from rust/pspp/src/format/testdata/split-num-out.expected.py
rename to rust/pspp/src/format/testdata/display/split-num-out.expected.py
diff --git a/rust/pspp/src/format/testdata/z.txt b/rust/pspp/src/format/testdata/display/z.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/z.txt
rename to rust/pspp/src/format/testdata/display/z.txt
diff --git a/rust/pspp/src/format/testdata/num-in.expected.txt b/rust/pspp/src/format/testdata/parse/num-in.expected.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/num-in.expected.txt
rename to rust/pspp/src/format/testdata/parse/num-in.expected.txt
diff --git a/rust/pspp/src/format/testdata/num-in.txt b/rust/pspp/src/format/testdata/parse/num-in.txt
similarity index 100%
rename from rust/pspp/src/format/testdata/num-in.txt
rename to rust/pspp/src/format/testdata/parse/num-in.txt
-- 
2.30.2