Skip to content

Commit 18a992b

Browse files
Seyi007gitster
Seyi007
authored and
gitster
committed
t/unit-tests: convert reftable table test to use clar
Adapt reftable table test file to use clar by using clar assertions where necessary. Signed-off-by: Seyi Kuforiji <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a0aaa85 commit 18a992b

File tree

3 files changed

+38
-44
lines changed

3 files changed

+38
-44
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1368,6 +1368,7 @@ CLAR_TEST_SUITES += u-reftable-basics
13681368
CLAR_TEST_SUITES += u-reftable-block
13691369
CLAR_TEST_SUITES += u-reftable-merged
13701370
CLAR_TEST_SUITES += u-reftable-pq
1371+
CLAR_TEST_SUITES += u-reftable-table
13711372
CLAR_TEST_SUITES += u-reftable-tree
13721373
CLAR_TEST_SUITES += u-strbuf
13731374
CLAR_TEST_SUITES += u-strcmp-offset
@@ -1384,7 +1385,6 @@ CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/lib-reftable-clar.o
13841385
UNIT_TEST_PROGRAMS += t-reftable-readwrite
13851386
UNIT_TEST_PROGRAMS += t-reftable-record
13861387
UNIT_TEST_PROGRAMS += t-reftable-stack
1387-
UNIT_TEST_PROGRAMS += t-reftable-table
13881388
UNIT_TEST_PROGS = $(patsubst %,$(UNIT_TEST_BIN)/%$X,$(UNIT_TEST_PROGRAMS))
13891389
UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o
13901390
UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/lib-reftable.o

‎t/meson.build

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ clar_test_suites = [
1212
'unit-tests/u-reftable-block.c',
1313
'unit-tests/u-reftable-merged.c',
1414
'unit-tests/u-reftable-pq.c',
15+
'unit-tests/u-reftable-table.c',
1516
'unit-tests/u-reftable-tree.c',
1617
'unit-tests/u-strbuf.c',
1718
'unit-tests/u-strcmp-offset.c',
@@ -59,11 +60,9 @@ clar_unit_tests = executable('unit-tests',
5960
test('unit-tests', clar_unit_tests)
6061

6162
unit_test_programs = [
62-
'unit-tests/t-reftable-reader.c',
6363
'unit-tests/t-reftable-readwrite.c',
6464
'unit-tests/t-reftable-record.c',
6565
'unit-tests/t-reftable-stack.c',
66-
'unit-tests/t-reftable-table.c',
6766
]
6867

6968
foreach unit_test_program : unit_test_programs
@@ -1233,4 +1232,4 @@ if perl.found() and time.found()
12331232
timeout: 0,
12341233
)
12351234
endforeach
1236-
endif
1235+
endif

‎t/unit-tests/t-reftable-table.c renamed to ‎t/unit-tests/u-reftable-table.c

Lines changed: 35 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#include "test-lib.h"
2-
#include "lib-reftable.h"
1+
#include "unit-test.h"
2+
#include "lib-reftable-clar.h"
33
#include "reftable/blocksource.h"
44
#include "reftable/constants.h"
55
#include "reftable/iter.h"
66
#include "reftable/table.h"
77
#include "strbuf.h"
88

9-
static int t_table_seek_once(void)
9+
void test_reftable_table__seek_once(void)
1010
{
1111
struct reftable_ref_record records[] = {
1212
{
@@ -22,32 +22,32 @@ static int t_table_seek_once(void)
2222
struct reftable_buf buf = REFTABLE_BUF_INIT;
2323
int ret;
2424

25-
t_reftable_write_to_buf(&buf, records, ARRAY_SIZE(records), NULL, 0, NULL);
25+
cl_reftable_write_to_buf(&buf, records, ARRAY_SIZE(records), NULL, 0, NULL);
2626
block_source_from_buf(&source, &buf);
2727

2828
ret = reftable_table_new(&table, &source, "name");
29-
check(!ret);
29+
cl_assert(!ret);
3030

3131
reftable_table_init_ref_iterator(table, &it);
3232
ret = reftable_iterator_seek_ref(&it, "");
33-
check(!ret);
33+
cl_assert(!ret);
3434
ret = reftable_iterator_next_ref(&it, &ref);
35-
check(!ret);
35+
cl_assert(!ret);
3636

37-
ret = reftable_ref_record_equal(&ref, &records[0], REFTABLE_HASH_SIZE_SHA1);
38-
check_int(ret, ==, 1);
37+
ret = reftable_ref_record_equal(&ref, &records[0],
38+
REFTABLE_HASH_SIZE_SHA1);
39+
cl_assert_equal_i(ret, 1);
3940

4041
ret = reftable_iterator_next_ref(&it, &ref);
41-
check_int(ret, ==, 1);
42+
cl_assert_equal_i(ret, 1);
4243

4344
reftable_ref_record_release(&ref);
4445
reftable_iterator_destroy(&it);
4546
reftable_table_decref(table);
4647
reftable_buf_release(&buf);
47-
return 0;
4848
}
4949

50-
static int t_table_reseek(void)
50+
void test_reftable_table__reseek(void)
5151
{
5252
struct reftable_ref_record records[] = {
5353
{
@@ -63,35 +63,35 @@ static int t_table_reseek(void)
6363
struct reftable_buf buf = REFTABLE_BUF_INIT;
6464
int ret;
6565

66-
t_reftable_write_to_buf(&buf, records, ARRAY_SIZE(records), NULL, 0, NULL);
66+
cl_reftable_write_to_buf(&buf, records, ARRAY_SIZE(records),
67+
NULL, 0, NULL);
6768
block_source_from_buf(&source, &buf);
6869

6970
ret = reftable_table_new(&table, &source, "name");
70-
check(!ret);
71+
cl_assert(!ret);
7172

7273
reftable_table_init_ref_iterator(table, &it);
7374

7475
for (size_t i = 0; i < 5; i++) {
7576
ret = reftable_iterator_seek_ref(&it, "");
76-
check(!ret);
77+
cl_assert(!ret);
7778
ret = reftable_iterator_next_ref(&it, &ref);
78-
check(!ret);
79+
cl_assert(!ret);
7980

8081
ret = reftable_ref_record_equal(&ref, &records[0], REFTABLE_HASH_SIZE_SHA1);
81-
check_int(ret, ==, 1);
82+
cl_assert_equal_i(ret, 1);
8283

8384
ret = reftable_iterator_next_ref(&it, &ref);
84-
check_int(ret, ==, 1);
85+
cl_assert_equal_i(ret, 1);
8586
}
8687

8788
reftable_ref_record_release(&ref);
8889
reftable_iterator_destroy(&it);
8990
reftable_table_decref(table);
9091
reftable_buf_release(&buf);
91-
return 0;
9292
}
9393

94-
static int t_table_block_iterator(void)
94+
void test_reftable_table__block_iterator(void)
9595
{
9696
struct reftable_block_source source = { 0 };
9797
struct reftable_table_iterator it = { 0 };
@@ -147,14 +147,14 @@ static int t_table_block_iterator(void)
147147
(uintmax_t) i);
148148
}
149149

150-
t_reftable_write_to_buf(&buf, records, nrecords, NULL, 0, NULL);
150+
cl_reftable_write_to_buf(&buf, records, nrecords, NULL, 0, NULL);
151151
block_source_from_buf(&source, &buf);
152152

153153
ret = reftable_table_new(&table, &source, "name");
154-
check(!ret);
154+
cl_assert(!ret);
155155

156156
ret = reftable_table_iterator_init(&it, table);
157-
check(!ret);
157+
cl_assert(!ret);
158158

159159
for (size_t i = 0; i < ARRAY_SIZE(expected_blocks); i++) {
160160
struct reftable_iterator record_it = { 0 };
@@ -163,44 +163,39 @@ static int t_table_block_iterator(void)
163163
};
164164

165165
ret = reftable_table_iterator_next(&it, &block);
166-
check(!ret);
166+
cl_assert(!ret);
167167

168-
check_int(block->block_type, ==, expected_blocks[i].block_type);
169-
check_int(block->header_off, ==, expected_blocks[i].header_off);
170-
check_int(block->restart_count, ==, expected_blocks[i].restart_count);
168+
cl_assert_equal_i(block->block_type,
169+
expected_blocks[i].block_type);
170+
cl_assert_equal_i(block->header_off,
171+
expected_blocks[i].header_off);
172+
cl_assert_equal_i(block->restart_count,
173+
expected_blocks[i].restart_count);
171174

172175
ret = reftable_block_init_iterator(block, &record_it);
173-
check(!ret);
176+
cl_assert(!ret);
174177

175178
for (size_t j = 0; ; j++) {
176179
ret = iterator_next(&record_it, &record);
177180
if (ret > 0) {
178-
check_int(j, ==, expected_blocks[i].record_count);
181+
cl_assert_equal_i(j,
182+
expected_blocks[i].record_count);
179183
break;
180184
}
181-
check(!ret);
185+
cl_assert(!ret);
182186
}
183187

184188
reftable_iterator_destroy(&record_it);
185189
reftable_record_release(&record);
186190
}
187191

188192
ret = reftable_table_iterator_next(&it, &block);
189-
check_int(ret, ==, 1);
193+
cl_assert_equal_i(ret, 1);
190194

191195
for (size_t i = 0; i < nrecords; i++)
192196
reftable_free(records[i].refname);
193197
reftable_table_iterator_release(&it);
194198
reftable_table_decref(table);
195199
reftable_buf_release(&buf);
196200
reftable_free(records);
197-
return 0;
198-
}
199-
200-
int cmd_main(int argc UNUSED, const char *argv[] UNUSED)
201-
{
202-
TEST(t_table_seek_once(), "table can seek once");
203-
TEST(t_table_reseek(), "table can reseek multiple times");
204-
TEST(t_table_block_iterator(), "table can iterate through blocks");
205-
return test_done();
206201
}

0 commit comments

Comments
 (0)