From 84ad33f6d985e7e4007ff28dc139ffdd0162a368 Mon Sep 17 00:00:00 2001 From: Soerian Lieve Date: Sun, 14 Jan 2024 11:09:50 +0100 Subject: [PATCH] Use assert_int_equal instead of assert_true for integer comparisons This should provide better error messages. Apparently assert_int_equal also allows comparisons of wider types like uint64. --- tests/roaring64_unit.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/roaring64_unit.cpp b/tests/roaring64_unit.cpp index 9423ab252..f5eae2859 100644 --- a/tests/roaring64_unit.cpp +++ b/tests/roaring64_unit.cpp @@ -222,7 +222,7 @@ DEFINE_TEST(test_select) { uint64_t element = 0; for (uint64_t i = 0; i < 100; ++i) { assert_true(roaring64_bitmap_select(r, i, &element)); - assert_true(element == i * 1000); + assert_int_equal(element, i * 1000); } assert_false(roaring64_bitmap_select(r, 100, &element)); roaring64_bitmap_free(r); @@ -234,8 +234,8 @@ DEFINE_TEST(test_rank) { roaring64_bitmap_add(r, i * 1000); } for (uint64_t i = 0; i < 100; ++i) { - assert_true(roaring64_bitmap_rank(r, i * 1000) == i + 1); - assert_true(roaring64_bitmap_rank(r, i * 1000 + 1) == i + 1); + assert_int_equal(roaring64_bitmap_rank(r, i * 1000), i + 1); + assert_int_equal(roaring64_bitmap_rank(r, i * 1000 + 1), i + 1); } roaring64_bitmap_free(r); } @@ -248,7 +248,7 @@ DEFINE_TEST(test_get_index) { for (uint64_t i = 0; i < 100; ++i) { uint64_t index = 0; assert_true(roaring64_bitmap_get_index(r, i * 1000, &index)); - assert_true(index == i); + assert_int_equal(index, i); assert_false(roaring64_bitmap_get_index(r, i * 1000 + 1, &index)); } roaring64_bitmap_free(r); @@ -370,7 +370,7 @@ DEFINE_TEST(test_get_cardinality) { roaring64_bitmap_add(r, 100002); roaring64_bitmap_add(r, 200000); - assert_true(roaring64_bitmap_get_cardinality(r) == 5); + assert_int_equal(roaring64_bitmap_get_cardinality(r), 5); roaring64_bitmap_free(r); } @@ -384,10 +384,10 @@ DEFINE_TEST(test_range_cardinality) { roaring64_bitmap_add(r, 100002); roaring64_bitmap_add(r, 200000); - assert_true(roaring64_bitmap_range_cardinality(r, 0, 0) == 0); - assert_true(roaring64_bitmap_range_cardinality(r, 0, 100000) == 1); - assert_true(roaring64_bitmap_range_cardinality(r, 1, 100001) == 1); - assert_true(roaring64_bitmap_range_cardinality(r, 0, 200001) == 5); + assert_int_equal(roaring64_bitmap_range_cardinality(r, 0, 0), 0); + assert_int_equal(roaring64_bitmap_range_cardinality(r, 0, 100000), 1); + assert_int_equal(roaring64_bitmap_range_cardinality(r, 1, 100001), 1); + assert_int_equal(roaring64_bitmap_range_cardinality(r, 0, 200001), 5); roaring64_bitmap_free(r); } @@ -403,13 +403,13 @@ DEFINE_TEST(test_is_empty) { DEFINE_TEST(test_minimum) { roaring64_bitmap_t* r = roaring64_bitmap_create(); - assert_true(roaring64_bitmap_minimum(r) == UINT64_MAX); + assert_int_equal(roaring64_bitmap_minimum(r), UINT64_MAX); roaring64_bitmap_add(r, (1ULL << 34) + 1); roaring64_bitmap_add(r, (1ULL << 35) + 1); roaring64_bitmap_add(r, (1ULL << 35) + 2); - assert_true(roaring64_bitmap_minimum(r) == ((1ULL << 34) + 1)); + assert_int_equal(roaring64_bitmap_minimum(r), ((1ULL << 34) + 1)); roaring64_bitmap_free(r); } @@ -417,14 +417,14 @@ DEFINE_TEST(test_minimum) { DEFINE_TEST(test_maximum) { roaring64_bitmap_t* r = roaring64_bitmap_create(); - assert_true(roaring64_bitmap_maximum(r) == 0); + assert_int_equal(roaring64_bitmap_maximum(r), 0); roaring64_bitmap_add(r, 0); roaring64_bitmap_add(r, (1ULL << 34) + 1); roaring64_bitmap_add(r, (1ULL << 35) + 1); roaring64_bitmap_add(r, (1ULL << 35) + 2); - assert_true(roaring64_bitmap_maximum(r) == ((1ULL << 35) + 2)); + assert_int_equal(roaring64_bitmap_maximum(r), ((1ULL << 35) + 2)); roaring64_bitmap_free(r); } @@ -570,7 +570,7 @@ DEFINE_TEST(test_and_cardinality) { roaring64_bitmap_add(r2, 200000); roaring64_bitmap_add(r2, 400000); - assert_true(roaring64_bitmap_and_cardinality(r1, r2) == 2); + assert_int_equal(roaring64_bitmap_and_cardinality(r1, r2), 2); roaring64_bitmap_free(r1); roaring64_bitmap_free(r2); @@ -682,7 +682,7 @@ DEFINE_TEST(test_or_cardinality) { roaring64_bitmap_add(r2, 200000); roaring64_bitmap_add(r2, 400000); - assert_true(roaring64_bitmap_or_cardinality(r1, r2) == 5); + assert_int_equal(roaring64_bitmap_or_cardinality(r1, r2), 5); roaring64_bitmap_free(r1); roaring64_bitmap_free(r2); @@ -752,7 +752,7 @@ DEFINE_TEST(test_xor_cardinality) { roaring64_bitmap_add(r2, 200000); roaring64_bitmap_add(r2, 400000); - assert_true(roaring64_bitmap_xor_cardinality(r1, r2) == 3); + assert_int_equal(roaring64_bitmap_xor_cardinality(r1, r2), 3); roaring64_bitmap_free(r1); roaring64_bitmap_free(r2); @@ -822,7 +822,7 @@ DEFINE_TEST(test_andnot_cardinality) { roaring64_bitmap_add(r2, 200000); roaring64_bitmap_add(r2, 400000); - assert_true(roaring64_bitmap_andnot_cardinality(r1, r2) == 2); + assert_int_equal(roaring64_bitmap_andnot_cardinality(r1, r2), 2); roaring64_bitmap_free(r1); roaring64_bitmap_free(r2); @@ -869,8 +869,8 @@ DEFINE_TEST(test_iterate) { uint64_t sum = 0; assert_true(roaring64_bitmap_iterate(r, roaring_iterator64_sumall, &sum)); - assert_true(sum == ((1ULL << 35) + (1ULL << 35) + 1 + (1ULL << 35) + 2 + - (1ULL << 36))); + assert_int_equal(sum, ((1ULL << 35) + (1ULL << 35) + 1 + (1ULL << 35) + 2 + + (1ULL << 36))); roaring64_bitmap_free(r); }