t-reftable-block: add tests for obj blocks

In the current testing setup, block operations are left unexercised
for obj blocks. Add a test that exercises these operations for obj
blocks.

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>

diff --git a/t/unit-tests/t-reftable-block.c b/t/unit-tests/t-reftable-block.c
index 4c4fb39ab44c4b95e28bc9a4bc1b1c55860724cb..beb2d6f81b4949beb427087b3cd3a83da3a99986 100644 (file)
--- a/t/unit-tests/t-reftable-block.c
+++ b/t/unit-tests/t-reftable-block.c
@@ -191,9 +191,91 @@ static void t_log_block_read_write(void)
                reftable_record_release(&recs[i]);
 }
 
+static void t_obj_block_read_write(void)
+{
+       const int header_off = 21;
+       struct reftable_record recs[30];
+       const size_t N = ARRAY_SIZE(recs);
+       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_OBJ,
+       };
+       size_t i = 0;
+       int ret;
+       struct block_reader br = { 0 };
+       struct block_iter it = BLOCK_ITER_INIT;
+       struct strbuf want = STRBUF_INIT, buf = STRBUF_INIT;
+
+       REFTABLE_CALLOC_ARRAY(block.data, block_size);
+       block.len = block_size;
+       block_source_from_strbuf(&block.source, &buf);
+       block_writer_init(&bw, BLOCK_TYPE_OBJ, block.data, block_size,
+                         header_off, hash_size(GIT_SHA1_FORMAT_ID));
+
+       for (i = 0; i < N; i++) {
+               uint8_t bytes[] = { i, i + 1, i + 2, i + 3, i + 5 }, *allocated;
+               DUP_ARRAY(allocated, bytes, ARRAY_SIZE(bytes));
+
+               rec.u.obj.hash_prefix = allocated;
+               rec.u.obj.hash_prefix_len = 5;
+
+               recs[i] = rec;
+               ret = block_writer_add(&bw, &rec);
+               rec.u.obj.hash_prefix = NULL;
+               rec.u.obj.hash_prefix_len = 0;
+               check_int(ret, ==, 0);
+       }
+
+       ret = block_writer_finish(&bw);
+       check_int(ret, >, 0);
+
+       block_writer_release(&bw);
+
+       block_reader_init(&br, &block, header_off, block_size, GIT_SHA1_RAWSZ);
+
+       block_iter_seek_start(&it, &br);
+
+       for (i = 0; ; i++) {
+               ret = block_iter_next(&it, &rec);
+               check_int(ret, >=, 0);
+               if (ret > 0) {
+                       check_int(i, ==, N);
+                       break;
+               }
+               check(reftable_record_equal(&recs[i], &rec, GIT_SHA1_RAWSZ));
+       }
+
+       for (i = 0; i < N; i++) {
+               block_iter_reset(&it);
+               reftable_record_key(&recs[i], &want);
+
+               ret = block_iter_seek_key(&it, &br, &want);
+               check_int(ret, ==, 0);
+
+               ret = block_iter_next(&it, &rec);
+               check_int(ret, ==, 0);
+
+               check(reftable_record_equal(&recs[i], &rec, GIT_SHA1_RAWSZ));
+       }
+
+       block_reader_release(&br);
+       block_iter_close(&it);
+       reftable_record_release(&rec);
+       reftable_block_done(&br.block);
+       strbuf_release(&want);
+       strbuf_release(&buf);
+       for (i = 0; i < N; i++)
+               reftable_record_release(&recs[i]);
+}
+
 int cmd_main(int argc, const char *argv[])
 {
        TEST(t_log_block_read_write(), "read-write operations on log blocks work");
+       TEST(t_obj_block_read_write(), "read-write operations on obj blocks work");
        TEST(t_ref_block_read_write(), "read-write operations on ref blocks work");
 
        return test_done();