t/unit-tests: implement clar specific reftable test helper functions

Helper functions defined in `t/unit-tests/lib-reftable.{c,h}` are
required for the reftable-related test files to run. In the current
implementation these functions are designed to conform with our
homegrown unit-testing structure. So in other to convert the reftable
test files, there is need for a clar specific implementation of these
helper functions.

Implement equivalent helper functions in `lib-reftable-clar.{c,h}` to
use clar. These functions conform with the clar testing framework and
become available for all reftable-related test files implemented using
the clar testing framework, which requires them. This will be used by
subsequent commits.

Signed-off-by: Seyi Kuforiji <kuforiji98@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index 70d1543b6b8688bf348f03f5e9cc1690fe547249..e4fa038508b1d396b207a4cfa9c31c2664575fca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1375,6 +1375,7 @@ CLAR_TEST_OBJS = $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(CLAR_TEST_SUITES))
 CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/clar/clar.o
 CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o
 CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/lib-oid.o
+CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/lib-reftable-clar.o
 
 UNIT_TEST_PROGRAMS += t-reftable-basics
 UNIT_TEST_PROGRAMS += t-reftable-block

diff --git a/t/meson.build b/t/meson.build
index d052fc3e23d2ec78199d987d21394148ff0f890b..f77f21536e77320a7c3745f428919b831cc6c6d3 100644 (file)
--- a/t/meson.build
+++ b/t/meson.build
@@ -19,7 +19,8 @@ clar_test_suites = [
 clar_sources = [
   'unit-tests/clar/clar.c',
   'unit-tests/unit-test.c',
-  'unit-tests/lib-oid.c'
+  'unit-tests/lib-oid.c',
+  'unit-tests/lib-reftable-clar.c'
 ]
 
 clar_decls_h = custom_target(

diff --git a/t/unit-tests/lib-reftable-clar.c b/t/unit-tests/lib-reftable-clar.c
new file mode 100644 (file)
index 0000000..64e40a1
--- /dev/null
+++ b/t/unit-tests/lib-reftable-clar.c
@@ -0,0 +1,101 @@
+#include "unit-test.h"
+#include "lib-reftable-clar.h"
+#include "hex.h"
+#include "parse-options.h"
+#include "reftable/constants.h"
+#include "reftable/writer.h"
+#include "strbuf.h"
+#include "string-list.h"
+#include "strvec.h"
+
+void cl_reftable_set_hash(uint8_t *p, int i, enum reftable_hash id)
+{
+       memset(p, (uint8_t)i, hash_size(id));
+}
+
+static ssize_t strbuf_writer_write(void *b, const void *data, size_t sz)
+{
+       strbuf_add(b, data, sz);
+       return sz;
+}
+
+static int strbuf_writer_flush(void *arg UNUSED)
+{
+       return 0;
+}
+
+struct reftable_writer *cl_reftable_strbuf_writer(struct reftable_buf *buf,
+                                                struct reftable_write_options *opts)
+{
+       struct reftable_writer *writer;
+       int ret = reftable_writer_new(&writer, &strbuf_writer_write, &strbuf_writer_flush,
+                                     buf, opts);
+       cl_assert(!ret);
+       return writer;
+}
+
+void cl_reftable_write_to_buf(struct reftable_buf *buf,
+                            struct reftable_ref_record *refs,
+                            size_t nrefs,
+                            struct reftable_log_record *logs,
+                            size_t nlogs,
+                            struct reftable_write_options *_opts)
+{
+       struct reftable_write_options opts = { 0 };
+       const struct reftable_stats *stats;
+       struct reftable_writer *writer;
+       uint64_t min = 0xffffffff;
+       uint64_t max = 0;
+       int ret;
+
+       if (_opts)
+               opts = *_opts;
+
+       for (size_t i = 0; i < nrefs; i++) {
+               uint64_t ui = refs[i].update_index;
+               if (ui > max)
+                       max = ui;
+               if (ui < min)
+                       min = ui;
+       }
+       for (size_t i = 0; i < nlogs; i++) {
+               uint64_t ui = logs[i].update_index;
+               if (ui > max)
+                       max = ui;
+               if (ui < min)
+                       min = ui;
+       }
+
+       writer = cl_reftable_strbuf_writer(buf, &opts);
+       ret = reftable_writer_set_limits(writer, min, max);
+       cl_assert_equal_i(ret, 0);
+
+       if (nrefs) {
+               ret = reftable_writer_add_refs(writer, refs, nrefs);
+               cl_assert_equal_i(ret, 0);
+       }
+
+       if (nlogs) {
+               ret = reftable_writer_add_logs(writer, logs, nlogs);
+               cl_assert_equal_i(ret, 0);
+       }
+
+       ret = reftable_writer_close(writer);
+       cl_assert_equal_i(ret, 0);
+
+       stats = reftable_writer_stats(writer);
+       for (size_t i = 0; i < (size_t)stats->ref_stats.blocks; i++) {
+               size_t off = i * (opts.block_size ? opts.block_size
+                                                 : DEFAULT_BLOCK_SIZE);
+               if (!off)
+                       off = header_size(opts.hash_id == REFTABLE_HASH_SHA256 ? 2 : 1);
+               cl_assert(buf->buf[off] == 'r');
+       }
+
+       if (nrefs)
+               cl_assert(stats->ref_stats.blocks > 0);
+       if (nlogs)
+               cl_assert(stats->log_stats.blocks > 0);
+
+       reftable_writer_free(writer);
+}

diff --git a/t/unit-tests/lib-reftable-clar.h b/t/unit-tests/lib-reftable-clar.h
new file mode 100644 (file)
index 0000000..b562648
--- /dev/null
+++ b/t/unit-tests/lib-reftable-clar.h
@@ -0,0 +1,20 @@
+#include "git-compat-util.h"
+#include "clar/clar.h"
+#include "clar-decls.h"
+#include "git-compat-util.h"
+#include "reftable/reftable-writer.h"
+#include "strbuf.h"
+
+struct reftable_buf;
+
+void cl_reftable_set_hash(uint8_t *p, int i, enum reftable_hash id);
+
+struct reftable_writer *cl_reftable_strbuf_writer(struct reftable_buf *buf,
+                                                 struct reftable_write_options *opts);
+
+void cl_reftable_write_to_buf(struct reftable_buf *buf,
+                            struct reftable_ref_record *refs,
+                            size_t nrecords,
+                            struct reftable_log_record *logs,
+                            size_t nlogs,
+                            struct reftable_write_options *opts);