From 6ef2bbcb95518b10675c9bfec77a7367c9194c8b Mon Sep 17 00:00:00 2001 From: Hojun-Cho Date: Wed, 10 Jun 2026 18:52:53 +0900 Subject: [PATCH] lib/hash tests: hand-main plumbing -> assert (@test conversion B1) signalled/fail() counters and run-loop plumbing removed; failure sites become assert(!(cond)); table rows and @test fns 1:1. Bare mains stay until the -T flip commit. Spec: .ai/drew-t2-conversion-spec.md. --- lib/hash/adler32/adler32_test.ww | 4 ++-- lib/hash/crc16/crc16_test.ww | 16 ++++++++-------- lib/hash/crc32/crc32_test.ww | 12 ++++++------ lib/hash/crc64/crc64_test.ww | 8 ++++---- lib/hash/siphash/siphash_test.ww | 32 ++++++++++++++++---------------- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lib/hash/adler32/adler32_test.ww b/lib/hash/adler32/adler32_test.ww index 2b7497a8..79e14042 100644 --- a/lib/hash/adler32/adler32_test.ww +++ b/lib/hash/adler32/adler32_test.ww @@ -16,14 +16,14 @@ fn check(s: str, want: u32) void = { let n: i32 = putstr(s, arr[0:256], 0); let buf: []u8 = arr[0:n]; let got: u32 = adler32.sum32(buf); - if (got != want) { let _: i32 = 1/0; }; + assert(!(got != want)); }; @test fn vec_empty() void = { let arr: [1]u8; let buf: []u8 = arr[0:0]; let h: u32 = adler32.sum32(buf); - if (h != 1u32) { let _: i32 = 1/0; }; + assert(!(h != 1u32)); }; @test fn vec_helloworld() void = { diff --git a/lib/hash/crc16/crc16_test.ww b/lib/hash/crc16/crc16_test.ww index 82c9cd08..3a59b5fc 100644 --- a/lib/hash/crc16/crc16_test.ww +++ b/lib/hash/crc16/crc16_test.ww @@ -15,19 +15,19 @@ fn check(s: str, ccitt: u16, cmda: u16, dect: u16, ansi: u16) void = { let arr: [256]u8; let n: i32 = putstr(s, arr[0:256], 0); let buf: []u8 = arr[0:n]; - if (crc16.sum16ccitt(buf) != ccitt) { let _: i32 = 1/0; }; - if (crc16.sum16cmda2000(buf) != cmda) { let _: i32 = 1/0; }; - if (crc16.sum16dect(buf) != dect) { let _: i32 = 1/0; }; - if (crc16.sum16ansi(buf) != ansi) { let _: i32 = 1/0; }; + assert(!(crc16.sum16ccitt(buf) != ccitt)); + assert(!(crc16.sum16cmda2000(buf) != cmda)); + assert(!(crc16.sum16dect(buf) != dect)); + assert(!(crc16.sum16ansi(buf) != ansi)); }; @test fn vec_empty() void = { let arr: [1]u8; let buf: []u8 = arr[0:0]; - if (crc16.sum16ccitt(buf) != 0u16) { let _: i32 = 1/0; }; - if (crc16.sum16cmda2000(buf) != 0u16) { let _: i32 = 1/0; }; - if (crc16.sum16dect(buf) != 0u16) { let _: i32 = 1/0; }; - if (crc16.sum16ansi(buf) != 0u16) { let _: i32 = 1/0; }; + assert(!(crc16.sum16ccitt(buf) != 0u16)); + assert(!(crc16.sum16cmda2000(buf) != 0u16)); + assert(!(crc16.sum16dect(buf) != 0u16)); + assert(!(crc16.sum16ansi(buf) != 0u16)); }; @test fn vec_truman() void = { diff --git a/lib/hash/crc32/crc32_test.ww b/lib/hash/crc32/crc32_test.ww index 5690d089..d53fa9ef 100644 --- a/lib/hash/crc32/crc32_test.ww +++ b/lib/hash/crc32/crc32_test.ww @@ -15,17 +15,17 @@ fn check(s: str, ieee: u32, cast: u32, koop: u32) void = { let arr: [128]u8; let n: i32 = putstr(s, arr[0:128], 0); let buf: []u8 = arr[0:n]; - if (crc32.sum32ieee(buf) != ieee) { let _: i32 = 1/0; }; - if (crc32.sum32castagnoli(buf) != cast) { let _: i32 = 1/0; }; - if (crc32.sum32koopman(buf) != koop) { let _: i32 = 1/0; }; + assert(!(crc32.sum32ieee(buf) != ieee)); + assert(!(crc32.sum32castagnoli(buf) != cast)); + assert(!(crc32.sum32koopman(buf) != koop)); }; @test fn vec_empty() void = { let arr: [1]u8; let buf: []u8 = arr[0:0]; - if (crc32.sum32ieee(buf) != 0u32) { let _: i32 = 1/0; }; - if (crc32.sum32castagnoli(buf) != 0u32) { let _: i32 = 1/0; }; - if (crc32.sum32koopman(buf) != 0u32) { let _: i32 = 1/0; }; + assert(!(crc32.sum32ieee(buf) != 0u32)); + assert(!(crc32.sum32castagnoli(buf) != 0u32)); + assert(!(crc32.sum32koopman(buf) != 0u32)); }; @test fn vec_fire() void = { diff --git a/lib/hash/crc64/crc64_test.ww b/lib/hash/crc64/crc64_test.ww index 1fe45f1a..0201534c 100644 --- a/lib/hash/crc64/crc64_test.ww +++ b/lib/hash/crc64/crc64_test.ww @@ -15,15 +15,15 @@ fn check(s: str, ecma: u64, iso: u64) void = { let arr: [128]u8; let n: i32 = putstr(s, arr[0:128], 0); let buf: []u8 = arr[0:n]; - if (crc64.sum64ecma(buf) != ecma) { let _: i32 = 1/0; }; - if (crc64.sum64iso(buf) != iso) { let _: i32 = 1/0; }; + assert(!(crc64.sum64ecma(buf) != ecma)); + assert(!(crc64.sum64iso(buf) != iso)); }; @test fn vec_empty() void = { let arr: [1]u8; let buf: []u8 = arr[0:0]; - if (crc64.sum64ecma(buf) != 0u64) { let _: i32 = 1/0; }; - if (crc64.sum64iso(buf) != 0u64) { let _: i32 = 1/0; }; + assert(!(crc64.sum64ecma(buf) != 0u64)); + assert(!(crc64.sum64iso(buf) != 0u64)); }; @test fn vec_oscar() void = { diff --git a/lib/hash/siphash/siphash_test.ww b/lib/hash/siphash/siphash_test.ww index bc02e5db..8f94735e 100644 --- a/lib/hash/siphash/siphash_test.ww +++ b/lib/hash/siphash/siphash_test.ww @@ -24,16 +24,16 @@ fn putstr(s: str, into: []u8, off: i32) i32 = { let j: i32 = 0; for (j < 40) { msg[j] = j: u8; j += 1; }; - if (siphash.sum24(key[0:16], msg[0:0]) != 0x726FDB47DD0E0E31u64) { let _: i32 = 1/0; }; - if (siphash.sum24(key[0:16], msg[0:1]) != 0x74F839C593DC67FDu64) { let _: i32 = 1/0; }; - if (siphash.sum24(key[0:16], msg[0:4]) != 0xCF2794E0277187B7u64) { let _: i32 = 1/0; }; - if (siphash.sum24(key[0:16], msg[0:7]) != 0xAB0200F58B01D137u64) { let _: i32 = 1/0; }; - if (siphash.sum24(key[0:16], msg[0:8]) != 0x93F5F5799A932462u64) { let _: i32 = 1/0; }; - if (siphash.sum24(key[0:16], msg[0:9]) != 0x9E0082DF0BA9E4B0u64) { let _: i32 = 1/0; }; - if (siphash.sum24(key[0:16], msg[0:15]) != 0xA129CA6149BE45E5u64) { let _: i32 = 1/0; }; - if (siphash.sum24(key[0:16], msg[0:16]) != 0x3F2ACC7F57C29BDBu64) { let _: i32 = 1/0; }; - if (siphash.sum24(key[0:16], msg[0:23]) != 0xA80C038CCD5CCEC8u64) { let _: i32 = 1/0; }; - if (siphash.sum24(key[0:16], msg[0:32]) != 0x7127512F72F27CCEu64) { let _: i32 = 1/0; }; + assert(!(siphash.sum24(key[0:16], msg[0:0]) != 0x726FDB47DD0E0E31u64)); + assert(!(siphash.sum24(key[0:16], msg[0:1]) != 0x74F839C593DC67FDu64)); + assert(!(siphash.sum24(key[0:16], msg[0:4]) != 0xCF2794E0277187B7u64)); + assert(!(siphash.sum24(key[0:16], msg[0:7]) != 0xAB0200F58B01D137u64)); + assert(!(siphash.sum24(key[0:16], msg[0:8]) != 0x93F5F5799A932462u64)); + assert(!(siphash.sum24(key[0:16], msg[0:9]) != 0x9E0082DF0BA9E4B0u64)); + assert(!(siphash.sum24(key[0:16], msg[0:15]) != 0xA129CA6149BE45E5u64)); + assert(!(siphash.sum24(key[0:16], msg[0:16]) != 0x3F2ACC7F57C29BDBu64)); + assert(!(siphash.sum24(key[0:16], msg[0:23]) != 0xA80C038CCD5CCEC8u64)); + assert(!(siphash.sum24(key[0:16], msg[0:32]) != 0x7127512F72F27CCEu64)); }; @test fn ascii() void = { @@ -45,19 +45,19 @@ fn putstr(s: str, into: []u8, off: i32) i32 = { let buf: [128]u8; let n: i32 = 0; n = putstr("a", buf[0:128], 0); - if (siphash.sum24(key[0:16], buf[0:n]) != 0xFA7E197B2F4427D4u64) { let _: i32 = 1/0; }; + assert(!(siphash.sum24(key[0:16], buf[0:n]) != 0xFA7E197B2F4427D4u64)); n = putstr("abc", buf[0:128], 0); - if (siphash.sum24(key[0:16], buf[0:n]) != 0x133D3A92BB9CA86Bu64) { let _: i32 = 1/0; }; + assert(!(siphash.sum24(key[0:16], buf[0:n]) != 0x133D3A92BB9CA86Bu64)); n = putstr("foobar", buf[0:128], 0); - if (siphash.sum24(key[0:16], buf[0:n]) != 0x84D2B5169DB6D3BFu64) { let _: i32 = 1/0; }; + assert(!(siphash.sum24(key[0:16], buf[0:n]) != 0x84D2B5169DB6D3BFu64)); n = putstr("hello world", buf[0:128], 0); - if (siphash.sum24(key[0:16], buf[0:n]) != 0xB0417FA523CF7B36u64) { let _: i32 = 1/0; }; + assert(!(siphash.sum24(key[0:16], buf[0:n]) != 0xB0417FA523CF7B36u64)); n = putstr("The quick brown fox jumps over the lazy dog", buf[0:128], 0); - if (siphash.sum24(key[0:16], buf[0:n]) != 0xA4CBBF0BDB704790u64) { let _: i32 = 1/0; }; + assert(!(siphash.sum24(key[0:16], buf[0:n]) != 0xA4CBBF0BDB704790u64)); }; @test fn empty() void = { @@ -66,7 +66,7 @@ fn putstr(s: str, into: []u8, off: i32) i32 = { let i: i32 = 0; for (i < 16) { key[i] = kstr[i]; i += 1; }; let empty: [1]u8; - if (siphash.sum24(key[0:16], empty[0:0]) != 0x2A51AE0682925836u64) { let _: i32 = 1/0; }; + assert(!(siphash.sum24(key[0:16], empty[0:0]) != 0x2A51AE0682925836u64)); }; export fn main() i32 = {