Chandra Pratap <chandrapratap3519@xxxxxxxxx> writes:
> 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@xxxxxx>
> Mentored-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
> Signed-off-by: Chandra Pratap <chandrapratap3519@xxxxxxxxx>
> ---
> t/unit-tests/t-reftable-record.c | 40 +++++++++++++++++++++-----------
> 1 file changed, 27 insertions(+), 13 deletions(-)
>
> diff --git a/t/unit-tests/t-reftable-record.c b/t/unit-tests/t-reftable-record.c
> index 1b357e6c7f..0cf223e51b 100644
> --- a/t/unit-tests/t-reftable-record.c
> +++ b/t/unit-tests/t-reftable-record.c
> @@ -123,24 +123,38 @@ static void test_reftable_ref_record_roundtrip(void)
> strbuf_release(&scratch);
> }
>
> -static void test_reftable_log_record_equal(void)
> +static void test_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 = xstrdup("refs/heads/master"),
> + .u.log.update_index = 42,
> },
> {
> - .refname = xstrdup("refs/heads/master"),
> - .update_index = 22,
> - }
> + .type = BLOCK_TYPE_LOG,
> + .u.log.refname = xstrdup("refs/heads/master"),
> + .u.log.update_index = 22,
> + },
> + {
> + .type = BLOCK_TYPE_LOG,
> + .u.log.refname = xstrdup("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 */
Nit: This is because we then compare the update-index, would be nice to
add that detail too.
> + 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]));
> +
> + for (size_t i = 0; i < ARRAY_SIZE(in); i++)
> + reftable_record_release(&in[i]);
> }
>
> static void test_reftable_log_record_roundtrip(void)
> @@ -362,7 +376,7 @@ static void test_reftable_index_record_roundtrip(void)
>
> int cmd_main(int argc, const char *argv[])
> {
> - TEST(test_reftable_log_record_equal(), "reftable_log_record_equal works");
> + TEST(test_reftable_log_record_comparison(), "comparison operations work on log record");
> TEST(test_reftable_log_record_roundtrip(), "record operations work on log record");
> TEST(test_reftable_ref_record_roundtrip(), "record operations work on ref record");
> TEST(test_varint_roundtrip(), "put_var_int and get_var_int work");
> --
> 2.45.2.404.g9eaef5822c
Attachment:
signature.asc
Description: PGP signature
