authorgravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2022-12-14 21:30:35-08:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-15 05:13:21-05:00
log077b003c50065a8b193dcad793ca5c4474222af6
treec30a616f3130b2ed70ddfb418bf28e36ec15ad0a
parent88d927a511922efd82c4ec862c8e2aa83df84391

std.compress: Improve tests, remove reliance on openDirAbsolute

- Previously, some of the compress tests used `@src()` in combination with `dirname` and `openDirAbsolute` to read test files at runtime, which both excludes platforms that `openDirAbsolute` is not implemented for (WASI) and platforms that `SourceLocation.file` is not absolute (this was true for me locally on Windows). Instead of converting the tests to use `fs.cwd().openDir`, they have been converted to use `@embedFile` to avoid any potential problems with the runtime cwd. - In order to use `@embedFile`, some of the `[]u8` parameters needed to be changed to `[]const u8`; none of them needed to be non-const anyway - The tests now use `expectEqual` and `expectEqualSlices` where appropriate for better diagnostics

12 files changed, 112 insertions(+), 169 deletions(-)

lib/std/compress/deflate/bits_utils.zig+1-2
...@@ -8,7 +8,6 @@ pub fn bitReverse(comptime T: type, value: T, N: usize) T {...@@ -8,7 +8,6 @@ pub fn bitReverse(comptime T: type, value: T, N: usize) T {
88
9test "bitReverse" {9test "bitReverse" {
10 const std = @import("std");10 const std = @import("std");
11 const expect = std.testing.expect;
1211
13 const ReverseBitsTest = struct {12 const ReverseBitsTest = struct {
14 in: u16,13 in: u16,
...@@ -29,6 +28,6 @@ test "bitReverse" {...@@ -29,6 +28,6 @@ test "bitReverse" {
2928
30 for (reverse_bits_tests) |h| {29 for (reverse_bits_tests) |h| {
31 var v = bitReverse(u16, h.in, h.bit_count);30 var v = bitReverse(u16, h.in, h.bit_count);
32 try expect(v == h.out);31 try std.testing.expectEqual(h.out, v);
33 }32 }
34}33}
lib/std/compress/deflate/compressor.zig+2-2
...@@ -1079,7 +1079,7 @@ test "deflate" {...@@ -1079,7 +1079,7 @@ test "deflate" {
1079 try comp.close();1079 try comp.close();
1080 comp.deinit();1080 comp.deinit();
10811081
1082 try expect(mem.eql(u8, output.items, dt.out));1082 try testing.expectEqualSlices(u8, dt.out, output.items);
1083 }1083 }
1084}1084}
10851085
...@@ -1104,7 +1104,7 @@ test "bulkHash4" {...@@ -1104,7 +1104,7 @@ test "bulkHash4" {
1104 _ = bulkHash4(y, dst);1104 _ = bulkHash4(y, dst);
1105 for (dst) |got, i| {1105 for (dst) |got, i| {
1106 var want = hash4(y[i..]);1106 var want = hash4(y[i..]);
1107 try expect(got == want);1107 try testing.expectEqual(want, got);
1108 }1108 }
1109 }1109 }
1110 }1110 }
lib/std/compress/deflate/compressor_test.zig+19-35
...@@ -62,8 +62,8 @@ fn testSync(level: deflate.Compression, input: []const u8) !void {...@@ -62,8 +62,8 @@ fn testSync(level: deflate.Compression, input: []const u8) !void {
62 defer testing.allocator.free(decompressed);62 defer testing.allocator.free(decompressed);
6363
64 var read = try decomp.reader().readAll(decompressed); // read at least half64 var read = try decomp.reader().readAll(decompressed); // read at least half
65 try expect(read == half_len);65 try testing.expectEqual(half_len, read);
66 try expect(mem.eql(u8, input[0..half], decompressed));66 try testing.expectEqualSlices(u8, input[0..half], decompressed);
67 }67 }
6868
69 // Write last half of the input and close()69 // Write last half of the input and close()
...@@ -79,13 +79,13 @@ fn testSync(level: deflate.Compression, input: []const u8) !void {...@@ -79,13 +79,13 @@ fn testSync(level: deflate.Compression, input: []const u8) !void {
79 defer testing.allocator.free(decompressed);79 defer testing.allocator.free(decompressed);
8080
81 var read = try decomp.reader().readAll(decompressed);81 var read = try decomp.reader().readAll(decompressed);
82 try expect(read == half_len);82 try testing.expectEqual(half_len, read);
83 try expect(mem.eql(u8, input[half..], decompressed));83 try testing.expectEqualSlices(u8, input[half..], decompressed);
8484
85 // Extra read85 // Extra read
86 var final: [10]u8 = undefined;86 var final: [10]u8 = undefined;
87 read = try decomp.reader().readAll(&final);87 read = try decomp.reader().readAll(&final);
88 try expect(read == 0); // expect ended stream to return 0 bytes88 try testing.expectEqual(@as(usize, 0), read); // expect ended stream to return 0 bytes
8989
90 _ = decomp.close();90 _ = decomp.close();
91 }91 }
...@@ -105,7 +105,7 @@ fn testSync(level: deflate.Compression, input: []const u8) !void {...@@ -105,7 +105,7 @@ fn testSync(level: deflate.Compression, input: []const u8) !void {
105 _ = try decomp.reader().readAll(decompressed);105 _ = try decomp.reader().readAll(decompressed);
106 _ = decomp.close();106 _ = decomp.close();
107107
108 try expect(mem.eql(u8, input, decompressed));108 try testing.expectEqualSlices(u8, input, decompressed);
109}109}
110110
111fn testToFromWithLevelAndLimit(level: deflate.Compression, input: []const u8, limit: u32) !void {111fn testToFromWithLevelAndLimit(level: deflate.Compression, input: []const u8, limit: u32) !void {
...@@ -130,8 +130,8 @@ fn testToFromWithLevelAndLimit(level: deflate.Compression, input: []const u8, li...@@ -130,8 +130,8 @@ fn testToFromWithLevelAndLimit(level: deflate.Compression, input: []const u8, li
130 defer testing.allocator.free(decompressed);130 defer testing.allocator.free(decompressed);
131131
132 var read: usize = try decomp.reader().readAll(decompressed);132 var read: usize = try decomp.reader().readAll(decompressed);
133 try expect(read == input.len);133 try testing.expectEqual(input.len, read);
134 try expect(mem.eql(u8, input, decompressed));134 try testing.expectEqualSlices(u8, input, decompressed);
135135
136 if (false) {136 if (false) {
137 // TODO: this test has regressed137 // TODO: this test has regressed
...@@ -237,7 +237,7 @@ test "very long sparse chunk" {...@@ -237,7 +237,7 @@ test "very long sparse chunk" {
237 read = try reader.read(&buf);237 read = try reader.read(&buf);
238 written += try writer.write(buf[0..read]);238 written += try writer.write(buf[0..read]);
239 }239 }
240 try expect(written == 0x23e8);240 try testing.expectEqual(@as(usize, 0x23e8), written);
241}241}
242242
243test "compressor reset" {243test "compressor reset" {
...@@ -287,7 +287,7 @@ fn testWriterReset(level: deflate.Compression, dict: ?[]const u8) !void {...@@ -287,7 +287,7 @@ fn testWriterReset(level: deflate.Compression, dict: ?[]const u8) !void {
287 try filler.writeData(&comp);287 try filler.writeData(&comp);
288 try comp.close();288 try comp.close();
289289
290 try expect(mem.eql(u8, buf1.items, buf2.items));290 try testing.expectEqualSlices(u8, buf1.items, buf2.items);
291}291}
292292
293test "decompressor dictionary" {293test "decompressor dictionary" {
...@@ -327,7 +327,7 @@ test "decompressor dictionary" {...@@ -327,7 +327,7 @@ test "decompressor dictionary" {
327 defer decomp.deinit();327 defer decomp.deinit();
328328
329 _ = try decomp.reader().readAll(decompressed);329 _ = try decomp.reader().readAll(decompressed);
330 try expect(mem.eql(u8, decompressed, "hello again world"));330 try testing.expectEqualSlices(u8, "hello again world", decompressed);
331}331}
332332
333test "compressor dictionary" {333test "compressor dictionary" {
...@@ -371,7 +371,7 @@ test "compressor dictionary" {...@@ -371,7 +371,7 @@ test "compressor dictionary" {
371 try comp_d.writer().writeAll(text);371 try comp_d.writer().writeAll(text);
372 try comp_d.close();372 try comp_d.close();
373373
374 try expect(mem.eql(u8, compressed_nd.readableSlice(0), compressed_d.items));374 try testing.expectEqualSlices(u8, compressed_d.items, compressed_nd.readableSlice(0));
375}375}
376376
377// Update the hash for best_speed only if d.index < d.maxInsertIndex377// Update the hash for best_speed only if d.index < d.maxInsertIndex
...@@ -394,18 +394,12 @@ test "Go non-regression test for 2508" {...@@ -394,18 +394,12 @@ test "Go non-regression test for 2508" {
394}394}
395395
396test "deflate/inflate string" {396test "deflate/inflate string" {
397 // Skip wasi because it does not support std.fs.openDirAbsolute()
398 if (builtin.os.tag == .wasi) return error.SkipZigTest;
399
400 const current_dir = try std.fs.openDirAbsolute(std.fs.path.dirname(@src().file).?, .{});
401 const testdata_dir = try current_dir.openDir("testdata", .{});
402
403 const StringTest = struct {397 const StringTest = struct {
404 filename: []const u8,398 filename: []const u8,
405 limit: [11]u32,399 limit: [11]u32,
406 };400 };
407401
408 var deflate_inflate_string_tests = [_]StringTest{402 const deflate_inflate_string_tests = [_]StringTest{
409 .{403 .{
410 .filename = "compress-e.txt",404 .filename = "compress-e.txt",
411 .limit = [11]u32{405 .limit = [11]u32{
...@@ -440,12 +434,8 @@ test "deflate/inflate string" {...@@ -440,12 +434,8 @@ test "deflate/inflate string" {
440 },434 },
441 };435 };
442436
443 for (deflate_inflate_string_tests) |t| {437 inline for (deflate_inflate_string_tests) |t| {
444 const golden_file = try testdata_dir.openFile(t.filename, .{});438 var golden = @embedFile("testdata/" ++ t.filename);
445 defer golden_file.close();
446 var golden = try golden_file.reader().readAllAlloc(testing.allocator, math.maxInt(usize));
447 defer testing.allocator.free(golden);
448
449 try testToFromWithLimit(golden, t.limit);439 try testToFromWithLimit(golden, t.limit);
450 }440 }
451}441}
...@@ -492,11 +482,8 @@ test "inflate reset" {...@@ -492,11 +482,8 @@ test "inflate reset" {
492482
493 _ = decomp.close();483 _ = decomp.close();
494484
495 try expect(strings[0].len == decompressed_0.len);485 try testing.expectEqualSlices(u8, strings[0], decompressed_0);
496 try expect(strings[1].len == decompressed_1.len);486 try testing.expectEqualSlices(u8, strings[1], decompressed_1);
497
498 try expect(mem.eql(u8, strings[0], decompressed_0));
499 try expect(mem.eql(u8, strings[1], decompressed_1));
500}487}
501488
502test "inflate reset dictionary" {489test "inflate reset dictionary" {
...@@ -542,9 +529,6 @@ test "inflate reset dictionary" {...@@ -542,9 +529,6 @@ test "inflate reset dictionary" {
542529
543 _ = decomp.close();530 _ = decomp.close();
544531
545 try expect(strings[0].len == decompressed_0.len);532 try testing.expectEqualSlices(u8, strings[0], decompressed_0);
546 try expect(strings[1].len == decompressed_1.len);533 try testing.expectEqualSlices(u8, strings[1], decompressed_1);
547
548 try expect(mem.eql(u8, strings[0], decompressed_0));
549 try expect(mem.eql(u8, strings[1], decompressed_1));
550}534}
lib/std/compress/deflate/decompressor.zig+3-4
...@@ -895,7 +895,6 @@ pub fn Decompressor(comptime ReaderType: type) type {...@@ -895,7 +895,6 @@ pub fn Decompressor(comptime ReaderType: type) type {
895}895}
896896
897// tests897// tests
898const expect = std.testing.expect;
899const expectError = std.testing.expectError;898const expectError = std.testing.expectError;
900const io = std.io;899const io = std.io;
901const testing = std.testing;900const testing = std.testing;
...@@ -928,7 +927,7 @@ test "truncated input" {...@@ -928,7 +927,7 @@ test "truncated input" {
928927
929 var output = [1]u8{0} ** 12;928 var output = [1]u8{0} ** 12;
930 try expectError(error.UnexpectedEndOfStream, zr.readAll(&output));929 try expectError(error.UnexpectedEndOfStream, zr.readAll(&output));
931 try expect(mem.eql(u8, output[0..t.output.len], t.output));930 try testing.expectEqualSlices(u8, t.output, output[0..t.output.len]);
932 }931 }
933}932}
934933
...@@ -1026,8 +1025,8 @@ test "inflate A Tale of Two Cities (1859) intro" {...@@ -1026,8 +1025,8 @@ test "inflate A Tale of Two Cities (1859) intro" {
10261025
1027 var got: [700]u8 = undefined;1026 var got: [700]u8 = undefined;
1028 var got_len = try decomp.reader().read(&got);1027 var got_len = try decomp.reader().read(&got);
1029 try expect(got_len == 616);1028 try testing.expectEqual(@as(usize, 616), got_len);
1030 try expect(mem.eql(u8, got[0..expected.len], expected));1029 try testing.expectEqualSlices(u8, expected, got[0..expected.len]);
1031}1030}
10321031
1033test "lengths overflow" {1032test "lengths overflow" {
lib/std/compress/deflate/deflate_fast.zig+20-21
...@@ -354,7 +354,7 @@ pub const DeflateFast = struct {...@@ -354,7 +354,7 @@ pub const DeflateFast = struct {
354};354};
355355
356test "best speed match 1/3" {356test "best speed match 1/3" {
357 const expect = std.testing.expect;357 const expectEqual = std.testing.expectEqual;
358358
359 {359 {
360 var previous = [_]u8{ 0, 0, 0, 1, 2 };360 var previous = [_]u8{ 0, 0, 0, 1, 2 };
...@@ -367,7 +367,7 @@ test "best speed match 1/3" {...@@ -367,7 +367,7 @@ test "best speed match 1/3" {
367 };367 };
368 var current = [_]u8{ 3, 4, 5, 0, 1, 2, 3, 4, 5 };368 var current = [_]u8{ 3, 4, 5, 0, 1, 2, 3, 4, 5 };
369 var got: i32 = e.matchLen(3, -3, &current);369 var got: i32 = e.matchLen(3, -3, &current);
370 try expect(got == 6);370 try expectEqual(@as(i32, 6), got);
371 }371 }
372 {372 {
373 var previous = [_]u8{ 0, 0, 0, 1, 2 };373 var previous = [_]u8{ 0, 0, 0, 1, 2 };
...@@ -380,7 +380,7 @@ test "best speed match 1/3" {...@@ -380,7 +380,7 @@ test "best speed match 1/3" {
380 };380 };
381 var current = [_]u8{ 2, 4, 5, 0, 1, 2, 3, 4, 5 };381 var current = [_]u8{ 2, 4, 5, 0, 1, 2, 3, 4, 5 };
382 var got: i32 = e.matchLen(3, -3, &current);382 var got: i32 = e.matchLen(3, -3, &current);
383 try expect(got == 3);383 try expectEqual(@as(i32, 3), got);
384 }384 }
385 {385 {
386 var previous = [_]u8{ 0, 0, 0, 1, 1 };386 var previous = [_]u8{ 0, 0, 0, 1, 1 };
...@@ -393,7 +393,7 @@ test "best speed match 1/3" {...@@ -393,7 +393,7 @@ test "best speed match 1/3" {
393 };393 };
394 var current = [_]u8{ 3, 4, 5, 0, 1, 2, 3, 4, 5 };394 var current = [_]u8{ 3, 4, 5, 0, 1, 2, 3, 4, 5 };
395 var got: i32 = e.matchLen(3, -3, &current);395 var got: i32 = e.matchLen(3, -3, &current);
396 try expect(got == 2);396 try expectEqual(@as(i32, 2), got);
397 }397 }
398 {398 {
399 var previous = [_]u8{ 0, 0, 0, 1, 2 };399 var previous = [_]u8{ 0, 0, 0, 1, 2 };
...@@ -406,7 +406,7 @@ test "best speed match 1/3" {...@@ -406,7 +406,7 @@ test "best speed match 1/3" {
406 };406 };
407 var current = [_]u8{ 2, 2, 2, 2, 1, 2, 3, 4, 5 };407 var current = [_]u8{ 2, 2, 2, 2, 1, 2, 3, 4, 5 };
408 var got: i32 = e.matchLen(0, -1, &current);408 var got: i32 = e.matchLen(0, -1, &current);
409 try expect(got == 4);409 try expectEqual(@as(i32, 4), got);
410 }410 }
411 {411 {
412 var previous = [_]u8{ 0, 0, 0, 1, 2, 3, 4, 5, 2, 2 };412 var previous = [_]u8{ 0, 0, 0, 1, 2, 3, 4, 5, 2, 2 };
...@@ -419,7 +419,7 @@ test "best speed match 1/3" {...@@ -419,7 +419,7 @@ test "best speed match 1/3" {
419 };419 };
420 var current = [_]u8{ 2, 2, 2, 2, 1, 2, 3, 4, 5 };420 var current = [_]u8{ 2, 2, 2, 2, 1, 2, 3, 4, 5 };
421 var got: i32 = e.matchLen(4, -7, &current);421 var got: i32 = e.matchLen(4, -7, &current);
422 try expect(got == 5);422 try expectEqual(@as(i32, 5), got);
423 }423 }
424 {424 {
425 var previous = [_]u8{ 9, 9, 9, 9, 9 };425 var previous = [_]u8{ 9, 9, 9, 9, 9 };
...@@ -432,7 +432,7 @@ test "best speed match 1/3" {...@@ -432,7 +432,7 @@ test "best speed match 1/3" {
432 };432 };
433 var current = [_]u8{ 2, 2, 2, 2, 1, 2, 3, 4, 5 };433 var current = [_]u8{ 2, 2, 2, 2, 1, 2, 3, 4, 5 };
434 var got: i32 = e.matchLen(0, -1, &current);434 var got: i32 = e.matchLen(0, -1, &current);
435 try expect(got == 0);435 try expectEqual(@as(i32, 0), got);
436 }436 }
437 {437 {
438 var previous = [_]u8{ 9, 9, 9, 9, 9 };438 var previous = [_]u8{ 9, 9, 9, 9, 9 };
...@@ -445,12 +445,12 @@ test "best speed match 1/3" {...@@ -445,12 +445,12 @@ test "best speed match 1/3" {
445 };445 };
446 var current = [_]u8{ 9, 2, 2, 2, 1, 2, 3, 4, 5 };446 var current = [_]u8{ 9, 2, 2, 2, 1, 2, 3, 4, 5 };
447 var got: i32 = e.matchLen(1, 0, &current);447 var got: i32 = e.matchLen(1, 0, &current);
448 try expect(got == 0);448 try expectEqual(@as(i32, 0), got);
449 }449 }
450}450}
451451
452test "best speed match 2/3" {452test "best speed match 2/3" {
453 const expect = std.testing.expect;453 const expectEqual = std.testing.expectEqual;
454454
455 {455 {
456 var previous = [_]u8{};456 var previous = [_]u8{};
...@@ -463,7 +463,7 @@ test "best speed match 2/3" {...@@ -463,7 +463,7 @@ test "best speed match 2/3" {
463 };463 };
464 var current = [_]u8{ 9, 2, 2, 2, 1, 2, 3, 4, 5 };464 var current = [_]u8{ 9, 2, 2, 2, 1, 2, 3, 4, 5 };
465 var got: i32 = e.matchLen(1, -5, &current);465 var got: i32 = e.matchLen(1, -5, &current);
466 try expect(got == 0);466 try expectEqual(@as(i32, 0), got);
467 }467 }
468 {468 {
469 var previous = [_]u8{};469 var previous = [_]u8{};
...@@ -476,7 +476,7 @@ test "best speed match 2/3" {...@@ -476,7 +476,7 @@ test "best speed match 2/3" {
476 };476 };
477 var current = [_]u8{ 9, 2, 2, 2, 1, 2, 3, 4, 5 };477 var current = [_]u8{ 9, 2, 2, 2, 1, 2, 3, 4, 5 };
478 var got: i32 = e.matchLen(1, -1, &current);478 var got: i32 = e.matchLen(1, -1, &current);
479 try expect(got == 0);479 try expectEqual(@as(i32, 0), got);
480 }480 }
481 {481 {
482 var previous = [_]u8{};482 var previous = [_]u8{};
...@@ -489,7 +489,7 @@ test "best speed match 2/3" {...@@ -489,7 +489,7 @@ test "best speed match 2/3" {
489 };489 };
490 var current = [_]u8{ 2, 2, 2, 2, 1, 2, 3, 4, 5 };490 var current = [_]u8{ 2, 2, 2, 2, 1, 2, 3, 4, 5 };
491 var got: i32 = e.matchLen(1, 0, &current);491 var got: i32 = e.matchLen(1, 0, &current);
492 try expect(got == 3);492 try expectEqual(@as(i32, 3), got);
493 }493 }
494 {494 {
495 var previous = [_]u8{ 3, 4, 5 };495 var previous = [_]u8{ 3, 4, 5 };
...@@ -502,13 +502,13 @@ test "best speed match 2/3" {...@@ -502,13 +502,13 @@ test "best speed match 2/3" {
502 };502 };
503 var current = [_]u8{ 3, 4, 5 };503 var current = [_]u8{ 3, 4, 5 };
504 var got: i32 = e.matchLen(0, -3, &current);504 var got: i32 = e.matchLen(0, -3, &current);
505 try expect(got == 3);505 try expectEqual(@as(i32, 3), got);
506 }506 }
507}507}
508508
509test "best speed match 2/2" {509test "best speed match 2/2" {
510 const testing = std.testing;510 const testing = std.testing;
511 const expect = testing.expect;511 const expectEqual = testing.expectEqual;
512512
513 const Case = struct {513 const Case = struct {
514 previous: u32,514 previous: u32,
...@@ -580,7 +580,7 @@ test "best speed match 2/2" {...@@ -580,7 +580,7 @@ test "best speed match 2/2" {
580 .cur = 0,580 .cur = 0,
581 };581 };
582 var got: i32 = e.matchLen(c.s, c.t, current);582 var got: i32 = e.matchLen(c.s, c.t, current);
583 try expect(got == c.expected);583 try expectEqual(@as(i32, c.expected), got);
584 }584 }
585}585}
586586
...@@ -623,16 +623,16 @@ test "best speed shift offsets" {...@@ -623,16 +623,16 @@ test "best speed shift offsets" {
623 tokens_count = 0;623 tokens_count = 0;
624 enc.encode(&tokens, &tokens_count, &test_data);624 enc.encode(&tokens, &tokens_count, &test_data);
625 var got = tokens_count;625 var got = tokens_count;
626 try expect(want_first_tokens == got);626 try testing.expectEqual(want_first_tokens, got);
627627
628 // Verify we are about to wrap.628 // Verify we are about to wrap.
629 try expect(enc.cur == buffer_reset);629 try testing.expectEqual(@as(i32, buffer_reset), enc.cur);
630630
631 // Part 2 should match clean state as well even if wrapped.631 // Part 2 should match clean state as well even if wrapped.
632 tokens_count = 0;632 tokens_count = 0;
633 enc.encode(&tokens, &tokens_count, &test_data);633 enc.encode(&tokens, &tokens_count, &test_data);
634 got = tokens_count;634 got = tokens_count;
635 try expect(want_second_tokens == got);635 try testing.expectEqual(want_second_tokens, got);
636636
637 // Verify that we wrapped.637 // Verify that we wrapped.
638 try expect(enc.cur < buffer_reset);638 try expect(enc.cur < buffer_reset);
...@@ -645,13 +645,12 @@ test "best speed shift offsets" {...@@ -645,13 +645,12 @@ test "best speed shift offsets" {
645 tokens_count = 0;645 tokens_count = 0;
646 enc.encode(&tokens, &tokens_count, &test_data);646 enc.encode(&tokens, &tokens_count, &test_data);
647 got = tokens_count;647 got = tokens_count;
648 try expect(want_first_tokens == got);648 try testing.expectEqual(want_first_tokens, got);
649}649}
650650
651test "best speed reset" {651test "best speed reset" {
652 // test that encoding is consistent across a warparound of the table offset.652 // test that encoding is consistent across a warparound of the table offset.
653 // See https://github.com/golang/go/issues/34121653 // See https://github.com/golang/go/issues/34121
654 const expect = std.testing.expect;
655 const fmt = std.fmt;654 const fmt = std.fmt;
656 const testing = std.testing;655 const testing = std.testing;
657656
...@@ -716,6 +715,6 @@ test "best speed reset" {...@@ -716,6 +715,6 @@ test "best speed reset" {
716 try comp.close();715 try comp.close();
717716
718 // output must match at wraparound717 // output must match at wraparound
719 try expect(mem.eql(u8, got.items, want.items));718 try testing.expectEqualSlices(u8, want.items, got.items);
720 }719 }
721}720}
lib/std/compress/deflate/deflate_fast_test.zig+4-4
...@@ -85,8 +85,8 @@ test "best speed" {...@@ -85,8 +85,8 @@ test "best speed" {
85 var read = try decomp.reader().readAll(decompressed);85 var read = try decomp.reader().readAll(decompressed);
86 _ = decomp.close();86 _ = decomp.close();
8787
88 try expect(read == want.items.len);88 try testing.expectEqual(want.items.len, read);
89 try expect(mem.eql(u8, want.items, decompressed));89 try testing.expectEqualSlices(u8, want.items, decompressed);
90 }90 }
91 }91 }
92 }92 }
...@@ -152,8 +152,8 @@ test "best speed max match offset" {...@@ -152,8 +152,8 @@ test "best speed max match offset" {
152 var read = try decomp.reader().readAll(decompressed);152 var read = try decomp.reader().readAll(decompressed);
153 _ = decomp.close();153 _ = decomp.close();
154154
155 try expect(read == src.len);155 try testing.expectEqual(src.len, read);
156 try expect(mem.eql(u8, decompressed, src));156 try testing.expectEqualSlices(u8, src, decompressed);
157 }157 }
158 }158 }
159 }159 }
lib/std/compress/deflate/dict_decoder.zig+1-2
...@@ -206,7 +206,6 @@ pub const DictDecoder = struct {...@@ -206,7 +206,6 @@ pub const DictDecoder = struct {
206206
207test "dictionary decoder" {207test "dictionary decoder" {
208 const ArrayList = std.ArrayList;208 const ArrayList = std.ArrayList;
209 const expect = std.testing.expect;
210 const testing = std.testing;209 const testing = std.testing;
211210
212 const abc = "ABC\n";211 const abc = "ABC\n";
...@@ -416,5 +415,5 @@ test "dictionary decoder" {...@@ -416,5 +415,5 @@ test "dictionary decoder" {
416 _ = try want.write(want_list.items[want_list.items.len - dd.histSize() ..][0..10]);415 _ = try want.write(want_list.items[want_list.items.len - dd.histSize() ..][0..10]);
417416
418 _ = try got.write(dd.readFlush());417 _ = try got.write(dd.readFlush());
419 try expect(mem.eql(u8, got_list.items, want_list.items));418 try testing.expectEqualSlices(u8, want_list.items, got_list.items);
420}419}
lib/std/compress/deflate/huffman_bit_writer.zig+26-62
...@@ -121,7 +121,7 @@ pub fn HuffmanBitWriter(comptime WriterType: type) type {...@@ -121,7 +121,7 @@ pub fn HuffmanBitWriter(comptime WriterType: type) type {
121 self.nbytes = 0;121 self.nbytes = 0;
122 }122 }
123123
124 fn write(self: *Self, b: []u8) Error!void {124 fn write(self: *Self, b: []const u8) Error!void {
125 if (self.err) {125 if (self.err) {
126 return;126 return;
127 }127 }
...@@ -155,7 +155,7 @@ pub fn HuffmanBitWriter(comptime WriterType: type) type {...@@ -155,7 +155,7 @@ pub fn HuffmanBitWriter(comptime WriterType: type) type {
155 }155 }
156 }156 }
157157
158 pub fn writeBytes(self: *Self, bytes: []u8) Error!void {158 pub fn writeBytes(self: *Self, bytes: []const u8) Error!void {
159 if (self.err) {159 if (self.err) {
160 return;160 return;
161 }161 }
...@@ -323,7 +323,7 @@ pub fn HuffmanBitWriter(comptime WriterType: type) type {...@@ -323,7 +323,7 @@ pub fn HuffmanBitWriter(comptime WriterType: type) type {
323 // storedSizeFits calculates the stored size, including header.323 // storedSizeFits calculates the stored size, including header.
324 // The function returns the size in bits and whether the block324 // The function returns the size in bits and whether the block
325 // fits inside a single block.325 // fits inside a single block.
326 fn storedSizeFits(in: ?[]u8) StoredSize {326 fn storedSizeFits(in: ?[]const u8) StoredSize {
327 if (in == null) {327 if (in == null) {
328 return .{ .size = 0, .storable = false };328 return .{ .size = 0, .storable = false };
329 }329 }
...@@ -453,7 +453,7 @@ pub fn HuffmanBitWriter(comptime WriterType: type) type {...@@ -453,7 +453,7 @@ pub fn HuffmanBitWriter(comptime WriterType: type) type {
453 self: *Self,453 self: *Self,
454 tokens: []const token.Token,454 tokens: []const token.Token,
455 eof: bool,455 eof: bool,
456 input: ?[]u8,456 input: ?[]const u8,
457 ) Error!void {457 ) Error!void {
458 if (self.err) {458 if (self.err) {
459 return;459 return;
...@@ -546,7 +546,7 @@ pub fn HuffmanBitWriter(comptime WriterType: type) type {...@@ -546,7 +546,7 @@ pub fn HuffmanBitWriter(comptime WriterType: type) type {
546 self: *Self,546 self: *Self,
547 tokens: []const token.Token,547 tokens: []const token.Token,
548 eof: bool,548 eof: bool,
549 input: ?[]u8,549 input: ?[]const u8,
550 ) Error!void {550 ) Error!void {
551 if (self.err) {551 if (self.err) {
552 return;552 return;
...@@ -685,7 +685,7 @@ pub fn HuffmanBitWriter(comptime WriterType: type) type {...@@ -685,7 +685,7 @@ pub fn HuffmanBitWriter(comptime WriterType: type) type {
685685
686 // Encodes a block of bytes as either Huffman encoded literals or uncompressed bytes686 // Encodes a block of bytes as either Huffman encoded literals or uncompressed bytes
687 // if the results only gains very little from compression.687 // if the results only gains very little from compression.
688 pub fn writeBlockHuff(self: *Self, eof: bool, input: []u8) Error!void {688 pub fn writeBlockHuff(self: *Self, eof: bool, input: []const u8) Error!void {
689 if (self.err) {689 if (self.err) {
690 return;690 return;
691 }691 }
...@@ -828,7 +828,7 @@ pub fn huffmanBitWriter(allocator: Allocator, writer: anytype) !HuffmanBitWriter...@@ -828,7 +828,7 @@ pub fn huffmanBitWriter(allocator: Allocator, writer: anytype) !HuffmanBitWriter
828// histogram accumulates a histogram of b in h.828// histogram accumulates a histogram of b in h.
829//829//
830// h.len must be >= 256, and h's elements must be all zeroes.830// h.len must be >= 256, and h's elements must be all zeroes.
831fn histogram(b: []u8, h: *[]u16) void {831fn histogram(b: []const u8, h: *[]u16) void {
832 var lh = h.*[0..256];832 var lh = h.*[0..256];
833 for (b) |t| {833 for (b) |t| {
834 lh[t] += 1;834 lh[t] += 1;
...@@ -891,21 +891,9 @@ test "writeBlockHuff" {...@@ -891,21 +891,9 @@ test "writeBlockHuff" {
891 );891 );
892}892}
893893
894fn testBlockHuff(in_name: []const u8, want_name: []const u8) !void {894fn testBlockHuff(comptime in_name: []const u8, comptime want_name: []const u8) !void {
895 // Skip wasi because it does not support std.fs.openDirAbsolute()895 const in: []const u8 = @embedFile("testdata/" ++ in_name);
896 if (builtin.os.tag == .wasi) return error.SkipZigTest;896 const want: []const u8 = @embedFile("testdata/" ++ want_name);
897
898 const current_dir = try std.fs.openDirAbsolute(std.fs.path.dirname(@src().file).?, .{});
899 const testdata_dir = try current_dir.openDir("testdata", .{});
900 const in_file = try testdata_dir.openFile(in_name, .{});
901 defer in_file.close();
902 const want_file = try testdata_dir.openFile(want_name, .{});
903 defer want_file.close();
904
905 var in = try in_file.reader().readAllAlloc(testing.allocator, math.maxInt(usize));
906 defer testing.allocator.free(in);
907 var want = try want_file.reader().readAllAlloc(testing.allocator, math.maxInt(usize));
908 defer testing.allocator.free(want);
909897
910 var buf = ArrayList(u8).init(testing.allocator);898 var buf = ArrayList(u8).init(testing.allocator);
911 defer buf.deinit();899 defer buf.deinit();
...@@ -914,7 +902,7 @@ fn testBlockHuff(in_name: []const u8, want_name: []const u8) !void {...@@ -914,7 +902,7 @@ fn testBlockHuff(in_name: []const u8, want_name: []const u8) !void {
914 try bw.writeBlockHuff(false, in);902 try bw.writeBlockHuff(false, in);
915 try bw.flush();903 try bw.flush();
916904
917 try expect(mem.eql(u8, buf.items, want));905 try std.testing.expectEqualSlices(u8, want, buf.items);
918906
919 // Test if the writer produces the same output after reset.907 // Test if the writer produces the same output after reset.
920 var buf_after_reset = ArrayList(u8).init(testing.allocator);908 var buf_after_reset = ArrayList(u8).init(testing.allocator);
...@@ -925,8 +913,8 @@ fn testBlockHuff(in_name: []const u8, want_name: []const u8) !void {...@@ -925,8 +913,8 @@ fn testBlockHuff(in_name: []const u8, want_name: []const u8) !void {
925 try bw.writeBlockHuff(false, in);913 try bw.writeBlockHuff(false, in);
926 try bw.flush();914 try bw.flush();
927915
928 try expect(mem.eql(u8, buf_after_reset.items, buf.items));916 try std.testing.expectEqualSlices(u8, buf.items, buf_after_reset.items);
929 try expect(mem.eql(u8, buf_after_reset.items, want));917 try std.testing.expectEqualSlices(u8, want, buf_after_reset.items);
930918
931 try testWriterEOF(.write_huffman_block, &[0]token.Token{}, in);919 try testWriterEOF(.write_huffman_block, &[0]token.Token{}, in);
932}920}
...@@ -1617,38 +1605,18 @@ test "writeBlockDynamic" {...@@ -1617,38 +1605,18 @@ test "writeBlockDynamic" {
16171605
1618// testBlock tests a block against its references,1606// testBlock tests a block against its references,
1619// or regenerate the references, if "-update" flag is set.1607// or regenerate the references, if "-update" flag is set.
1620fn testBlock(comptime ht: HuffTest, ttype: TestType) !void {1608fn testBlock(comptime ht: HuffTest, comptime ttype: TestType) !void {
1621 // Skip wasi because it does not support std.fs.openDirAbsolute()1609 if (ht.input.len != 0 and ht.want.len != 0) {
1622 if (builtin.os.tag == .wasi) return error.SkipZigTest;1610 const want_name = comptime fmt.comptimePrint(ht.want, .{ttype.to_s()});
16231611 const input = @embedFile("testdata/" ++ ht.input);
1624 var want_name: []u8 = undefined;1612 const want = @embedFile("testdata/" ++ want_name);
1625 var want_name_no_input: []u8 = undefined;
1626 var input: []u8 = undefined;
1627 var want: []u8 = undefined;
1628 var want_ni: []u8 = undefined; // want no input: what we expect when input is empty
1629
1630 const current_dir = try std.fs.openDirAbsolute(std.fs.path.dirname(@src().file).?, .{});
1631 const testdata_dir = try current_dir.openDir("testdata", .{});
1632
1633 var want_name_type = if (ht.want.len == 0) .{} else .{ttype.to_s()};
1634 want_name = try fmt.allocPrint(testing.allocator, ht.want, want_name_type);
1635 defer testing.allocator.free(want_name);
1636
1637 if (!mem.eql(u8, ht.input, "")) {
1638 const in_file = try testdata_dir.openFile(ht.input, .{});
1639 input = try in_file.reader().readAllAlloc(testing.allocator, math.maxInt(usize));
1640 defer testing.allocator.free(input);
1641
1642 const want_file = try testdata_dir.openFile(want_name, .{});
1643 want = try want_file.reader().readAllAlloc(testing.allocator, math.maxInt(usize));
1644 defer testing.allocator.free(want);
16451613
1646 var buf = ArrayList(u8).init(testing.allocator);1614 var buf = ArrayList(u8).init(testing.allocator);
1647 var bw = try huffmanBitWriter(testing.allocator, buf.writer());1615 var bw = try huffmanBitWriter(testing.allocator, buf.writer());
1648 try writeToType(ttype, &bw, ht.tokens, input);1616 try writeToType(ttype, &bw, ht.tokens, input);
16491617
1650 var got = buf.items;1618 var got = buf.items;
1651 try expect(mem.eql(u8, got, want)); // expect writeBlock to yield expected result1619 try testing.expectEqualSlices(u8, want, got); // expect writeBlock to yield expected result
16521620
1653 // Test if the writer produces the same output after reset.1621 // Test if the writer produces the same output after reset.
1654 buf.deinit();1622 buf.deinit();
...@@ -1661,16 +1629,12 @@ fn testBlock(comptime ht: HuffTest, ttype: TestType) !void {...@@ -1661,16 +1629,12 @@ fn testBlock(comptime ht: HuffTest, ttype: TestType) !void {
1661 try writeToType(ttype, &bw, ht.tokens, input);1629 try writeToType(ttype, &bw, ht.tokens, input);
1662 try bw.flush();1630 try bw.flush();
1663 got = buf.items;1631 got = buf.items;
1664 try expect(mem.eql(u8, got, want)); // expect writeBlock to yield expected result1632 try testing.expectEqualSlices(u8, want, got); // expect writeBlock to yield expected result
1665 try testWriterEOF(.write_block, ht.tokens, input);1633 try testWriterEOF(.write_block, ht.tokens, input);
1666 }1634 }
16671635
1668 want_name_no_input = try fmt.allocPrint(testing.allocator, ht.want_no_input, .{ttype.to_s()});1636 const want_name_no_input = comptime fmt.comptimePrint(ht.want_no_input, .{ttype.to_s()});
1669 defer testing.allocator.free(want_name_no_input);1637 const want_ni = @embedFile("testdata/" ++ want_name_no_input);
1670
1671 const want_no_input_file = try testdata_dir.openFile(want_name_no_input, .{});
1672 want_ni = try want_no_input_file.reader().readAllAlloc(testing.allocator, math.maxInt(usize));
1673 defer testing.allocator.free(want_ni);
16741638
1675 var buf = ArrayList(u8).init(testing.allocator);1639 var buf = ArrayList(u8).init(testing.allocator);
1676 var bw = try huffmanBitWriter(testing.allocator, buf.writer());1640 var bw = try huffmanBitWriter(testing.allocator, buf.writer());
...@@ -1678,7 +1642,7 @@ fn testBlock(comptime ht: HuffTest, ttype: TestType) !void {...@@ -1678,7 +1642,7 @@ fn testBlock(comptime ht: HuffTest, ttype: TestType) !void {
1678 try writeToType(ttype, &bw, ht.tokens, null);1642 try writeToType(ttype, &bw, ht.tokens, null);
16791643
1680 var got = buf.items;1644 var got = buf.items;
1681 try expect(mem.eql(u8, got, want_ni)); // expect writeBlock to yield expected result1645 try testing.expectEqualSlices(u8, want_ni, got); // expect writeBlock to yield expected result
1682 try expect(got[0] & 1 != 1); // expect no EOF1646 try expect(got[0] & 1 != 1); // expect no EOF
16831647
1684 // Test if the writer produces the same output after reset.1648 // Test if the writer produces the same output after reset.
...@@ -1693,11 +1657,11 @@ fn testBlock(comptime ht: HuffTest, ttype: TestType) !void {...@@ -1693,11 +1657,11 @@ fn testBlock(comptime ht: HuffTest, ttype: TestType) !void {
1693 try bw.flush();1657 try bw.flush();
1694 got = buf.items;1658 got = buf.items;
16951659
1696 try expect(mem.eql(u8, got, want_ni)); // expect writeBlock to yield expected result1660 try testing.expectEqualSlices(u8, want_ni, got); // expect writeBlock to yield expected result
1697 try testWriterEOF(.write_block, ht.tokens, &[0]u8{});1661 try testWriterEOF(.write_block, ht.tokens, &[0]u8{});
1698}1662}
16991663
1700fn writeToType(ttype: TestType, bw: anytype, tok: []const token.Token, input: ?[]u8) !void {1664fn writeToType(ttype: TestType, bw: anytype, tok: []const token.Token, input: ?[]const u8) !void {
1701 switch (ttype) {1665 switch (ttype) {
1702 .write_block => try bw.writeBlock(tok, false, input),1666 .write_block => try bw.writeBlock(tok, false, input),
1703 .write_dyn_block => try bw.writeBlockDynamic(tok, false, input),1667 .write_dyn_block => try bw.writeBlockDynamic(tok, false, input),
...@@ -1707,7 +1671,7 @@ fn writeToType(ttype: TestType, bw: anytype, tok: []const token.Token, input: ?[...@@ -1707,7 +1671,7 @@ fn writeToType(ttype: TestType, bw: anytype, tok: []const token.Token, input: ?[
1707}1671}
17081672
1709// Tests if the written block contains an EOF marker.1673// Tests if the written block contains an EOF marker.
1710fn testWriterEOF(ttype: TestType, ht_tokens: []const token.Token, input: []u8) !void {1674fn testWriterEOF(ttype: TestType, ht_tokens: []const token.Token, input: []const u8) !void {
1711 var buf = ArrayList(u8).init(testing.allocator);1675 var buf = ArrayList(u8).init(testing.allocator);
1712 defer buf.deinit();1676 defer buf.deinit();
1713 var bw = try huffmanBitWriter(testing.allocator, buf.writer());1677 var bw = try huffmanBitWriter(testing.allocator, buf.writer());
lib/std/compress/deflate/huffman_code.zig+33-33
...@@ -386,39 +386,39 @@ test "generate a Huffman code from an array of frequencies" {...@@ -386,39 +386,39 @@ test "generate a Huffman code from an array of frequencies" {
386 defer enc.deinit();386 defer enc.deinit();
387 enc.generate(freqs[0..], 7);387 enc.generate(freqs[0..], 7);
388388
389 try testing.expect(enc.bitLength(freqs[0..]) == 141);389 try testing.expectEqual(@as(u32, 141), enc.bitLength(freqs[0..]));
390390
391 try testing.expect(enc.codes[0].len == 3);391 try testing.expectEqual(@as(usize, 3), enc.codes[0].len);
392 try testing.expect(enc.codes[1].len == 6);392 try testing.expectEqual(@as(usize, 6), enc.codes[1].len);
393 try testing.expect(enc.codes[2].len == 6);393 try testing.expectEqual(@as(usize, 6), enc.codes[2].len);
394 try testing.expect(enc.codes[3].len == 5);394 try testing.expectEqual(@as(usize, 5), enc.codes[3].len);
395 try testing.expect(enc.codes[4].len == 3);395 try testing.expectEqual(@as(usize, 3), enc.codes[4].len);
396 try testing.expect(enc.codes[5].len == 2);396 try testing.expectEqual(@as(usize, 2), enc.codes[5].len);
397 try testing.expect(enc.codes[6].len == 2);397 try testing.expectEqual(@as(usize, 2), enc.codes[6].len);
398 try testing.expect(enc.codes[7].len == 6);398 try testing.expectEqual(@as(usize, 6), enc.codes[7].len);
399 try testing.expect(enc.codes[8].len == 0);399 try testing.expectEqual(@as(usize, 0), enc.codes[8].len);
400 try testing.expect(enc.codes[9].len == 0);400 try testing.expectEqual(@as(usize, 0), enc.codes[9].len);
401 try testing.expect(enc.codes[10].len == 0);401 try testing.expectEqual(@as(usize, 0), enc.codes[10].len);
402 try testing.expect(enc.codes[11].len == 0);402 try testing.expectEqual(@as(usize, 0), enc.codes[11].len);
403 try testing.expect(enc.codes[12].len == 0);403 try testing.expectEqual(@as(usize, 0), enc.codes[12].len);
404 try testing.expect(enc.codes[13].len == 0);404 try testing.expectEqual(@as(usize, 0), enc.codes[13].len);
405 try testing.expect(enc.codes[14].len == 0);405 try testing.expectEqual(@as(usize, 0), enc.codes[14].len);
406 try testing.expect(enc.codes[15].len == 0);406 try testing.expectEqual(@as(usize, 0), enc.codes[15].len);
407 try testing.expect(enc.codes[16].len == 6);407 try testing.expectEqual(@as(usize, 6), enc.codes[16].len);
408 try testing.expect(enc.codes[17].len == 5);408 try testing.expectEqual(@as(usize, 5), enc.codes[17].len);
409 try testing.expect(enc.codes[18].len == 3);409 try testing.expectEqual(@as(usize, 3), enc.codes[18].len);
410410
411 try testing.expect(enc.codes[5].code == 0x0);411 try testing.expectEqual(@as(u16, 0x0), enc.codes[5].code);
412 try testing.expect(enc.codes[6].code == 0x2);412 try testing.expectEqual(@as(u16, 0x2), enc.codes[6].code);
413 try testing.expect(enc.codes[0].code == 0x1);413 try testing.expectEqual(@as(u16, 0x1), enc.codes[0].code);
414 try testing.expect(enc.codes[4].code == 0x5);414 try testing.expectEqual(@as(u16, 0x5), enc.codes[4].code);
415 try testing.expect(enc.codes[18].code == 0x3);415 try testing.expectEqual(@as(u16, 0x3), enc.codes[18].code);
416 try testing.expect(enc.codes[3].code == 0x7);416 try testing.expectEqual(@as(u16, 0x7), enc.codes[3].code);
417 try testing.expect(enc.codes[17].code == 0x17);417 try testing.expectEqual(@as(u16, 0x17), enc.codes[17].code);
418 try testing.expect(enc.codes[1].code == 0x0f);418 try testing.expectEqual(@as(u16, 0x0f), enc.codes[1].code);
419 try testing.expect(enc.codes[2].code == 0x2f);419 try testing.expectEqual(@as(u16, 0x2f), enc.codes[2].code);
420 try testing.expect(enc.codes[7].code == 0x1f);420 try testing.expectEqual(@as(u16, 0x1f), enc.codes[7].code);
421 try testing.expect(enc.codes[16].code == 0x3f);421 try testing.expectEqual(@as(u16, 0x3f), enc.codes[16].code);
422}422}
423423
424test "generate a Huffman code for the fixed litteral table specific to Deflate" {424test "generate a Huffman code for the fixed litteral table specific to Deflate" {
lib/std/compress/deflate/token.zig+1-2
...@@ -99,6 +99,5 @@ pub fn offsetCode(off: u32) u32 {...@@ -99,6 +99,5 @@ pub fn offsetCode(off: u32) u32 {
9999
100test {100test {
101 const std = @import("std");101 const std = @import("std");
102 const expect = std.testing.expect;102 try std.testing.expectEqual(@as(Token, 3_401_581_099), matchToken(555, 555));
103 try expect(matchToken(555, 555) == 3_401_581_099);
104}103}
lib/std/compress/gzip.zig+1-1
...@@ -163,7 +163,7 @@ fn testReader(data: []const u8, comptime expected: []const u8) !void {...@@ -163,7 +163,7 @@ fn testReader(data: []const u8, comptime expected: []const u8) !void {
163 defer testing.allocator.free(buf);163 defer testing.allocator.free(buf);
164164
165 // Check against the reference165 // Check against the reference
166 try testing.expectEqualSlices(u8, buf, expected);166 try testing.expectEqualSlices(u8, expected, buf);
167}167}
168168
169// All the test cases are obtained by compressing the RFC1952 text169// All the test cases are obtained by compressing the RFC1952 text
lib/std/compress/zlib.zig+1-1
...@@ -99,7 +99,7 @@ fn testReader(data: []const u8, expected: []const u8) !void {...@@ -99,7 +99,7 @@ fn testReader(data: []const u8, expected: []const u8) !void {
99 defer testing.allocator.free(buf);99 defer testing.allocator.free(buf);
100100
101 // Check against the reference101 // Check against the reference
102 try testing.expectEqualSlices(u8, buf, expected);102 try testing.expectEqualSlices(u8, expected, buf);
103}103}
104104
105// All the test cases are obtained by compressing the RFC1951 text105// All the test cases are obtained by compressing the RFC1951 text