mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t: move reftable/block_test.c to the unit testing framework

Browse Source 
reftable/block_test.c exercises the functions defined in
reftable/block.{c, h}. Migrate reftable/block_test.c to the unit
testing framework. Migration involves refactoring the tests
to use the unit testing framework instead of reftable's test
framework and renaming the tests to follow the unit-tests'
naming conventions.

Mentored-by: Patrick Steinhardt <ps@pks.im>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Chandra Pratap
2024-08-21 18:00:51 +05:30
committed by Junio C Hamano
parent 80ccd8a260
commit 546cc0d64e
4 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1341,6 +1341,7 @@ UNIT_TEST_PROGRAMS += t-oidmap
UNIT_TEST_PROGRAMS += t-oidtree
UNIT_TEST_PROGRAMS += t-prio-queue
UNIT_TEST_PROGRAMS += t-reftable-basics
UNIT_TEST_PROGRAMS += t-reftable-block
UNIT_TEST_PROGRAMS += t-reftable-merged
UNIT_TEST_PROGRAMS += t-reftable-pq
UNIT_TEST_PROGRAMS += t-reftable-record
@ -2682,7 +2683,6 @@ REFTABLE_OBJS += reftable/stack.o
REFTABLE_OBJS += reftable/tree.o
REFTABLE_OBJS += reftable/writer.o
REFTABLE_TEST_OBJS += reftable/block_test.o
REFTABLE_TEST_OBJS += reftable/dump.o
REFTABLE_TEST_OBJS += reftable/readwrite_test.o
REFTABLE_TEST_OBJS += reftable/stack_test.o

1
reftable/reftable-tests.h
View File

@ -10,7 +10,6 @@ https://developers.google.com/open-source/licenses/bsd
#define REFTABLE_TESTS_H
int basics_test_main(int argc, const char **argv);
int block_test_main(int argc, const char **argv);
int record_test_main(int argc, const char **argv);
int readwrite_test_main(int argc, const char **argv);
int stack_test_main(int argc, const char **argv);

1
t/helper/test-reftable.c
View File

@ -5,7 +5,6 @@
int cmd__reftable(int argc, const char **argv)
{
/* test from simple to complex. */
block_test_main(argc, argv);
readwrite_test_main(argc, argv);
stack_test_main(argc, argv);
return 0;

45
reftable/block_test.c → t/unit-tests/t-reftable-block.c
View File

@ -6,17 +6,13 @@ license that can be found in the LICENSE file or at
https://developers.google.com/open-source/licenses/bsd
*/
#include "block.h"
#include "test-lib.h"
#include "reftable/block.h"
#include "reftable/blocksource.h"
#include "reftable/constants.h"
#include "reftable/reftable-error.h"
#include "system.h"
#include "blocksource.h"
#include "basics.h"
#include "constants.h"
#include "record.h"
#include "test_framework.h"
#include "reftable-tests.h"
static void test_block_read_write(void)
static void t_block_read_write(void)
{
const int header_off = 21; /* random */
char *names[30];
@ -45,7 +41,7 @@ static void test_block_read_write(void)
rec.u.ref.refname = (char *) "";
rec.u.ref.value_type = REFTABLE_REF_DELETION;
n = block_writer_add(&bw, &rec);
EXPECT(n == REFTABLE_API_ERROR);
check_int(n, ==, REFTABLE_API_ERROR);
for (i = 0; i < N; i++) {
char name[100];
@ -59,11 +55,11 @@ static void test_block_read_write(void)
n = block_writer_add(&bw, &rec);
rec.u.ref.refname = NULL;
rec.u.ref.value_type = REFTABLE_REF_DELETION;
EXPECT(n == 0);
check_int(n, ==, 0);
}
n = block_writer_finish(&bw);
EXPECT(n > 0);
check_int(n, >, 0);
block_writer_release(&bw);
@ -73,11 +69,11 @@ static void test_block_read_write(void)
while (1) {
int r = block_iter_next(&it, &rec);
EXPECT(r >= 0);
check_int(r, >=, 0);
if (r > 0) {
break;
}
EXPECT_STREQ(names[j], rec.u.ref.refname);
check_str(names[j], rec.u.ref.refname);
j++;
}
@ -90,20 +86,20 @@ static void test_block_read_write(void)
strbuf_addstr(&want, names[i]);
n = block_iter_seek_key(&it, &br, &want);
EXPECT(n == 0);
check_int(n, ==, 0);
n = block_iter_next(&it, &rec);
EXPECT(n == 0);
check_int(n, ==, 0);
EXPECT_STREQ(names[i], rec.u.ref.refname);
check_str(names[i], rec.u.ref.refname);
want.len--;
n = block_iter_seek_key(&it, &br, &want);
EXPECT(n == 0);
check_int(n, ==, 0);
n = block_iter_next(&it, &rec);
EXPECT(n == 0);
EXPECT_STREQ(names[10 * (i / 10)], rec.u.ref.refname);
check_int(n, ==, 0);
check_str(names[10 * (i / 10)], rec.u.ref.refname);
block_iter_close(&it);
}
@ -116,8 +112,9 @@ static void test_block_read_write(void)
}
}
int block_test_main(int argc, const char *argv[])
int cmd_main(int argc, const char *argv[])
{
RUN_TEST(test_block_read_write);
return 0;
TEST(t_block_read_write(), "read-write operations on blocks work");
return test_done();
}