t-reftable-record: add reftable_record_cmp() tests for log records

In the current testing setup for log records, only
reftable_log_record_equal() among log record's comparison functions
is tested.

Modify the existing tests to exercise reftable_log_record_cmp_void()
(using the wrapper function reftable_record_cmp()) alongside
reftable_log_record_equal().
Note that to achieve this, we'll need to replace instances of
reftable_log_record_equal() with the wrapper function
reftable_record_equal().

Rename the now modified test to reflect its nature of exercising
all comparison operations, not just equality.

Mentored-by: Patrick Steinhardt <ps@pks.im>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com>
Acked-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/unit-tests/t-reftable-record.c b/t/unit-tests/t-reftable-record.c
index e799464c365bfe6259296f1feb56b2e41efb3f2a..dd64e71f3b6d0e64fd0998d525bb4375d14d5d28 100644 (file)
--- a/t/unit-tests/t-reftable-record.c
+++ b/t/unit-tests/t-reftable-record.c
@@ -120,24 +120,36 @@ static void t_reftable_ref_record_roundtrip(void)
        strbuf_release(&scratch);
 }
 
-static void t_reftable_log_record_equal(void)
+static void t_reftable_log_record_comparison(void)
 {
-       struct reftable_log_record in[2] = {
+       struct reftable_record in[3] = {
                {
-                       .refname = xstrdup("refs/heads/master"),
-                       .update_index = 42,
+                       .type = BLOCK_TYPE_LOG,
+                       .u.log.refname = (char *) "refs/heads/master",
+                       .u.log.update_index = 42,
                },
                {
-                       .refname = xstrdup("refs/heads/master"),
-                       .update_index = 22,
-               }
+                       .type = BLOCK_TYPE_LOG,
+                       .u.log.refname = (char *) "refs/heads/master",
+                       .u.log.update_index = 22,
+               },
+               {
+                       .type = BLOCK_TYPE_LOG,
+                       .u.log.refname = (char *) "refs/heads/main",
+                       .u.log.update_index = 22,
+               },
        };
 
-       check(!reftable_log_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ));
-       in[1].update_index = in[0].update_index;
-       check(reftable_log_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ));
-       reftable_log_record_release(&in[0]);
-       reftable_log_record_release(&in[1]);
+       check(!reftable_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ));
+       check(!reftable_record_equal(&in[1], &in[2], GIT_SHA1_RAWSZ));
+       check_int(reftable_record_cmp(&in[1], &in[2]), >, 0);
+       /* comparison should be reversed for equal keys, because
+        * comparison is now performed on the basis of update indices */
+       check_int(reftable_record_cmp(&in[0], &in[1]), <, 0);
+
+       in[1].u.log.update_index = in[0].u.log.update_index;
+       check(reftable_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ));
+       check(!reftable_record_cmp(&in[0], &in[1]));
 }
 
 static void t_reftable_log_record_roundtrip(void)
@@ -359,7 +371,7 @@ static void t_reftable_index_record_roundtrip(void)
 
 int cmd_main(int argc, const char *argv[])
 {
-       TEST(t_reftable_log_record_equal(), "reftable_log_record_equal works");
+       TEST(t_reftable_log_record_comparison(), "comparison operations work on log record");
        TEST(t_reftable_log_record_roundtrip(), "record operations work on log record");
        TEST(t_reftable_ref_record_roundtrip(), "record operations work on ref record");
        TEST(t_varint_roundtrip(), "put_var_int and get_var_int work");