From 24c49add92129066a7047bf1b3d92de1ba254a78 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Wed, 17 Sep 2025 00:22:48 +0800 Subject: [PATCH] Delete old tests --- ds/map/map_btree/test.ha | 67 ----------------------------------------------------- ds/map/map_fnv/test.ha | 116 ----------------------------------------------------- ds/map/map_rbtree/test.ha | 68 ----------------------------------------------------- ds/map/map_siphash/test.ha | 120 ----------------------------------------------------- ds/map/map_slice_basic/test.ha | 68 ----------------------------------------------------- ds/map/map_slice_sorted/test.ha | 68 ----------------------------------------------------- ds/map/map_swiss_siphash/test.ha | 74 ----------------------------------------------------- diff --git a/ds/map/map_btree/test.ha b/ds/map/map_btree/test.ha deleted file mode 100644 index 386320d0821abe9c110aa5640ba4466b442f010a..0000000000000000000000000000000000000000 --- a/ds/map/map_btree/test.ha +++ /dev/null @@ -1,67 +0,0 @@ -use errors; -use strings; -use ds::map; - -@test fn roundtrip() void = { - let m: *map = match (new(2)) { - case let p: *map => yield p; - case errors::invalid => abort("unexpected errors::invalid"); - case nomem => abort("unexpected nomem"); - }; - defer finish(m); - - let v1 = 1, v2 = 2, v3 = 3; - let p1: *opaque = (&v1: *opaque); - let p2: *opaque = (&v2: *opaque); - let p3: *opaque = (&v3: *opaque); - - let k1 = strings::toutf8("alpha"); - let k2 = strings::toutf8("beta"); - let k3 = strings::toutf8("gamma"); - - match (map::set(m, k1, p1)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k1,p1)"); - }; - - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p1, "get(k1) must return p1"); - case void => - abort("get(k1) unexpectedly void"); - }; - - match (map::set(m, k1, p2)) { - case void => yield; - case nomem => abort("unexpected nomem in replace"); - }; - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p2, "replace must overwrite prior value"); - case void => - abort("get(k1) void after replace"); - }; - - match (map::set(m, k2, p3)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k2,p3)"); - }; - - match (map::get(m, k3)) { - case void => yield; - case *opaque => - abort("get(k3) must be void for missing key"); - }; - - match (map::del(m, k2)) { - case let got: *opaque => - assert(got == p3, "del(k2) must return stored value"); - case void => - abort("del(k2) unexpectedly void"); - }; - match (map::del(m, k2)) { - case void => yield; - case *opaque => - abort("del(k2) must be void after prior delete"); - }; -}; diff --git a/ds/map/map_fnv/test.ha b/ds/map/map_fnv/test.ha deleted file mode 100644 index 55fc410d9fe9d4f3eca17cc4dc1387acb159546a..0000000000000000000000000000000000000000 --- a/ds/map/map_fnv/test.ha +++ /dev/null @@ -1,116 +0,0 @@ -use errors; -use strings; -use ds::map; -use ds::map::map_slice_basic; -use ds::map::map_slice_sorted; -use ds::map::map_btree; -use ds::map::map_rbtree; - -fn mk_slice_basic() (*map::map | nomem) = { - match (map_slice_basic::new()) { - case let p: *map_slice_basic::map => return (p: *map::map); - case nomem => return nomem; - }; -}; - -fn mk_slice_sorted() (*map::map | nomem) = { - match (map_slice_sorted::new()) { - case let p: *map_slice_sorted::map => return (p: *map::map); - case nomem => return nomem; - }; -}; - -fn mk_btree() (*map::map | nomem) = { - match (map_btree::new(2)) { - case let p: *map_btree::map => return (p: *map::map); - case errors::invalid => abort("map_btree::new(2) invalid (unexpected)"); - case nomem => return nomem; - }; -}; - -fn mk_rbtree() (*map::map | nomem) = { - match (map_rbtree::new()) { - case let p: *map_rbtree::map => return (p: *map::map); - case nomem => return nomem; - }; -}; - -fn run_case(make_fallback: *fn() (*map::map | nomem)) void = { - let m: *map = match (new(make_fallback, 16)) { - case let p: *map => yield p; - case errors::invalid => abort("unexpected errors::invalid"); - case nomem => abort("unexpected nomem"); - }; - defer finish(m); - - let v1 = 1, v2 = 2, v3 = 3; - let p1: *opaque = (&v1: *opaque); - let p2: *opaque = (&v2: *opaque); - let p3: *opaque = (&v3: *opaque); - - let k1 = strings::toutf8("alpha"); - let k2 = strings::toutf8("beta"); - let k3 = strings::toutf8("gamma"); - - match (map::set(m, k1, p1)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k1,p1)"); - }; - - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p1, "get(k1) must return p1"); - case void => - abort("get(k1) unexpectedly void"); - }; - - match (map::set(m, k1, p2)) { - case void => yield; - case nomem => abort("unexpected nomem in replace"); - }; - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p2, "replace must overwrite prior value"); - case void => - abort("get(k1) void after replace"); - }; - - match (map::set(m, k2, p3)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k2,p3)"); - }; - - match (map::get(m, k3)) { - case void => yield; - case *opaque => - abort("get(k3) must be void for missing key"); - }; - - match (map::del(m, k2)) { - case let got: *opaque => - assert(got == p3, "del(k2) must return stored value"); - case void => - abort("del(k2) unexpectedly void"); - }; - match (map::del(m, k2)) { - case void => yield; - case *opaque => - abort("del(k2) must be void after prior delete"); - }; -}; - -@test fn roundtrip_with_slice_basic() void = { - run_case(&mk_slice_basic); -}; - -@test fn roundtrip_with_slice_sorted() void = { - run_case(&mk_slice_sorted); -}; - -@test fn roundtrip_with_btree() void = { - run_case(&mk_btree); -}; - -@test fn roundtrip_with_rbtree() void = { - run_case(&mk_rbtree); -}; diff --git a/ds/map/map_rbtree/test.ha b/ds/map/map_rbtree/test.ha deleted file mode 100644 index 12f94e8dda42d43bc0d41c35b1b104688d0813c0..0000000000000000000000000000000000000000 --- a/ds/map/map_rbtree/test.ha +++ /dev/null @@ -1,68 +0,0 @@ -use errors; -use strings; -use ds::map; - -@test fn roundtrip() void = { - const key: [16]u8 = [0...]; - - let m: *map = match (new()) { - case let p: *map => yield p; - case nomem => abort("unexpected nomem"); - }; - defer finish(m); - - let v1 = 1, v2 = 2, v3 = 3; - let p1: *opaque = (&v1: *opaque); - let p2: *opaque = (&v2: *opaque); - let p3: *opaque = (&v3: *opaque); - - let k1 = strings::toutf8("alpha"); - let k2 = strings::toutf8("beta"); - let k3 = strings::toutf8("gamma"); - - match (map::set(m, k1, p1)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k1,p1)"); - }; - - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p1, "get(k1) must return p1"); - case void => - abort("get(k1) unexpectedly void"); - }; - - match (map::set(m, k1, p2)) { - case void => yield; - case nomem => abort("unexpected nomem in replace"); - }; - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p2, "replace must overwrite prior value"); - case void => - abort("get(k1) void after replace"); - }; - - match (map::set(m, k2, p3)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k2,p3)"); - }; - - match (map::get(m, k3)) { - case void => yield; - case *opaque => - abort("get(k3) must be void for missing key"); - }; - - match (map::del(m, k2)) { - case let got: *opaque => - assert(got == p3, "del(k2) must return stored value"); - case void => - abort("del(k2) unexpectedly void"); - }; - match (map::del(m, k2)) { - case void => yield; - case *opaque => - abort("del(k2) must be void after prior delete"); - }; -}; diff --git a/ds/map/map_siphash/test.ha b/ds/map/map_siphash/test.ha deleted file mode 100644 index da9a92c8295ba61a10ea9de1199e8069c05b2ce8..0000000000000000000000000000000000000000 --- a/ds/map/map_siphash/test.ha +++ /dev/null @@ -1,120 +0,0 @@ -use crypto::random; -use errors; -use strings; -use ds::map; -use ds::map::map_slice_basic; -use ds::map::map_slice_sorted; -use ds::map::map_btree; -use ds::map::map_rbtree; - -fn mk_slice_basic() (*map::map | nomem) = { - match (map_slice_basic::new()) { - case let p: *map_slice_basic::map => return (p: *map::map); - case nomem => return nomem; - }; -}; - -fn mk_slice_sorted() (*map::map | nomem) = { - match (map_slice_sorted::new()) { - case let p: *map_slice_sorted::map => return (p: *map::map); - case nomem => return nomem; - }; -}; - -fn mk_btree() (*map::map | nomem) = { - match (map_btree::new(2)) { - case let p: *map_btree::map => return (p: *map::map); - case errors::invalid => abort("map_btree::new(2) invalid (unexpected)"); - case nomem => return nomem; - }; -}; - -fn mk_rbtree() (*map::map | nomem) = { - match (map_rbtree::new()) { - case let p: *map_rbtree::map => return (p: *map::map); - case nomem => return nomem; - }; -}; - -fn run_case(make_fallback: *fn() (*map::map | nomem)) void = { - const key: [16]u8 = [0...]; - random::buffer(&key); - - let m: *map = match (new(make_fallback, 16, key)) { - case let p: *map => yield p; - case errors::invalid => abort("unexpected errors::invalid"); - case nomem => abort("unexpected nomem"); - }; - defer finish(m); - - let v1 = 1, v2 = 2, v3 = 3; - let p1: *opaque = (&v1: *opaque); - let p2: *opaque = (&v2: *opaque); - let p3: *opaque = (&v3: *opaque); - - let k1 = strings::toutf8("alpha"); - let k2 = strings::toutf8("beta"); - let k3 = strings::toutf8("gamma"); - - match (map::set(m, k1, p1)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k1,p1)"); - }; - - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p1, "get(k1) must return p1"); - case void => - abort("get(k1) unexpectedly void"); - }; - - match (map::set(m, k1, p2)) { - case void => yield; - case nomem => abort("unexpected nomem in replace"); - }; - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p2, "replace must overwrite prior value"); - case void => - abort("get(k1) void after replace"); - }; - - match (map::set(m, k2, p3)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k2,p3)"); - }; - - match (map::get(m, k3)) { - case void => yield; - case *opaque => - abort("get(k3) must be void for missing key"); - }; - - match (map::del(m, k2)) { - case let got: *opaque => - assert(got == p3, "del(k2) must return stored value"); - case void => - abort("del(k2) unexpectedly void"); - }; - match (map::del(m, k2)) { - case void => yield; - case *opaque => - abort("del(k2) must be void after prior delete"); - }; -}; - -@test fn roundtrip_with_slice_basic() void = { - run_case(&mk_slice_basic); -}; - -@test fn roundtrip_with_slice_sorted() void = { - run_case(&mk_slice_sorted); -}; - -@test fn roundtrip_with_btree() void = { - run_case(&mk_btree); -}; - -@test fn roundtrip_with_rbtree() void = { - run_case(&mk_rbtree); -}; diff --git a/ds/map/map_slice_basic/test.ha b/ds/map/map_slice_basic/test.ha deleted file mode 100644 index 12f94e8dda42d43bc0d41c35b1b104688d0813c0..0000000000000000000000000000000000000000 --- a/ds/map/map_slice_basic/test.ha +++ /dev/null @@ -1,68 +0,0 @@ -use errors; -use strings; -use ds::map; - -@test fn roundtrip() void = { - const key: [16]u8 = [0...]; - - let m: *map = match (new()) { - case let p: *map => yield p; - case nomem => abort("unexpected nomem"); - }; - defer finish(m); - - let v1 = 1, v2 = 2, v3 = 3; - let p1: *opaque = (&v1: *opaque); - let p2: *opaque = (&v2: *opaque); - let p3: *opaque = (&v3: *opaque); - - let k1 = strings::toutf8("alpha"); - let k2 = strings::toutf8("beta"); - let k3 = strings::toutf8("gamma"); - - match (map::set(m, k1, p1)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k1,p1)"); - }; - - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p1, "get(k1) must return p1"); - case void => - abort("get(k1) unexpectedly void"); - }; - - match (map::set(m, k1, p2)) { - case void => yield; - case nomem => abort("unexpected nomem in replace"); - }; - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p2, "replace must overwrite prior value"); - case void => - abort("get(k1) void after replace"); - }; - - match (map::set(m, k2, p3)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k2,p3)"); - }; - - match (map::get(m, k3)) { - case void => yield; - case *opaque => - abort("get(k3) must be void for missing key"); - }; - - match (map::del(m, k2)) { - case let got: *opaque => - assert(got == p3, "del(k2) must return stored value"); - case void => - abort("del(k2) unexpectedly void"); - }; - match (map::del(m, k2)) { - case void => yield; - case *opaque => - abort("del(k2) must be void after prior delete"); - }; -}; diff --git a/ds/map/map_slice_sorted/test.ha b/ds/map/map_slice_sorted/test.ha deleted file mode 100644 index 12f94e8dda42d43bc0d41c35b1b104688d0813c0..0000000000000000000000000000000000000000 --- a/ds/map/map_slice_sorted/test.ha +++ /dev/null @@ -1,68 +0,0 @@ -use errors; -use strings; -use ds::map; - -@test fn roundtrip() void = { - const key: [16]u8 = [0...]; - - let m: *map = match (new()) { - case let p: *map => yield p; - case nomem => abort("unexpected nomem"); - }; - defer finish(m); - - let v1 = 1, v2 = 2, v3 = 3; - let p1: *opaque = (&v1: *opaque); - let p2: *opaque = (&v2: *opaque); - let p3: *opaque = (&v3: *opaque); - - let k1 = strings::toutf8("alpha"); - let k2 = strings::toutf8("beta"); - let k3 = strings::toutf8("gamma"); - - match (map::set(m, k1, p1)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k1,p1)"); - }; - - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p1, "get(k1) must return p1"); - case void => - abort("get(k1) unexpectedly void"); - }; - - match (map::set(m, k1, p2)) { - case void => yield; - case nomem => abort("unexpected nomem in replace"); - }; - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p2, "replace must overwrite prior value"); - case void => - abort("get(k1) void after replace"); - }; - - match (map::set(m, k2, p3)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k2,p3)"); - }; - - match (map::get(m, k3)) { - case void => yield; - case *opaque => - abort("get(k3) must be void for missing key"); - }; - - match (map::del(m, k2)) { - case let got: *opaque => - assert(got == p3, "del(k2) must return stored value"); - case void => - abort("del(k2) unexpectedly void"); - }; - match (map::del(m, k2)) { - case void => yield; - case *opaque => - abort("del(k2) must be void after prior delete"); - }; -}; diff --git a/ds/map/map_swiss_siphash/test.ha b/ds/map/map_swiss_siphash/test.ha deleted file mode 100644 index 7d146a4454b6f54f8ade08bc4bc7da6a1711b3c8..0000000000000000000000000000000000000000 --- a/ds/map/map_swiss_siphash/test.ha +++ /dev/null @@ -1,74 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 AND MPL-2.0 -// SPDX-FileCopyrightText: 2024 The Cockroach Authors -// SPDX-FileCopyrightText: 2025 Runxi Yu - -use crypto::random; -use errors; -use strings; -use ds::map; - -@test fn roundtrip() void = { - let key: [16]u8 = [0...]; - random::buffer(&key); - let m: *map = match (new(1, key)) { - case let p: *map => yield p; - case errors::invalid => abort("unexpected errors::invalid"); - case nomem => abort("unexpected nomem"); - }; - defer finish(m); - - let v1 = 1, v2 = 2, v3 = 3; - let p1: *opaque = (&v1: *opaque); - let p2: *opaque = (&v2: *opaque); - let p3: *opaque = (&v3: *opaque); - - let k1 = strings::toutf8("alpha"); - let k2 = strings::toutf8("beta"); - let k3 = strings::toutf8("gamma"); - - match (map::set(m, k1, p1)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k1,p1)"); - }; - - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p1, "get(k1) must return p1"); - case void => - abort("get(k1) unexpectedly void"); - }; - - match (map::set(m, k1, p2)) { - case void => yield; - case nomem => abort("unexpected nomem in replace"); - }; - match (map::get(m, k1)) { - case let got: *opaque => - assert(got == p2, "replace must overwrite prior value"); - case void => - abort("get(k1) void after replace"); - }; - - match (map::set(m, k2, p3)) { - case void => yield; - case nomem => abort("unexpected nomem in set(k2,p3)"); - }; - - match (map::get(m, k3)) { - case void => yield; - case *opaque => - abort("get(k3) must be void for missing key"); - }; - - match (map::del(m, k2)) { - case let got: *opaque => - assert(got == p3, "del(k2) must return stored value"); - case void => - abort("del(k2) unexpectedly void"); - }; - match (map::del(m, k2)) { - case void => yield; - case *opaque => - abort("del(k2) must be void after prior delete"); - }; -}; -- 2.48.1