u-string-list: move "filter string" test to "u-string-list.c"

We use "test-tool string-list filter" to test the "filter_string_list"
function. As we have introduced the unit test, we'd better remove the
logic from shell script to C program to improve test speed and
readability.

Signed-off-by: shejialuo <shejialuo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/helper/test-string-list.c b/t/helper/test-string-list.c
index 8a344347ada196261bee73b42384c89a06cd9838..262b28c599310a25b4ae2cfaa44d00ad700a6abb 100644 (file)
--- a/t/helper/test-string-list.c
+++ b/t/helper/test-string-list.c
@@ -31,29 +31,8 @@ static void write_list_compact(const struct string_list *list)
        }
 }
 
-static int prefix_cb(struct string_list_item *item, void *cb_data)
-{
-       const char *prefix = (const char *)cb_data;
-       return starts_with(item->string, prefix);
-}
-
 int cmd__string_list(int argc, const char **argv)
 {
-       if (argc == 4 && !strcmp(argv[1], "filter")) {
-               /*
-                * Retain only the items that have the specified prefix.
-                * Arguments: list|- prefix
-                */
-               struct string_list list = STRING_LIST_INIT_DUP;
-               const char *prefix = argv[3];
-
-               parse_string_list(&list, argv[2]);
-               filter_string_list(&list, 0, prefix_cb, (void *)prefix);
-               write_list_compact(&list);
-               string_list_clear(&list, 0);
-               return 0;
-       }
-
        if (argc == 3 && !strcmp(argv[1], "remove_duplicates")) {
                struct string_list list = STRING_LIST_INIT_DUP;
 

diff --git a/t/t0063-string-list.sh b/t/t0063-string-list.sh
index 1a9cf8bfcf35e9795a6f76d412b217feda719c57..31fd62bba87954714d12e8cb83a09138ed4b75b7 100755 (executable)
--- a/t/t0063-string-list.sh
+++ b/t/t0063-string-list.sh
@@ -7,17 +7,6 @@ test_description='Test string list functionality'
 
 . ./test-lib.sh
 
-test_expect_success "test filter_string_list" '
-       test "x-" = "x$(test-tool string-list filter - y)" &&
-       test "x-" = "x$(test-tool string-list filter no y)" &&
-       test yes = "$(test-tool string-list filter yes y)" &&
-       test yes = "$(test-tool string-list filter no:yes y)" &&
-       test yes = "$(test-tool string-list filter yes:no y)" &&
-       test y1:y2 = "$(test-tool string-list filter y1:y2 y)" &&
-       test y2:y1 = "$(test-tool string-list filter y2:y1 y)" &&
-       test "x-" = "x$(test-tool string-list filter x1:x2 y)"
-'
-
 test_expect_success "test remove_duplicates" '
        test "x-" = "x$(test-tool string-list remove_duplicates -)" &&
        test "x" = "x$(test-tool string-list remove_duplicates "")" &&

diff --git a/t/unit-tests/u-string-list.c b/t/unit-tests/u-string-list.c
index e4b8e38fb8db223eaf636b68c74018ac25b33b9c..be2bb5f1036f2334689623ad76656e4239593b19 100644 (file)
--- a/t/unit-tests/u-string-list.c
+++ b/t/unit-tests/u-string-list.c
@@ -13,6 +13,18 @@ static void t_vcreate_string_list_dup(struct string_list *list,
                string_list_append(list, arg);
 }
 
+static void t_create_string_list_dup(struct string_list *list, int free_util, ...)
+{
+       va_list ap;
+
+       cl_assert(list->strdup_strings);
+
+       string_list_clear(list, free_util);
+       va_start(ap, free_util);
+       t_vcreate_string_list_dup(list, free_util, ap);
+       va_end(ap);
+}
+
 static void t_string_list_clear(struct string_list *list, int free_util)
 {
        string_list_clear(list, free_util);
@@ -103,3 +115,57 @@ void test_string_list__split_in_place(void)
 
        t_string_list_clear(&list, 0);
 }
+
+static int prefix_cb(struct string_list_item *item, void *cb_data)
+{
+       const char *prefix = (const char *)cb_data;
+       return starts_with(item->string, prefix);
+}
+
+static void t_string_list_filter(struct string_list *list,
+                                string_list_each_func_t want, void *cb_data, ...)
+{
+       struct string_list expected_strings = STRING_LIST_INIT_DUP;
+       va_list ap;
+
+       va_start(ap, cb_data);
+       t_vcreate_string_list_dup(&expected_strings, 0, ap);
+       va_end(ap);
+
+       filter_string_list(list, 0, want, cb_data);
+       t_string_list_equal(list, &expected_strings);
+
+       string_list_clear(&expected_strings, 0);
+}
+
+void test_string_list__filter(void)
+{
+       struct string_list list = STRING_LIST_INIT_DUP;
+       const char *prefix = "y";
+
+       t_create_string_list_dup(&list, 0, NULL);
+       t_string_list_filter(&list, prefix_cb, (void*)prefix, NULL);
+
+       t_create_string_list_dup(&list, 0, "no", NULL);
+       t_string_list_filter(&list, prefix_cb, (void*)prefix, NULL);
+
+       t_create_string_list_dup(&list, 0, "yes", NULL);
+       t_string_list_filter(&list, prefix_cb, (void*)prefix, "yes", NULL);
+
+       t_create_string_list_dup(&list, 0, "no", "yes", NULL);
+       t_string_list_filter(&list, prefix_cb, (void*)prefix, "yes", NULL);
+
+       t_create_string_list_dup(&list, 0, "yes", "no", NULL);
+       t_string_list_filter(&list, prefix_cb, (void*)prefix, "yes", NULL);
+
+       t_create_string_list_dup(&list, 0, "y1", "y2", NULL);
+       t_string_list_filter(&list, prefix_cb, (void*)prefix, "y1", "y2", NULL);
+
+       t_create_string_list_dup(&list, 0, "y2", "y1", NULL);
+       t_string_list_filter(&list, prefix_cb, (void*)prefix, "y2", "y1", NULL);
+
+       t_create_string_list_dup(&list, 0, "x1", "x2", NULL);
+       t_string_list_filter(&list, prefix_cb, (void*)prefix, NULL);
+
+       t_string_list_clear(&list, 0);
+}