Skip to content

Commit 2e53d29

Browse files
pks-tgitster
authored andcommitted
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>
1 parent d5e4aef commit 2e53d29

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

t/unit-tests/u-reftable-record.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ void test_reftable_record__varint_roundtrip(void)
5151
int n = put_var_int(&out, in);
5252
uint64_t got = 0;
5353

54-
cl_assert(n > 0);
54+
cl_assert_gt_i(n, 0);
5555
out.len = n;
5656
n = get_var_int(&got, &out);
57-
cl_assert(n > 0);
57+
cl_assert_gt_i(n, 0);
5858

5959
cl_assert_equal_i(got, in);
6060
}
@@ -110,7 +110,7 @@ void test_reftable_record__ref_record_comparison(void)
110110
cl_assert(reftable_record_equal(&in[1], &in[2],
111111
REFTABLE_HASH_SIZE_SHA1) == 0);
112112
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);
114114

115115
in[1].u.ref.value_type = in[0].u.ref.value_type;
116116
cl_assert(reftable_record_equal(&in[0], &in[1],
@@ -184,7 +184,7 @@ void test_reftable_record__ref_record_roundtrip(void)
184184

185185
reftable_record_key(&in, &key);
186186
n = reftable_record_encode(&in, dest, REFTABLE_HASH_SIZE_SHA1);
187-
cl_assert(n > 0);
187+
cl_assert_gt_i(n, 0);
188188

189189
/* decode into a non-zero reftable_record to test for leaks. */
190190
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)
228228
cl_assert_equal_i(reftable_record_equal(&in[1], &in[2],
229229
REFTABLE_HASH_SIZE_SHA1), 0);
230230
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);
232232
/* comparison should be reversed for equal keys, because
233233
* comparison is now performed on the basis of update indices */
234234
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);
236236

237237
in[1].u.log.update_index = in[0].u.log.update_index;
238238
cl_assert(reftable_record_equal(&in[0], &in[1],
@@ -344,7 +344,7 @@ void test_reftable_record__log_record_roundtrip(void)
344344
reftable_record_key(&rec, &key);
345345

346346
n = reftable_record_encode(&rec, dest, REFTABLE_HASH_SIZE_SHA1);
347-
cl_assert(n >= 0);
347+
cl_assert_ge_i(n, 0);
348348
valtype = reftable_record_val_type(&rec);
349349
m = reftable_record_decode(&out, key, valtype, dest,
350350
REFTABLE_HASH_SIZE_SHA1, &scratch);
@@ -382,7 +382,7 @@ void test_reftable_record__key_roundtrip(void)
382382
extra = 6;
383383
n = reftable_encode_key(&restart, dest, last_key, key, extra);
384384
cl_assert(!restart);
385-
cl_assert(n > 0);
385+
cl_assert_gt_i(n, 0);
386386

387387
cl_assert_equal_i(reftable_buf_addstr(&roundtrip,
388388
"refs/heads/master"), 0);
@@ -432,7 +432,7 @@ void test_reftable_record__obj_record_comparison(void)
432432
cl_assert_equal_i(reftable_record_equal(&in[1], &in[2],
433433
REFTABLE_HASH_SIZE_SHA1), 0);
434434
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);
436436

437437
in[1].u.obj.offset_len = in[0].u.obj.offset_len;
438438
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)
485485
t_copy(&in);
486486
reftable_record_key(&in, &key);
487487
n = reftable_record_encode(&in, dest, REFTABLE_HASH_SIZE_SHA1);
488-
cl_assert(n > 0);
488+
cl_assert_gt_i(n, 0);
489489
extra = reftable_record_val_type(&in);
490490
m = reftable_record_decode(&out, key, extra, dest,
491491
REFTABLE_HASH_SIZE_SHA1, &scratch);
@@ -535,7 +535,7 @@ void test_reftable_record__index_record_comparison(void)
535535
cl_assert_equal_i(reftable_record_equal(&in[1], &in[2],
536536
REFTABLE_HASH_SIZE_SHA1), 0);
537537
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);
539539

540540
in[1].u.idx.offset = in[0].u.idx.offset;
541541
cl_assert(reftable_record_equal(&in[0], &in[1],

0 commit comments

Comments
 (0)