Skip to content

chore: BTreeMap tests cleanup #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 24, 2025
Merged

chore: BTreeMap tests cleanup #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4a0830
cleanup
maksymar Apr 24, 2025
394d3b6
.
maksymar Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 44 additions & 32 deletions src/btreemap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,10 +1310,40 @@ mod test {
}
}

macro_rules! verify_and_run {
($runner:ident, $K:ty, $V:ty) => {{
/// Asserts that the associated `BOUND` for `$ty` is _not_ `Unbounded`.
macro_rules! assert_bounded {
($ty:ty) => {
assert_ne!(<$ty>::BOUND, StorableBound::Unbounded, "Must be Bounded");
};
}

/// Asserts that the associated `BOUND` for `$ty` _is_ `Unbounded`.
macro_rules! assert_unbounded {
($ty:ty) => {
assert_eq!(<$ty>::BOUND, StorableBound::Unbounded, "Must be Unbounded");
};
}

macro_rules! run_with_key {
($runner:ident, $K:ty) => {{
verify_monotonic::<$K>();
$runner::<$K, $V>();

// Empty value.
$runner::<$K, ()>();

// Bounded values.
assert_bounded!(u32);
$runner::<$K, u32>();

assert_bounded!(Blob<20>);
$runner::<$K, Blob<20>>();

// Unbounded values.
assert_unbounded!(MonotonicVec32);
$runner::<$K, MonotonicVec32>();

assert_unbounded!(MonotonicString32);
$runner::<$K, MonotonicString32>();
}};
}

Expand All @@ -1322,37 +1352,19 @@ mod test {
($name:ident, $runner:ident) => {
#[test]
fn $name() {
use StorableBound::Unbounded;

// Set, empty value, bounded.
{
type Value = ();
assert_ne!(<Value>::BOUND, Unbounded, "Must be Bounded");
verify_and_run!($runner, u32, Value);
verify_and_run!($runner, Blob<10>, Value);
verify_and_run!($runner, MonotonicVec32, Value);
verify_and_run!($runner, MonotonicString32, Value);
}
// Bounded keys.
assert_bounded!(u32);
run_with_key!($runner, u32);

// Map, bounded value.
{
type Value = u32;
assert_ne!(Value::BOUND, Unbounded, "Must be Bounded");
verify_and_run!($runner, u32, Value);
verify_and_run!($runner, Blob<10>, Value);
verify_and_run!($runner, MonotonicVec32, Value);
verify_and_run!($runner, MonotonicString32, Value);
}
assert_bounded!(Blob<10>);
run_with_key!($runner, Blob<10>);

// Map, unbounded value.
{
type Value = MonotonicVec32;
assert_eq!(Value::BOUND, Unbounded, "Must be Unbounded");
verify_and_run!($runner, u32, Value);
verify_and_run!($runner, Blob<10>, Value);
verify_and_run!($runner, MonotonicVec32, Value);
verify_and_run!($runner, MonotonicString32, Value);
}
// Unbounded keys.
assert_unbounded!(MonotonicVec32);
run_with_key!($runner, MonotonicVec32);

assert_unbounded!(MonotonicString32);
run_with_key!($runner, MonotonicString32);
}
};
}
Expand Down
12 changes: 8 additions & 4 deletions src/btreemap/node/v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@
//! Node type ↕ 1 byte
//! ----------------------------------------
//! # Entries (k) ↕ 2 bytes
//! ---------------------------------------- <-- Entries (upto `CAPACITY` entries)
//! Key(0)
//! ---------------------------------------- <-- Entries (up to `CAPACITY` entries)
//! Key(0) size ↕ 4 bytes
//! ----------------------------------------
//! Value(0)
//! Key(0) ↕ `max_key_size` bytes
//! ----------------------------------------
//! Value(0) size ↕ 4 bytes
//! ----------------------------------------
//! Value(0) ↕ `max_value_size` bytes
//! ----------------------------------------
//! Key(1) size ↕ 4 bytes
//! ----------------------------------------
Expand All @@ -28,7 +32,7 @@
//! Value(1) ↕ `max_value_size` bytes
//! ----------------------------------------
//! ...
//! ---------------------------------------- <-- Children (upto `CAPACITY + 1` children)
//! ---------------------------------------- <-- Children (up to `CAPACITY + 1` children)
//! Child(0) address ↕ 8 bytes
//! ----------------------------------------
//! ...
Expand Down