Commit 5f571f53d63e8742374c3c3cdda1ca0bb432d8fc | zig

author	Andrew Kelley <andrew@ziglang.org> 2025-07-28 16:53:01-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2025-07-31 22:10:11-07:00
log	5f571f53d63e8742374c3c3cdda1ca0bb432d8fc
tree	b5362fda807a6fe7c2d23ef23b76b6158893a00c
parent	e73ca2444e1d7a42266af5496f24ec122fd18f2c

refactor gzip test cases

zig newbies love using for loops in unit tests

1 files changed, 47 insertions(+), 57 deletions(-)

lib
- std
  - compress
    flate
    Decompress.zig

lib/std/compress/flate/Decompress.zig+47-57

 @@ -864,7 +864,7 @@ test "dynamic block (type 2)" {
 fn testBasicCase(in: []const u8, out: []const u8) !void {
     var reader: Reader = .fixed(in);
     var aw: Writer.Allocating = .init(testing.allocator);
-    try aw.ensureUnusedCapacity(flate.history_len + 1);
+    try aw.ensureUnusedCapacity(flate.history_len);
     defer aw.deinit();
     var decompress: Decompress = .init(&reader, .raw, &.{});
 @@ -873,63 +873,53 @@ fn testBasicCase(in: []const u8, out: []const u8) !void {
     try testing.expectEqualStrings(out, aw.getWritten());
 }
-test "gzip decompress" {
+test "gzip non compressed block (type 0)" {
-    const cases = [_]struct {
+    try testGzipDecompress(&[_]u8{
-        in: []const u8,
+        0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, // gzip header (10 bytes)
-        out: []const u8,
+        0b0000_0001, 0b0000_1100, 0x00, 0b1111_0011, 0xff, // deflate fixed buffer header len, nlen
-    }{
+        'H', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd', 0x0a, // non compressed data
-        // non compressed block (type 0)
+        0xd5, 0xe0, 0x39, 0xb7, // gzip footer: checksum
-        .{
+        0x0c, 0x00, 0x00, 0x00, // gzip footer: size
-            .in = &[_]u8{
+    }, "Hello world\n");
-                0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, // gzip header (10 bytes)
+}
-                0b0000_0001, 0b0000_1100, 0x00, 0b1111_0011, 0xff, // deflate fixed buffer header len, nlen
-                'H', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd', 0x0a, // non compressed data
-                0xd5, 0xe0, 0x39, 0xb7, // gzip footer: checksum
-                0x0c, 0x00, 0x00, 0x00, // gzip footer: size
-            },
-            .out = "Hello world\n",
-        },
-        // fixed code block (type 1)
-        .{
-            .in = &[_]u8{
-                0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x03, // gzip header (10 bytes)
-                0xf3, 0x48, 0xcd, 0xc9, 0xc9, 0x57, 0x28, 0xcf, // deflate data block type 1
-                0x2f, 0xca, 0x49, 0xe1, 0x02, 0x00,
-                0xd5, 0xe0, 0x39, 0xb7, 0x0c, 0x00, 0x00, 0x00, // gzip footer (chksum, len)
-            },
-            .out = "Hello world\n",
-        },
-        // dynamic block (type 2)
-        .{
-            .in = &[_]u8{
-                0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, // gzip header (10 bytes)
-                0x3d, 0xc6, 0x39, 0x11, 0x00, 0x00, 0x0c, 0x02, // deflate data block type 2
-                0x30, 0x2b, 0xb5, 0x52, 0x1e, 0xff, 0x96, 0x38,
-                0x16, 0x96, 0x5c, 0x1e, 0x94, 0xcb, 0x6d, 0x01,
-                0x17, 0x1c, 0x39, 0xb4, 0x13, 0x00, 0x00, 0x00, // gzip footer (chksum, len)
-            },
-            .out = "ABCDEABCD ABCDEABCD",
-        },
-        // gzip header with name
-        .{
-            .in = &[_]u8{
-                0x1f, 0x8b, 0x08, 0x08, 0xe5, 0x70, 0xb1, 0x65, 0x00, 0x03, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x2e,
-                0x74, 0x78, 0x74, 0x00, 0xf3, 0x48, 0xcd, 0xc9, 0xc9, 0x57, 0x28, 0xcf, 0x2f, 0xca, 0x49, 0xe1,
-                0x02, 0x00, 0xd5, 0xe0, 0x39, 0xb7, 0x0c, 0x00, 0x00, 0x00,
-            },
-            .out = "Hello world\n",
-        },
-    };
-    for (cases) |c| {
-        var fb: Reader = .fixed(c.in);
-        var aw: Writer.Allocating = .init(testing.allocator);
-        defer aw.deinit();
-        var decompress: Decompress = .init(&fb, .gzip, &.{});
+test "gzip fixed code block (type 1)" {
-        const r = &decompress.reader;
+    try testGzipDecompress(&[_]u8{
-        _ = try r.streamRemaining(&aw.writer);
+        0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x03, // gzip header (10 bytes)
-        try testing.expectEqualStrings(c.out, aw.getWritten());
+        0xf3, 0x48, 0xcd, 0xc9, 0xc9, 0x57, 0x28, 0xcf, // deflate data block type 1
-    }
+        0x2f, 0xca, 0x49, 0xe1, 0x02, 0x00,
+        0xd5, 0xe0, 0x39, 0xb7, 0x0c, 0x00, 0x00, 0x00, // gzip footer (chksum, len)
+    }, "Hello world\n");
+}
+test "gzip dynamic block (type 2)" {
+    try testGzipDecompress(&[_]u8{
+        0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, // gzip header (10 bytes)
+        0x3d, 0xc6, 0x39, 0x11, 0x00, 0x00, 0x0c, 0x02, // deflate data block type 2
+        0x30, 0x2b, 0xb5, 0x52, 0x1e, 0xff, 0x96, 0x38,
+        0x16, 0x96, 0x5c, 0x1e, 0x94, 0xcb, 0x6d, 0x01,
+        0x17, 0x1c, 0x39, 0xb4, 0x13, 0x00, 0x00, 0x00, // gzip footer (chksum, len)
+    }, "ABCDEABCD ABCDEABCD");
+}
+test "gzip header with name" {
+    try testGzipDecompress(&[_]u8{
+        0x1f, 0x8b, 0x08, 0x08, 0xe5, 0x70, 0xb1, 0x65, 0x00, 0x03, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x2e,
+        0x74, 0x78, 0x74, 0x00, 0xf3, 0x48, 0xcd, 0xc9, 0xc9, 0x57, 0x28, 0xcf, 0x2f, 0xca, 0x49, 0xe1,
+        0x02, 0x00, 0xd5, 0xe0, 0x39, 0xb7, 0x0c, 0x00, 0x00, 0x00,
+    }, "Hello world\n");
+}
+fn testGzipDecompress(in: []const u8, out: []const u8) !void {
+    var reader: Reader = .fixed(in);
+    var aw: Writer.Allocating = .init(testing.allocator);
+    try aw.ensureUnusedCapacity(flate.history_len);
+    defer aw.deinit();
+    var decompress: Decompress = .init(&reader, .gzip, &.{});
+    const r = &decompress.reader;
+    _ = try r.streamRemaining(&aw.writer);
+    try testing.expectEqualStrings(out, aw.getWritten());
 }
 test "zlib decompress" {