t/unit-tests: demonstrate use of integer comparison assertions
The clar project has introduced a couple of new assertions that perform relative integer comparisons, like "greater than" or "less or equal". Adapt the reftable-record unit tests to demonstrate their usage. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Dec 6, 2025 at 12:47 UTC
2e53d29f53e2a4c6bb5b9f8f3169c178e5ef62a0
1 file changed
+11
-11
t/unit-tests/u-reftable-record.c
+11
-11
@@ -51,10 +51,10 @@ void test_reftable_record__varint_roundtrip(void)
51
int n = put_var_int(&out, in);
52
uint64_t got = 0;
53
54
- cl_assert(n > 0);
54
+ cl_assert_gt_i(n, 0);
55
out.len = n;
56
n = get_var_int(&got, &out);
57
- cl_assert(n > 0);
57
+ cl_assert_gt_i(n, 0);
58
59
cl_assert_equal_i(got, in);
60
}
@@ -110,7 +110,7 @@ void test_reftable_record__ref_record_comparison(void)
110
cl_assert(reftable_record_equal(&in[1], &in[2],
111
REFTABLE_HASH_SIZE_SHA1) == 0);
112
cl_assert_equal_i(reftable_record_cmp(&in[1], &in[2], &cmp), 0);
113
- cl_assert(cmp > 0);
113
+ cl_assert_gt_i(cmp, 0);
114
115
in[1].u.ref.value_type = in[0].u.ref.value_type;
116
cl_assert(reftable_record_equal(&in[0], &in[1],
@@ -184,7 +184,7 @@ void test_reftable_record__ref_record_roundtrip(void)
184
185
reftable_record_key(&in, &key);
186
n = reftable_record_encode(&in, dest, REFTABLE_HASH_SIZE_SHA1);
187
- cl_assert(n > 0);
187
+ cl_assert_gt_i(n, 0);
188
189
/* decode into a non-zero reftable_record to test for leaks. */
190
m = reftable_record_decode(&out, key, i, dest, REFTABLE_HASH_SIZE_SHA1, &scratch);
@@ -228,11 +228,11 @@ void test_reftable_record__log_record_comparison(void)
228
cl_assert_equal_i(reftable_record_equal(&in[1], &in[2],
229
REFTABLE_HASH_SIZE_SHA1), 0);
230
cl_assert_equal_i(reftable_record_cmp(&in[1], &in[2], &cmp), 0);
231
- cl_assert(cmp > 0);
231
+ cl_assert_gt_i(cmp, 0);
232
/* comparison should be reversed for equal keys, because
233
* comparison is now performed on the basis of update indices */
234
cl_assert_equal_i(reftable_record_cmp(&in[0], &in[1], &cmp), 0);
235
- cl_assert(cmp < 0);
235
+ cl_assert_lt_i(cmp, 0);
236
237
in[1].u.log.update_index = in[0].u.log.update_index;
238
cl_assert(reftable_record_equal(&in[0], &in[1],
@@ -344,7 +344,7 @@ void test_reftable_record__log_record_roundtrip(void)
344
reftable_record_key(&rec, &key);
345
346
n = reftable_record_encode(&rec, dest, REFTABLE_HASH_SIZE_SHA1);
347
- cl_assert(n >= 0);
347
+ cl_assert_ge_i(n, 0);
348
valtype = reftable_record_val_type(&rec);
349
m = reftable_record_decode(&out, key, valtype, dest,
350
REFTABLE_HASH_SIZE_SHA1, &scratch);
@@ -382,7 +382,7 @@ void test_reftable_record__key_roundtrip(void)
382
extra = 6;
383
n = reftable_encode_key(&restart, dest, last_key, key, extra);
384
cl_assert(!restart);
385
- cl_assert(n > 0);
385
+ cl_assert_gt_i(n, 0);
386
387
cl_assert_equal_i(reftable_buf_addstr(&roundtrip,
388
"refs/heads/master"), 0);
@@ -432,7 +432,7 @@ void test_reftable_record__obj_record_comparison(void)
432
cl_assert_equal_i(reftable_record_equal(&in[1], &in[2],
433
REFTABLE_HASH_SIZE_SHA1), 0);
434
cl_assert_equal_i(reftable_record_cmp(&in[1], &in[2], &cmp), 0);
435
- cl_assert(cmp > 0);
435
+ cl_assert_gt_i(cmp, 0);
436
437
in[1].u.obj.offset_len = in[0].u.obj.offset_len;
438
cl_assert(reftable_record_equal(&in[0], &in[1], REFTABLE_HASH_SIZE_SHA1) != 0);
@@ -485,7 +485,7 @@ void test_reftable_record__obj_record_roundtrip(void)
485
t_copy(&in);
486
reftable_record_key(&in, &key);
487
n = reftable_record_encode(&in, dest, REFTABLE_HASH_SIZE_SHA1);
488
- cl_assert(n > 0);
488
+ cl_assert_gt_i(n, 0);
489
extra = reftable_record_val_type(&in);
490
m = reftable_record_decode(&out, key, extra, dest,
491
REFTABLE_HASH_SIZE_SHA1, &scratch);
@@ -535,7 +535,7 @@ void test_reftable_record__index_record_comparison(void)
535
cl_assert_equal_i(reftable_record_equal(&in[1], &in[2],
536
REFTABLE_HASH_SIZE_SHA1), 0);
537
cl_assert_equal_i(reftable_record_cmp(&in[1], &in[2], &cmp), 0);
538
- cl_assert(cmp > 0);
538
+ cl_assert_gt_i(cmp, 0);
539
540
in[1].u.idx.offset = in[0].u.idx.offset;
541
cl_assert(reftable_record_equal(&in[0], &in[1],