From: Chandra Pratap <chandrapratap3519@gmail.com>
To: git@vger.kernel.org
Cc: Chandra Pratap <chandrapratap3519@gmail.com>,
Patrick Steinhardt <ps@pks.im>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH 03/10] t-reftable-block: use reftable_record_equal() instead of check_str()
Date: Wed, 14 Aug 2024 17:33:11 +0530 [thread overview]
Message-ID: <20240814121122.4642-4-chandrapratap3519@gmail.com> (raw)
In-Reply-To: <20240814121122.4642-1-chandrapratap3519@gmail.com>
In the current testing setup, operations like read and write for
reftable blocks as defined by reftable/block.{c, h} are verified by
comparing only the keys of input and output reftable records. This is
not ideal because there can exist inequal reftable records with the
same key. Use the dedicated function for record comparison,
reftable_record_equal() instead of key-based comparison.
Mentored-by: Patrick Steinhardt <ps@pks.im>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com>
---
t/unit-tests/t-reftable-block.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/t/unit-tests/t-reftable-block.c b/t/unit-tests/t-reftable-block.c
index 31d179a50a..baeb9c8b07 100644
--- a/t/unit-tests/t-reftable-block.c
+++ b/t/unit-tests/t-reftable-block.c
@@ -15,8 +15,8 @@ license that can be found in the LICENSE file or at
static void t_block_read_write(void)
{
const int header_off = 21; /* random */
- char *names[30];
- const size_t N = ARRAY_SIZE(names);
+ 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 = {
@@ -47,11 +47,11 @@ static void t_block_read_write(void)
char name[100];
snprintf(name, sizeof(name), "branch%02"PRIuMAX , (uintmax_t)i);
- rec.u.ref.refname = name;
+ rec.u.ref.refname = xstrdup(name);
rec.u.ref.value_type = REFTABLE_REF_VAL1;
memset(rec.u.ref.value.val1, i, GIT_SHA1_RAWSZ);
- names[i] = xstrdup(name);
+ recs[i] = rec;
n = block_writer_add(&bw, &rec);
rec.u.ref.refname = NULL;
rec.u.ref.value_type = REFTABLE_REF_DELETION;
@@ -72,7 +72,7 @@ static void t_block_read_write(void)
check_int(r, >=, 0);
if (r > 0)
break;
- check_str(names[j], rec.u.ref.refname);
+ check(reftable_record_equal(&recs[j], &rec, GIT_SHA1_RAWSZ));
j++;
}
@@ -82,7 +82,7 @@ static void t_block_read_write(void)
for (i = 0; i < N; i++) {
struct block_iter it = BLOCK_ITER_INIT;
strbuf_reset(&want);
- strbuf_addstr(&want, names[i]);
+ strbuf_addstr(&want, recs[i].u.ref.refname);
n = block_iter_seek_key(&it, &br, &want);
check_int(n, ==, 0);
@@ -90,7 +90,7 @@ static void t_block_read_write(void)
n = block_iter_next(&it, &rec);
check_int(n, ==, 0);
- check_str(names[i], rec.u.ref.refname);
+ check(reftable_record_equal(&recs[i], &rec, GIT_SHA1_RAWSZ));
want.len--;
n = block_iter_seek_key(&it, &br, &want);
@@ -98,7 +98,7 @@ static void t_block_read_write(void)
n = block_iter_next(&it, &rec);
check_int(n, ==, 0);
- check_str(names[10 * (i / 10)], rec.u.ref.refname);
+ check(reftable_record_equal(&recs[10 * (i / 10)], &rec, GIT_SHA1_RAWSZ));
block_iter_close(&it);
}
@@ -108,7 +108,7 @@ static void t_block_read_write(void)
reftable_block_done(&br.block);
strbuf_release(&want);
for (i = 0; i < N; i++)
- reftable_free(names[i]);
+ reftable_record_release(&recs[i]);
}
int cmd_main(int argc, const char *argv[])
--
2.45.GIT
next prev parent reply other threads:[~2024-08-14 12:12 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 12:03 [GSoC][PATCH 00/10] t: port reftable/block_test.c to the unit testing framework Chandra Pratap
2024-08-14 12:03 ` [PATCH 01/10] t: move " Chandra Pratap
2024-08-14 12:03 ` [PATCH 02/10] t-reftable-block: release used block reader Chandra Pratap
2024-08-15 9:40 ` Patrick Steinhardt
2024-08-15 18:22 ` Chandra Pratap
2024-08-14 12:03 ` Chandra Pratap [this message]
2024-08-15 9:40 ` [PATCH 03/10] t-reftable-block: use reftable_record_equal() instead of check_str() Patrick Steinhardt
2024-08-14 12:03 ` [PATCH 04/10] t-reftable-block: use reftable_record_key() instead of strbuf_addstr() Chandra Pratap
2024-08-15 9:40 ` Patrick Steinhardt
2024-08-14 12:03 ` [PATCH 05/10] t-reftable-block: use block_iter_reset() instead of block_iter_close() Chandra Pratap
2024-08-15 9:40 ` Patrick Steinhardt
2024-08-14 12:03 ` [PATCH 06/10] t-reftable-block: use xstrfmt() instead of xstrdup() Chandra Pratap
2024-08-14 12:03 ` [PATCH 07/10] t-reftable-block: remove unnecessary variable 'j' Chandra Pratap
2024-08-14 12:03 ` [PATCH 08/10] t-reftable-block: add tests for log blocks Chandra Pratap
2024-08-15 9:41 ` Patrick Steinhardt
2024-08-15 18:36 ` Chandra Pratap
2024-08-16 7:42 ` Patrick Steinhardt
2024-08-14 12:03 ` [PATCH 09/10] t-reftable-block: add tests for obj blocks Chandra Pratap
2024-08-15 9:41 ` Patrick Steinhardt
2024-08-15 19:11 ` Chandra Pratap
2024-08-16 7:44 ` Patrick Steinhardt
2024-08-14 12:03 ` [PATCH 10/10] t-reftable-block: add tests for index blocks Chandra Pratap
2024-08-15 9:41 ` Patrick Steinhardt
2024-08-16 17:25 ` [GSoC][PATCH v2 00/11] t: port reftable/block_test.c to the unit testing framework Chandra Pratap
2024-08-16 17:25 ` [PATCH v2 01/11] t: move " Chandra Pratap
2024-08-16 17:25 ` [PATCH v2 02/11] t: harmonize t-reftable-block.c with coding guidelines Chandra Pratap
2024-08-16 17:25 ` [PATCH v2 03/11] t-reftable-block: release used block reader Chandra Pratap
2024-08-16 17:25 ` [PATCH v2 04/11] t-reftable-block: use reftable_record_equal() instead of check_str() Chandra Pratap
2024-08-16 17:25 ` [PATCH v2 05/11] t-reftable-block: use reftable_record_key() instead of strbuf_addstr() Chandra Pratap
2024-08-16 17:25 ` [PATCH v2 06/11] t-reftable-block: use block_iter_reset() instead of block_iter_close() Chandra Pratap
2024-08-16 17:25 ` [PATCH v2 07/11] t-reftable-block: use xstrfmt() instead of xstrdup() Chandra Pratap
2024-08-16 17:25 ` [PATCH v2 08/11] t-reftable-block: remove unnecessary variable 'j' Chandra Pratap
2024-08-16 17:25 ` [PATCH v2 09/11] t-reftable-block: add tests for log blocks Chandra Pratap
2024-08-21 7:28 ` Patrick Steinhardt
2024-08-21 16:13 ` Junio C Hamano
2024-08-16 17:25 ` [PATCH v2 10/11] t-reftable-block: add tests for obj blocks Chandra Pratap
2024-08-16 18:11 ` Chandra Pratap
2024-08-16 17:25 ` [PATCH v2 11/11] t-reftable-block: add tests for index blocks Chandra Pratap
2024-08-21 7:30 ` [GSoC][PATCH v2 00/11] t: port reftable/block_test.c to the unit testing framework Chandra Pratap
2024-08-21 12:30 ` [GSoC][PATCH v3 " Chandra Pratap
2024-08-21 12:30 ` [PATCH v3 01/11] t: move " Chandra Pratap
2024-08-21 12:30 ` [PATCH v3 02/11] t: harmonize t-reftable-block.c with coding guidelines Chandra Pratap
2024-08-21 12:30 ` [PATCH v3 03/11] t-reftable-block: release used block reader Chandra Pratap
2024-08-21 12:30 ` [PATCH v3 04/11] t-reftable-block: use reftable_record_equal() instead of check_str() Chandra Pratap
2024-08-21 12:30 ` [PATCH v3 05/11] t-reftable-block: use reftable_record_key() instead of strbuf_addstr() Chandra Pratap
2024-08-21 12:30 ` [PATCH v3 06/11] t-reftable-block: use block_iter_reset() instead of block_iter_close() Chandra Pratap
2024-08-21 12:30 ` [PATCH v3 07/11] t-reftable-block: use xstrfmt() instead of xstrdup() Chandra Pratap
2024-08-21 12:30 ` [PATCH v3 08/11] t-reftable-block: remove unnecessary variable 'j' Chandra Pratap
2024-08-21 12:30 ` [PATCH v3 09/11] t-reftable-block: add tests for log blocks Chandra Pratap
2024-08-21 12:31 ` [PATCH v3 10/11] t-reftable-block: add tests for obj blocks Chandra Pratap
2024-08-21 12:31 ` [PATCH v3 11/11] t-reftable-block: add tests for index blocks Chandra Pratap
2024-08-22 6:39 ` [GSoC][PATCH v3 00/11] t: port reftable/block_test.c to the unit testing framework Patrick Steinhardt
2024-08-22 18:01 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240814121122.4642-4-chandrapratap3519@gmail.com \
--to=chandrapratap3519@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).