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

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

Browse Source 
reftable/merged_test.c exercises the functions defined in
reftable/merged.{c, h}. Migrate reftable/merged_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 according to unit-tests' naming
conventions.

Also, move strbuf_add_void() and noop_flush() from
reftable/test_framework.c to the ported test. This is because
both these functions are used in the merged tests and
reftable/test_framework.{c, h} is not #included in the ported test.

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-07-12 11:08:57 +05:30
committed by Junio C Hamano
parent 06e570c0df
commit 9cdfd1d7df
4 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1340,6 +1340,7 @@ UNIT_TEST_PROGRAMS += t-mem-pool
UNIT_TEST_PROGRAMS += t-oidtree UNIT_TEST_PROGRAMS += t-oidtree
UNIT_TEST_PROGRAMS += t-prio-queue UNIT_TEST_PROGRAMS += t-prio-queue
UNIT_TEST_PROGRAMS += t-reftable-basics UNIT_TEST_PROGRAMS += t-reftable-basics
UNIT_TEST_PROGRAMS += t-reftable-merged
UNIT_TEST_PROGRAMS += t-strbuf UNIT_TEST_PROGRAMS += t-strbuf
UNIT_TEST_PROGRAMS += t-strcmp-offset UNIT_TEST_PROGRAMS += t-strcmp-offset
UNIT_TEST_PROGRAMS += t-strvec UNIT_TEST_PROGRAMS += t-strvec
@ -2679,7 +2680,6 @@ REFTABLE_OBJS += reftable/writer.o
REFTABLE_TEST_OBJS += reftable/block_test.o REFTABLE_TEST_OBJS += reftable/block_test.o
REFTABLE_TEST_OBJS += reftable/dump.o REFTABLE_TEST_OBJS += reftable/dump.o
REFTABLE_TEST_OBJS += reftable/merged_test.o
REFTABLE_TEST_OBJS += reftable/pq_test.o REFTABLE_TEST_OBJS += reftable/pq_test.o
REFTABLE_TEST_OBJS += reftable/record_test.o REFTABLE_TEST_OBJS += reftable/record_test.o
REFTABLE_TEST_OBJS += reftable/readwrite_test.o REFTABLE_TEST_OBJS += reftable/readwrite_test.o

1
reftable/reftable-tests.h
View File

@ -11,7 +11,6 @@ https://developers.google.com/open-source/licenses/bsd
int basics_test_main(int argc, const char **argv); int basics_test_main(int argc, const char **argv);
int block_test_main(int argc, const char **argv); int block_test_main(int argc, const char **argv);
int merged_test_main(int argc, const char **argv);
int pq_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 record_test_main(int argc, const char **argv);
int readwrite_test_main(int argc, const char **argv); int readwrite_test_main(int argc, const char **argv);

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

@ -10,7 +10,6 @@ int cmd__reftable(int argc, const char **argv)
tree_test_main(argc, argv); tree_test_main(argc, argv);
pq_test_main(argc, argv); pq_test_main(argc, argv);
readwrite_test_main(argc, argv); readwrite_test_main(argc, argv);
merged_test_main(argc, argv);
stack_test_main(argc, argv); stack_test_main(argc, argv);
return 0; return 0;
} }

111
reftable/merged_test.c → t/unit-tests/t-reftable-merged.c
View File

@ -6,20 +6,25 @@ license that can be found in the LICENSE file or at
https://developers.google.com/open-source/licenses/bsd https://developers.google.com/open-source/licenses/bsd
*/ */
#include "merged.h" #include "test-lib.h"
#include "reftable/blocksource.h"
#include "reftable/constants.h"
#include "reftable/merged.h"
#include "reftable/reader.h"
#include "reftable/reftable-generic.h"
#include "reftable/reftable-merged.h"
#include "reftable/reftable-writer.h"
#include "system.h" static ssize_t strbuf_add_void(void *b, const void *data, size_t sz)
{
strbuf_add(b, data, sz);
return sz;
}
#include "basics.h" static int noop_flush(void *arg)
#include "blocksource.h" {
#include "constants.h" return 0;
#include "reader.h" }
#include "record.h"
#include "test_framework.h"
#include "reftable-merged.h"
#include "reftable-tests.h"
#include "reftable-generic.h"
#include "reftable-writer.h"
static void write_test_table(struct strbuf *buf, static void write_test_table(struct strbuf *buf,
struct reftable_ref_record refs[], int n) struct reftable_ref_record refs[], int n)
@ -49,12 +54,12 @@ static void write_test_table(struct strbuf *buf,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
uint64_t before = refs[i].update_index; uint64_t before = refs[i].update_index;
int n = reftable_writer_add_ref(w, &refs[i]); int n = reftable_writer_add_ref(w, &refs[i]);
EXPECT(n == 0); check_int(n, ==, 0);
EXPECT(before == refs[i].update_index); check_int(before, ==, refs[i].update_index);
} }
err = reftable_writer_close(w); err = reftable_writer_close(w);
EXPECT_ERR(err); check(!err);
reftable_writer_free(w); reftable_writer_free(w);
} }
@ -76,11 +81,11 @@ static void write_test_log_table(struct strbuf *buf,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
int err = reftable_writer_add_log(w, &logs[i]); int err = reftable_writer_add_log(w, &logs[i]);
EXPECT_ERR(err); check(!err);
} }
err = reftable_writer_close(w); err = reftable_writer_close(w);
EXPECT_ERR(err); check(!err);
reftable_writer_free(w); reftable_writer_free(w);
} }
@ -105,12 +110,12 @@ merged_table_from_records(struct reftable_ref_record **refs,
err = reftable_new_reader(&(*readers)[i], &(*source)[i], err = reftable_new_reader(&(*readers)[i], &(*source)[i],
"name"); "name");
EXPECT_ERR(err); check(!err);
reftable_table_from_reader(&tabs[i], (*readers)[i]); reftable_table_from_reader(&tabs[i], (*readers)[i]);
} }
err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID); err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
EXPECT_ERR(err); check(!err);
return mt; return mt;
} }
@ -122,7 +127,7 @@ static void readers_destroy(struct reftable_reader **readers, size_t n)
reftable_free(readers); reftable_free(readers);
} }
static void test_merged_between(void) static void t_merged_single_record(void)
{ {
struct reftable_ref_record r1[] = { { struct reftable_ref_record r1[] = { {
.refname = (char *) "b", .refname = (char *) "b",
@ -150,11 +155,11 @@ static void test_merged_between(void)
merged_table_init_iter(mt, &it, BLOCK_TYPE_REF); merged_table_init_iter(mt, &it, BLOCK_TYPE_REF);
err = reftable_iterator_seek_ref(&it, "a"); err = reftable_iterator_seek_ref(&it, "a");
EXPECT_ERR(err); check(!err);
err = reftable_iterator_next_ref(&it, &ref); err = reftable_iterator_next_ref(&it, &ref);
EXPECT_ERR(err); check(!err);
EXPECT(ref.update_index == 2); check_int(ref.update_index, ==, 2);
reftable_ref_record_release(&ref); reftable_ref_record_release(&ref);
reftable_iterator_destroy(&it); reftable_iterator_destroy(&it);
readers_destroy(readers, 2); readers_destroy(readers, 2);
@ -165,7 +170,7 @@ static void test_merged_between(void)
reftable_free(bs); reftable_free(bs);
} }
static void test_merged(void) static void t_merged_refs(void)
{ {
struct reftable_ref_record r1[] = { struct reftable_ref_record r1[] = {
{ {
@ -230,9 +235,9 @@ static void test_merged(void)
merged_table_init_iter(mt, &it, BLOCK_TYPE_REF); merged_table_init_iter(mt, &it, BLOCK_TYPE_REF);
err = reftable_iterator_seek_ref(&it, "a"); err = reftable_iterator_seek_ref(&it, "a");
EXPECT_ERR(err); check(!err);
EXPECT(reftable_merged_table_hash_id(mt) == GIT_SHA1_FORMAT_ID); check_int(reftable_merged_table_hash_id(mt), ==, GIT_SHA1_FORMAT_ID);
EXPECT(reftable_merged_table_min_update_index(mt) == 1); check_int(reftable_merged_table_min_update_index(mt), ==, 1);
while (len < 100) { /* cap loops/recursion. */ while (len < 100) { /* cap loops/recursion. */
struct reftable_ref_record ref = { NULL }; struct reftable_ref_record ref = { NULL };
@ -245,9 +250,9 @@ static void test_merged(void)
} }
reftable_iterator_destroy(&it); reftable_iterator_destroy(&it);
EXPECT(ARRAY_SIZE(want) == len); check_int(ARRAY_SIZE(want), ==, len);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
EXPECT(reftable_ref_record_equal(want[i], &out[i], check(reftable_ref_record_equal(want[i], &out[i],
GIT_SHA1_RAWSZ)); GIT_SHA1_RAWSZ));
} }
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
@ -283,16 +288,16 @@ merged_table_from_log_records(struct reftable_log_record **logs,
err = reftable_new_reader(&(*readers)[i], &(*source)[i], err = reftable_new_reader(&(*readers)[i], &(*source)[i],
"name"); "name");
EXPECT_ERR(err); check(!err);
reftable_table_from_reader(&tabs[i], (*readers)[i]); reftable_table_from_reader(&tabs[i], (*readers)[i]);
} }
err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID); err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
EXPECT_ERR(err); check(!err);
return mt; return mt;
} }
static void test_merged_logs(void) static void t_merged_logs(void)
{ {
struct reftable_log_record r1[] = { struct reftable_log_record r1[] = {
{ {
@ -362,9 +367,9 @@ static void test_merged_logs(void)
merged_table_init_iter(mt, &it, BLOCK_TYPE_LOG); merged_table_init_iter(mt, &it, BLOCK_TYPE_LOG);
err = reftable_iterator_seek_log(&it, "a"); err = reftable_iterator_seek_log(&it, "a");
EXPECT_ERR(err); check(!err);
EXPECT(reftable_merged_table_hash_id(mt) == GIT_SHA1_FORMAT_ID); check_int(reftable_merged_table_hash_id(mt), ==, GIT_SHA1_FORMAT_ID);
EXPECT(reftable_merged_table_min_update_index(mt) == 1); check_int(reftable_merged_table_min_update_index(mt), ==, 1);
while (len < 100) { /* cap loops/recursion. */ while (len < 100) { /* cap loops/recursion. */
struct reftable_log_record log = { NULL }; struct reftable_log_record log = { NULL };
@ -377,19 +382,19 @@ static void test_merged_logs(void)
} }
reftable_iterator_destroy(&it); reftable_iterator_destroy(&it);
EXPECT(ARRAY_SIZE(want) == len); check_int(ARRAY_SIZE(want), ==, len);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
EXPECT(reftable_log_record_equal(want[i], &out[i], check(reftable_log_record_equal(want[i], &out[i],
GIT_SHA1_RAWSZ)); GIT_SHA1_RAWSZ));
} }
merged_table_init_iter(mt, &it, BLOCK_TYPE_LOG); merged_table_init_iter(mt, &it, BLOCK_TYPE_LOG);
err = reftable_iterator_seek_log_at(&it, "a", 2); err = reftable_iterator_seek_log_at(&it, "a", 2);
EXPECT_ERR(err); check(!err);
reftable_log_record_release(&out[0]); reftable_log_record_release(&out[0]);
err = reftable_iterator_next_log(&it, &out[0]); err = reftable_iterator_next_log(&it, &out[0]);
EXPECT_ERR(err); check(!err);
EXPECT(reftable_log_record_equal(&out[0], &r3[0], GIT_SHA1_RAWSZ)); check(reftable_log_record_equal(&out[0], &r3[0], GIT_SHA1_RAWSZ));
reftable_iterator_destroy(&it); reftable_iterator_destroy(&it);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
@ -405,7 +410,7 @@ static void test_merged_logs(void)
reftable_free(bs); reftable_free(bs);
} }
static void test_default_write_opts(void) static void t_default_write_opts(void)
{ {
struct reftable_write_options opts = { 0 }; struct reftable_write_options opts = { 0 };
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
@ -426,36 +431,36 @@ static void test_default_write_opts(void)
reftable_writer_set_limits(w, 1, 1); reftable_writer_set_limits(w, 1, 1);
err = reftable_writer_add_ref(w, &rec); err = reftable_writer_add_ref(w, &rec);
EXPECT_ERR(err); check(!err);
err = reftable_writer_close(w); err = reftable_writer_close(w);
EXPECT_ERR(err); check(!err);
reftable_writer_free(w); reftable_writer_free(w);
block_source_from_strbuf(&source, &buf); block_source_from_strbuf(&source, &buf);
err = reftable_new_reader(&rd, &source, "filename"); err = reftable_new_reader(&rd, &source, "filename");
EXPECT_ERR(err); check(!err);
hash_id = reftable_reader_hash_id(rd); hash_id = reftable_reader_hash_id(rd);
EXPECT(hash_id == GIT_SHA1_FORMAT_ID); check_int(hash_id, ==, GIT_SHA1_FORMAT_ID);
reftable_table_from_reader(&tab[0], rd); reftable_table_from_reader(&tab[0], rd);
err = reftable_new_merged_table(&merged, tab, 1, GIT_SHA1_FORMAT_ID); err = reftable_new_merged_table(&merged, tab, 1, GIT_SHA1_FORMAT_ID);
EXPECT_ERR(err); check(!err);
reftable_reader_free(rd); reftable_reader_free(rd);
reftable_merged_table_free(merged); reftable_merged_table_free(merged);
strbuf_release(&buf); strbuf_release(&buf);
} }
/* XXX test refs_for(oid) */
int merged_test_main(int argc, const char *argv[]) int cmd_main(int argc, const char *argv[])
{ {
RUN_TEST(test_merged_logs); TEST(t_default_write_opts(), "merged table with default write opts");
RUN_TEST(test_merged_between); TEST(t_merged_logs(), "merged table with multiple log updates for same ref");
RUN_TEST(test_merged); TEST(t_merged_refs(), "merged table with multiple updates to same ref");
RUN_TEST(test_default_write_opts); TEST(t_merged_single_record(), "ref ocurring in only one record can be fetched");
return 0;
return test_done();
} }