diff options
| -rw-r--r-- | src/test/test-strv.c | 21 | ||||
| -rw-r--r-- | src/test/test-util.c | 20 |
2 files changed, 21 insertions, 20 deletions
diff --git a/src/test/test-strv.c b/src/test/test-strv.c index ef451c6abf..fea1f848cd 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -660,6 +660,25 @@ static void test_strv_make_nulstr(void) { test_strv_make_nulstr_one(STRV_MAKE("foo", "bar", "quuux")); } +static void test_foreach_string(void) { + const char * const t[] = { + "foo", + "bar", + "waldo", + NULL + }; + const char *x; + unsigned i = 0; + + FOREACH_STRING(x, "foo", "bar", "waldo") + assert_se(streq_ptr(t[i++], x)); + + assert_se(i == 3); + + FOREACH_STRING(x, "zzz") + assert_se(streq(x, "zzz")); +} + int main(int argc, char *argv[]) { test_specifier_printf(); test_strv_foreach(); @@ -724,5 +743,7 @@ int main(int argc, char *argv[]) { test_strv_extend_n(); test_strv_make_nulstr(); + test_foreach_string(); + return 0; } diff --git a/src/test/test-util.c b/src/test/test-util.c index 3d764eac66..2b44b91170 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -522,25 +522,6 @@ static void test_log2i(void) { assert_se(log2i(INT_MAX) == sizeof(int)*8-2); } -static void test_foreach_string(void) { - const char * const t[] = { - "foo", - "bar", - "waldo", - NULL - }; - const char *x; - unsigned i = 0; - - FOREACH_STRING(x, "foo", "bar", "waldo") - assert_se(streq_ptr(t[i++], x)); - - assert_se(i == 3); - - FOREACH_STRING(x, "zzz") - assert_se(streq(x, "zzz")); -} - static void test_filename_is_valid(void) { char foo[FILENAME_MAX+2]; int i; @@ -1073,7 +1054,6 @@ int main(int argc, char *argv[]) { test_in_set(); test_writing_tmpfile(); test_log2i(); - test_foreach_string(); test_filename_is_valid(); test_files_same(); test_is_valid_documentation_url(); |