u-string-list: move "test_split_in_place" to "u-string-list.c"

We use "test-tool string-list split_in_place" to test the
"string_list_split_in_place" 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 17c18c30f6f5bc013dfad46f6fe55ac0f6303419..8a344347ada196261bee73b42384c89a06cd9838 100644 (file)
--- a/t/helper/test-string-list.c
+++ b/t/helper/test-string-list.c
@@ -18,13 +18,6 @@ static void parse_string_list(struct string_list *list, const char *arg)
        (void)string_list_split(list, arg, ':', -1);
 }
 
-static void write_list(const struct string_list *list)
-{
-       int i;
-       for (i = 0; i < list->nr; i++)
-               printf("[%d]: \"%s\"\n", i, list->items[i].string);
-}
-
 static void write_list_compact(const struct string_list *list)
 {
        int i;
@@ -46,21 +39,6 @@ static int prefix_cb(struct string_list_item *item, void *cb_data)
 
 int cmd__string_list(int argc, const char **argv)
 {
-       if (argc == 5 && !strcmp(argv[1], "split_in_place")) {
-               struct string_list list = STRING_LIST_INIT_NODUP;
-               int i;
-               char *s = xstrdup(argv[2]);
-               const char *delim = argv[3];
-               int maxsplit = atoi(argv[4]);
-
-               i = string_list_split_in_place(&list, s, delim, maxsplit);
-               printf("%d\n", i);
-               write_list(&list);
-               string_list_clear(&list, 0);
-               free(s);
-               return 0;
-       }
-
        if (argc == 4 && !strcmp(argv[1], "filter")) {
                /*
                 * Retain only the items that have the specified prefix.

diff --git a/t/t0063-string-list.sh b/t/t0063-string-list.sh
index 6b20ffd206c769dea500689dcc7ab24fd9d7a398..1a9cf8bfcf35e9795a6f76d412b217feda719c57 100755 (executable)
--- a/t/t0063-string-list.sh
+++ b/t/t0063-string-list.sh
@@ -7,57 +7,6 @@ test_description='Test string list functionality'
 
 . ./test-lib.sh
 
-test_split_in_place() {
-       cat >expected &&
-       test_expect_success "split (in place) $1 at $2, max $3" "
-               test-tool string-list split_in_place '$1' '$2' '$3' >actual &&
-               test_cmp expected actual
-       "
-}
-
-test_split_in_place "foo:;:bar:;:baz:;:" ":;" "-1" <<EOF
-10
-[0]: "foo"
-[1]: ""
-[2]: ""
-[3]: "bar"
-[4]: ""
-[5]: ""
-[6]: "baz"
-[7]: ""
-[8]: ""
-[9]: ""
-EOF
-
-test_split_in_place "foo:;:bar:;:baz" ":;" "0" <<EOF
-1
-[0]: "foo:;:bar:;:baz"
-EOF
-
-test_split_in_place "foo:;:bar:;:baz" ":;" "1" <<EOF
-2
-[0]: "foo"
-[1]: ";:bar:;:baz"
-EOF
-
-test_split_in_place "foo:;:bar:;:baz" ":;" "2" <<EOF
-3
-[0]: "foo"
-[1]: ""
-[2]: ":bar:;:baz"
-EOF
-
-test_split_in_place "foo:;:bar:;:" ":;" "-1" <<EOF
-7
-[0]: "foo"
-[1]: ""
-[2]: ""
-[3]: "bar"
-[4]: ""
-[5]: ""
-[6]: ""
-EOF
-
 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)" &&

diff --git a/t/unit-tests/u-string-list.c b/t/unit-tests/u-string-list.c
index 881720ed6e47deda08b6c012af01f8895a44c762..d2761e1f2fb21ecbf2a345b11c32cd8aea62c12f 100644 (file)
--- a/t/unit-tests/u-string-list.c
+++ b/t/unit-tests/u-string-list.c
@@ -53,3 +53,40 @@ void test_string_list__split(void)
        t_string_list_split("", ':', -1, "", NULL);
        t_string_list_split(":", ':', -1, "", "", NULL);
 }
+
+static void t_string_list_split_in_place(const char *data, const char *delim,
+                                        int maxsplit, ...)
+{
+       struct string_list expected_strings = STRING_LIST_INIT_DUP;
+       struct string_list list = STRING_LIST_INIT_NODUP;
+       char *string = xstrdup(data);
+       va_list ap;
+       int len;
+
+       va_start(ap, maxsplit);
+       t_vcreate_string_list_dup(&expected_strings, 0, ap);
+       va_end(ap);
+
+       string_list_clear(&list, 0);
+       len = string_list_split_in_place(&list, string, delim, maxsplit);
+       cl_assert_equal_i(len, expected_strings.nr);
+       t_string_list_equal(&list, &expected_strings);
+
+       free(string);
+       string_list_clear(&expected_strings, 0);
+       string_list_clear(&list, 0);
+}
+
+void test_string_list__split_in_place(void)
+{
+       t_string_list_split_in_place("foo:;:bar:;:baz:;:", ":;", -1,
+                                    "foo", "", "", "bar", "", "", "baz", "", "", "", NULL);
+       t_string_list_split_in_place("foo:;:bar:;:baz", ":;", 0,
+                                    "foo:;:bar:;:baz", NULL);
+       t_string_list_split_in_place("foo:;:bar:;:baz", ":;", 1,
+                                    "foo", ";:bar:;:baz", NULL);
+       t_string_list_split_in_place("foo:;:bar:;:baz", ":;", 2,
+                                    "foo", "", ":bar:;:baz", NULL);
+       t_string_list_split_in_place("foo:;:bar:;:", ":;", -1,
+                                    "foo", "", "", "bar", "", "", "", NULL);
+}