From 0d895e9933d0fd8b712d326c6c8d9dfac39ea1b6 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 4 Aug 2025 13:20:59 -0700
Subject: [PATCH] Fix a few tests that broke.

---
 .../src/sys/testdata/write-numeric-simple.expected   | 12 ++++++++++++
 .../sys/testdata/write-numeric-uncompressed.expected | 12 ++++++++++++
 .../src/sys/testdata/write-numeric-zlib.expected     | 12 ++++++++++++
 .../src/sys/testdata/write-string-simple.expected    | 12 ++++++++++++
 .../sys/testdata/write-string-uncompressed.expected  | 12 ++++++++++++
 .../pspp/src/sys/testdata/write-string-zlib.expected | 12 ++++++++++++
 6 files changed, 72 insertions(+)

diff --git a/rust/pspp/src/sys/testdata/write-numeric-simple.expected b/rust/pspp/src/sys/testdata/write-numeric-simple.expected
index e4aaffd183..51f13ca578 100644
--- a/rust/pspp/src/sys/testdata/write-numeric-simple.expected
+++ b/rust/pspp/src/sys/testdata/write-numeric-simple.expected
@@ -21,6 +21,18 @@
 │variable3│       4│     │                 │Input│    8│Right    │F8.2        │F8.2        │              │
 ╰─────────┴────────┴─────┴─────────────────┴─────┴─────┴─────────┴────────────┴────────────┴──────────────╯
 
+╭────────────────────────┬─────╮
+│Variable and Name       │Value│
+├────────────────────────┼─────┤
+│variable0         $@Role│0    │
+├────────────────────────┼─────┤
+│variable1         $@Role│0    │
+├────────────────────────┼─────┤
+│variable2         $@Role│0    │
+├────────────────────────┼─────┤
+│variable3         $@Role│0    │
+╰────────────────────────┴─────╯
+
 ╭────┬─────────┬─────────┬─────────┬─────────╮
 │Case│variable0│variable1│variable2│variable3│
 ├────┼─────────┼─────────┼─────────┼─────────┤
diff --git a/rust/pspp/src/sys/testdata/write-numeric-uncompressed.expected b/rust/pspp/src/sys/testdata/write-numeric-uncompressed.expected
index 084ca95c27..b1cf952ad5 100644
--- a/rust/pspp/src/sys/testdata/write-numeric-uncompressed.expected
+++ b/rust/pspp/src/sys/testdata/write-numeric-uncompressed.expected
@@ -21,6 +21,18 @@
 │variable3│       4│     │                 │Input│    8│Right    │F8.2        │F8.2        │              │
 ╰─────────┴────────┴─────┴─────────────────┴─────┴─────┴─────────┴────────────┴────────────┴──────────────╯
 
+╭────────────────────────┬─────╮
+│Variable and Name       │Value│
+├────────────────────────┼─────┤
+│variable0         $@Role│0    │
+├────────────────────────┼─────┤
+│variable1         $@Role│0    │
+├────────────────────────┼─────┤
+│variable2         $@Role│0    │
+├────────────────────────┼─────┤
+│variable3         $@Role│0    │
+╰────────────────────────┴─────╯
+
 ╭────┬─────────┬─────────┬─────────┬─────────╮
 │Case│variable0│variable1│variable2│variable3│
 ├────┼─────────┼─────────┼─────────┼─────────┤
diff --git a/rust/pspp/src/sys/testdata/write-numeric-zlib.expected b/rust/pspp/src/sys/testdata/write-numeric-zlib.expected
index 40a0b02010..46c6fbb2c3 100644
--- a/rust/pspp/src/sys/testdata/write-numeric-zlib.expected
+++ b/rust/pspp/src/sys/testdata/write-numeric-zlib.expected
@@ -21,6 +21,18 @@
 │variable3│       4│     │                 │Input│    8│Right    │F8.2        │F8.2        │              │
 ╰─────────┴────────┴─────┴─────────────────┴─────┴─────┴─────────┴────────────┴────────────┴──────────────╯
 
+╭────────────────────────┬─────╮
+│Variable and Name       │Value│
+├────────────────────────┼─────┤
+│variable0         $@Role│0    │
+├────────────────────────┼─────┤
+│variable1         $@Role│0    │
+├────────────────────────┼─────┤
+│variable2         $@Role│0    │
+├────────────────────────┼─────┤
+│variable3         $@Role│0    │
+╰────────────────────────┴─────╯
+
 ╭────┬─────────┬─────────┬─────────┬─────────╮
 │Case│variable0│variable1│variable2│variable3│
 ├────┼─────────┼─────────┼─────────┼─────────┤
diff --git a/rust/pspp/src/sys/testdata/write-string-simple.expected b/rust/pspp/src/sys/testdata/write-string-simple.expected
index fcfe2d649d..d063ec4c62 100644
--- a/rust/pspp/src/sys/testdata/write-string-simple.expected
+++ b/rust/pspp/src/sys/testdata/write-string-simple.expected
@@ -33,6 +33,18 @@
 │               012345678│Sixth value label │
 ╰────────────────────────┴──────────────────╯
 
+╭────────────────────────┬─────╮
+│Variable and Name       │Value│
+├────────────────────────┼─────┤
+│s1                $@Role│0    │
+├────────────────────────┼─────┤
+│s2                $@Role│0    │
+├────────────────────────┼─────┤
+│s3                $@Role│0    │
+├────────────────────────┼─────┤
+│s4                $@Role│0    │
+╰────────────────────────┴─────╯
+
 ╭────┬─────────┬─────────┬─────────┬─────────╮
 │Case│    s1   │    s2   │    s3   │    s4   │
 ├────┼─────────┼─────────┼─────────┼─────────┤
diff --git a/rust/pspp/src/sys/testdata/write-string-uncompressed.expected b/rust/pspp/src/sys/testdata/write-string-uncompressed.expected
index 05b5b980a9..6f7dd8efc5 100644
--- a/rust/pspp/src/sys/testdata/write-string-uncompressed.expected
+++ b/rust/pspp/src/sys/testdata/write-string-uncompressed.expected
@@ -33,6 +33,18 @@
 │               012345678│Sixth value label │
 ╰────────────────────────┴──────────────────╯
 
+╭────────────────────────┬─────╮
+│Variable and Name       │Value│
+├────────────────────────┼─────┤
+│s1                $@Role│0    │
+├────────────────────────┼─────┤
+│s2                $@Role│0    │
+├────────────────────────┼─────┤
+│s3                $@Role│0    │
+├────────────────────────┼─────┤
+│s4                $@Role│0    │
+╰────────────────────────┴─────╯
+
 ╭────┬─────────┬─────────┬─────────┬─────────╮
 │Case│    s1   │    s2   │    s3   │    s4   │
 ├────┼─────────┼─────────┼─────────┼─────────┤
diff --git a/rust/pspp/src/sys/testdata/write-string-zlib.expected b/rust/pspp/src/sys/testdata/write-string-zlib.expected
index abaa473863..41a64afcaa 100644
--- a/rust/pspp/src/sys/testdata/write-string-zlib.expected
+++ b/rust/pspp/src/sys/testdata/write-string-zlib.expected
@@ -33,6 +33,18 @@
 │               012345678│Sixth value label │
 ╰────────────────────────┴──────────────────╯
 
+╭────────────────────────┬─────╮
+│Variable and Name       │Value│
+├────────────────────────┼─────┤
+│s1                $@Role│0    │
+├────────────────────────┼─────┤
+│s2                $@Role│0    │
+├────────────────────────┼─────┤
+│s3                $@Role│0    │
+├────────────────────────┼─────┤
+│s4                $@Role│0    │
+╰────────────────────────┴─────╯
+
 ╭────┬─────────┬─────────┬─────────┬─────────╮
 │Case│    s1   │    s2   │    s3   │    s4   │
 ├────┼─────────┼─────────┼─────────┼─────────┤
-- 
2.30.2