From 4fff6e51149a43ac4eb31d727e65d5c7f5919fea Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 2 Sep 2026 09:11:42 +0200 Subject: config: add unit test for modifiers_disjoint() --- config.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/config.c b/config.c index 5c913137..b1a562be 100644 --- a/config.c +++ b/config.c @@ -2228,12 +2228,19 @@ UNITTEST static bool modifiers_disjoint(const config_modifier_list_t *mods1, - const config_modifier_list_t *mods2) + const config_modifier_list_t *mods2) { size_t count = 0; tll_foreach(*mods1, it1) { + /* + * Both sets are sorted. Thus, if we're still here in + * iteration 2..N, then we can skip the first x items in set + * #2; we've already checked them against the previous items + * in set #1. + */ size_t skip = count; tll_foreach(*mods2, it2) { + if (skip > 0) { --skip; continue; @@ -2251,6 +2258,75 @@ modifiers_disjoint(const config_modifier_list_t *mods1, return true; } +UNITTEST +{ + config_modifier_list_t mods1 = tll_init(); + config_modifier_list_t mods2 = tll_init(); + + /* Both empty counts as disjoint */ + xassert(modifiers_disjoint(&mods1, &mods2)); + + /* Second set being empty means it's disjoint with the first, non-empty set */ + tll_push_back(mods1, xstrdup("foo")); + tll_push_back(mods1, xstrdup("bar")); + tll_sort(mods1, strcmp); + tll_sort(mods2, strcmp); + xassert(modifiers_disjoint(&mods1, &mods2)); + tll_free_and_free(mods1, free); + tll_free_and_free(mods2, free); + + /* "foo" in both sets -> not disjoint */ + tll_push_back(mods1, xstrdup("foo")); + tll_push_back(mods1, xstrdup("bar")); + tll_push_back(mods2, xstrdup("foo")); + tll_sort(mods1, strcmp); + tll_sort(mods2, strcmp); + xassert(!modifiers_disjoint(&mods1, &mods2)); + tll_free_and_free(mods1, free); + tll_free_and_free(mods2, free); + + /* "bar in both sets -> not disjoint */ + tll_push_back(mods1, xstrdup("foo")); + tll_push_back(mods1, xstrdup("bar")); + tll_push_back(mods2, xstrdup("bar")); + tll_sort(mods1, strcmp); + tll_sort(mods2, strcmp); + xassert(!modifiers_disjoint(&mods1, &mods2)); + tll_free_and_free(mods1, free); + tll_free_and_free(mods2, free); + + /* "foo" and "bar" in both sets -> not disjoint */ + tll_push_back(mods1, xstrdup("foo")); + tll_push_back(mods1, xstrdup("bar")); + tll_push_back(mods2, xstrdup("foo")); + tll_push_back(mods2, xstrdup("bar")); + tll_sort(mods1, strcmp); + tll_sort(mods2, strcmp); + xassert(!modifiers_disjoint(&mods1, &mods2)); + tll_free_and_free(mods1, free); + tll_free_and_free(mods2, free); + + /* + * Disjoint, with set #2 sorting most of it's items before the + * items in set #1. This tests the count/skip optimization in + * modifiers_disjoint(). + */ + tll_push_back(mods1, xstrdup("ddd")); + tll_push_back(mods1, xstrdup("eee")); + tll_push_back(mods1, xstrdup("fff")); + tll_push_back(mods2, xstrdup("aaa")); + tll_push_back(mods2, xstrdup("bbb")); + tll_push_back(mods2, xstrdup("ccc")); + tll_push_back(mods2, xstrdup("ggg")); + tll_sort(mods1, strcmp); + tll_sort(mods2, strcmp); + xassert(modifiers_disjoint(&mods1, &mods2)); + tll_free_and_free(mods1, free); + tll_free_and_free(mods2, free); + + printf("done\n"); +} + static char * NOINLINE modifiers_to_str(const config_modifier_list_t *mods, bool strip_last_plus) { -- cgit v1.3