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.
While at it, ensure structs are 0-initialized with '= { 0 }'
instead of '= { NULL }' and array indices have type 'size_t'
instead of 'int'.
Mentored-by: Patrick Steinhardt <ps@xxxxxx>
Mentored-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
Signed-off-by: Chandra Pratap <chandrapratap3519@xxxxxxxxx>
---
Makefile | 2 +-
reftable/reftable-tests.h | 1 -
t/helper/test-reftable.c | 1 -
.../unit-tests/t-reftable-block.c | 63 +++++++++----------
4 files changed, 30 insertions(+), 37 deletions(-)
rename reftable/block_test.c => t/unit-tests/t-reftable-block.c (67%)
diff --git a/Makefile b/Makefile
index 3863e60b66..f030283447 100644
--- a/Makefile
+++ b/Makefile
@@ -1340,6 +1340,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-record
UNIT_TEST_PROGRAMS += t-strbuf
@@ -2679,7 +2680,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/pq_test.o
REFTABLE_TEST_OBJS += reftable/readwrite_test.o
diff --git a/reftable/reftable-tests.h b/reftable/reftable-tests.h
index d5e03dcc1b..e25ca86ede 100644
--- a/reftable/reftable-tests.h
+++ b/reftable/reftable-tests.h
@@ -10,7 +10,6 @@ license that can be found in the LICENSE file or at
#define REFTABLE_TESTS_H
int basics_test_main(int argc, const char **argv);
-int block_test_main(int argc, const char **argv);
int pq_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);
diff --git a/t/helper/test-reftable.c b/t/helper/test-reftable.c
index 9d378427da..4eda545fad 100644
--- a/t/helper/test-reftable.c
+++ b/t/helper/test-reftable.c
@@ -5,7 +5,6 @@
int cmd__reftable(int argc, const char **argv)
{
/* test from simple to complex. */
- block_test_main(argc, argv);
tree_test_main(argc, argv);
pq_test_main(argc, argv);
readwrite_test_main(argc, argv);
diff --git a/reftable/block_test.c b/t/unit-tests/t-reftable-block.c
similarity index 67%
rename from reftable/block_test.c
rename to t/unit-tests/t-reftable-block.c
index 90aecd5a7c..8ab3ff9ebe 100644
--- a/reftable/block_test.c
+++ b/t/unit-tests/t-reftable-block.c
@@ -6,34 +6,30 @@ 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];
- const int N = ARRAY_SIZE(names);
- const int block_size = 1024;
- struct reftable_block block = { NULL };
+ const size_t N = ARRAY_SIZE(names);
+ const size_t block_size = 1024;
+ struct reftable_block block = { 0 };
struct block_writer bw = {
.last_key = STRBUF_INIT,
};
struct reftable_record rec = {
.type = BLOCK_TYPE_REF,
};
- int i = 0;
+ size_t i = 0;
int n;
struct block_reader br = { 0 };
struct block_iter it = BLOCK_ITER_INIT;
- int j = 0;
+ size_t j = 0;
struct strbuf want = STRBUF_INIT;
REFTABLE_CALLOC_ARRAY(block.data, block_size);
@@ -45,11 +41,11 @@ 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];
- snprintf(name, sizeof(name), "branch%02d", i);
+ snprintf(name, sizeof(name), "branch%02"PRIuMAX , (uintmax_t)i);
rec.u.ref.refname = name;
rec.u.ref.value_type = REFTABLE_REF_VAL1;
@@ -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,10 @@ static void test_block_read_write(void)
while (1) {
int r = block_iter_next(&it, &rec);
- EXPECT(r >= 0);
- if (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 +85,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);
}
@@ -111,13 +106,13 @@ static void test_block_read_write(void)
reftable_record_release(&rec);
reftable_block_done(&br.block);
strbuf_release(&want);
- for (i = 0; i < N; i++) {
+ for (i = 0; i < N; i++)
reftable_free(names[i]);
- }
}
-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();
}
--
2.45.GIT
