Jeff King <peff@xxxxxxxx> writes:
> I did have one fixup for this series, based on feedback from Ghanshyam.
> Here it is as a separate patch on top.
Ah, I recall seeing it.
My personal take was that calling this one via the same setup()
wrapper was just fine, which made it similar to everybody else.
But I am also fine to treat the first parameter to TEST() as just a
simple Boolean, which is the right way to think about it anyway ;-)
It is mere a happenstance that all others use the setup() thing
because they happen to share the need to perform the same set-up.
Will queue on top. Thanks.
> -- >8 --
> Subject: [PATCH] t-hashmap: stop calling setup() for t_intern() test
>
> Commit f24a9b78a9 (t-hashmap: mark unused parameters in callback
> function, 2024-08-17) noted that the t_intern() does not need its
> hashmap parameter, but we have to keep it to conform to the function
> pointer interface of setup().
>
> But since the only thing setup() does is create and tear down the
> hashmap, we can just skip calling setup() entirely for this case, and
> drop the unused parameters. This simplifies the code a bit.
>
> Helped-by: Ghanshyam Thakkar <shyamthakkar001@xxxxxxxxx>
> Signed-off-by: Jeff King <peff@xxxxxxxx>
> ---
> t/unit-tests/t-hashmap.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/t/unit-tests/t-hashmap.c b/t/unit-tests/t-hashmap.c
> index da102eb541..83b79dff39 100644
> --- a/t/unit-tests/t-hashmap.c
> +++ b/t/unit-tests/t-hashmap.c
> @@ -322,8 +322,7 @@ static void t_alloc(struct hashmap *map, unsigned int ignore_case)
> free(removed);
> }
>
> -static void t_intern(struct hashmap *map UNUSED,
> - unsigned int ignore_case UNUSED)
> +static void t_intern(void)
> {
> const char *values[] = { "value1", "Value1", "value2", "value2" };
>
> @@ -357,6 +356,6 @@ int cmd_main(int argc UNUSED, const char **argv UNUSED)
> TEST(setup(t_iterate, 0), "iterate works");
> TEST(setup(t_iterate, 1), "iterate (case insensitive) works");
> TEST(setup(t_alloc, 0), "grow / shrink works");
> - TEST(setup(t_intern, 0), "string interning works");
> + TEST(t_intern(), "string interning works");
> return test_done();
> }
