We rely on "test-tool string-list" command to test the functionality of
the "string-list". However, as we have introduced clar test framework,
we'd better move the shell script into C program to improve speed and
readability.
Create a new file "u-string-list.c" under "t/unit-tests", then update
the Makefile and "meson.build" to build the file. And let's first move
"test_split" into unit test and gradually convert the shell script into
C program.
In order to create `string_list` easily by simply specifying strings in
the function call, create "t_vcreate_string_list_dup" and
"t_create_string_list_dup" functions to do above.
Then port the shell script tests to C program and remove unused
"test-tool" code and tests.
Signed-off-by: shejialuo <shejialuo@xxxxxxxxx>
---
Makefile | 1 +
t/helper/test-string-list.c | 14 ------
t/meson.build | 1 +
t/t0063-string-list.sh | 53 ----------------------
t/unit-tests/u-string-list.c | 86 ++++++++++++++++++++++++++++++++++++
5 files changed, 88 insertions(+), 67 deletions(-)
create mode 100644 t/unit-tests/u-string-list.c
diff --git a/Makefile b/Makefile
index 13f9062a05..58df1f1150 100644
--- a/Makefile
+++ b/Makefile
@@ -1365,6 +1365,7 @@ CLAR_TEST_SUITES += u-prio-queue
CLAR_TEST_SUITES += u-reftable-tree
CLAR_TEST_SUITES += u-strbuf
CLAR_TEST_SUITES += u-strcmp-offset
+CLAR_TEST_SUITES += u-string-list
CLAR_TEST_SUITES += u-strvec
CLAR_TEST_SUITES += u-trailer
CLAR_TEST_SUITES += u-urlmatch-normalization
diff --git a/t/helper/test-string-list.c b/t/helper/test-string-list.c
index 6f10c5a435..17c18c30f6 100644
--- a/t/helper/test-string-list.c
+++ b/t/helper/test-string-list.c
@@ -46,20 +46,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")) {
- struct string_list list = STRING_LIST_INIT_DUP;
- int i;
- const char *s = argv[2];
- int delim = *argv[3];
- int maxsplit = atoi(argv[4]);
-
- i = string_list_split(&list, s, delim, maxsplit);
- printf("%d\n", i);
- write_list(&list);
- string_list_clear(&list, 0);
- return 0;
- }
-
if (argc == 5 && !strcmp(argv[1], "split_in_place")) {
struct string_list list = STRING_LIST_INIT_NODUP;
int i;
diff --git a/t/meson.build b/t/meson.build
index bfb744e886..424e7e445f 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -11,6 +11,7 @@ clar_test_suites = [
'unit-tests/u-reftable-tree.c',
'unit-tests/u-strbuf.c',
'unit-tests/u-strcmp-offset.c',
+ 'unit-tests/u-string-list.c',
'unit-tests/u-strvec.c',
'unit-tests/u-trailer.c',
'unit-tests/u-urlmatch-normalization.c',
diff --git a/t/t0063-string-list.sh b/t/t0063-string-list.sh
index aac63ba506..6b20ffd206 100755
--- a/t/t0063-string-list.sh
+++ b/t/t0063-string-list.sh
@@ -7,16 +7,6 @@ test_description='Test string list functionality'
. ./test-lib.sh
-test_split () {
- cat >expected &&
- test_expect_success "split $1 at $2, max $3" "
- test-tool string-list split '$1' '$2' '$3' >actual &&
- test_cmp expected actual &&
- test-tool string-list split_in_place '$1' '$2' '$3' >actual &&
- test_cmp expected actual
- "
-}
-
test_split_in_place() {
cat >expected &&
test_expect_success "split (in place) $1 at $2, max $3" "
@@ -25,49 +15,6 @@ test_split_in_place() {
"
}
-test_split "foo:bar:baz" ":" "-1" <<EOF
-3
-[0]: "foo"
-[1]: "bar"
-[2]: "baz"
-EOF
-
-test_split "foo:bar:baz" ":" "0" <<EOF
-1
-[0]: "foo:bar:baz"
-EOF
-
-test_split "foo:bar:baz" ":" "1" <<EOF
-2
-[0]: "foo"
-[1]: "bar:baz"
-EOF
-
-test_split "foo:bar:baz" ":" "2" <<EOF
-3
-[0]: "foo"
-[1]: "bar"
-[2]: "baz"
-EOF
-
-test_split "foo:bar:" ":" "-1" <<EOF
-3
-[0]: "foo"
-[1]: "bar"
-[2]: ""
-EOF
-
-test_split "" ":" "-1" <<EOF
-1
-[0]: ""
-EOF
-
-test_split ":" ":" "-1" <<EOF
-2
-[0]: ""
-[1]: ""
-EOF
-
test_split_in_place "foo:;:bar:;:baz:;:" ":;" "-1" <<EOF
10
[0]: "foo"
diff --git a/t/unit-tests/u-string-list.c b/t/unit-tests/u-string-list.c
new file mode 100644
index 0000000000..0c148684ea
--- /dev/null
+++ b/t/unit-tests/u-string-list.c
@@ -0,0 +1,86 @@
+#include "unit-test.h"
+#include "string-list.h"
+
+static void t_check_string_list(struct string_list *list,
+ struct string_list *expected_strings)
+{
+ size_t expect_len = expected_strings->nr;
+ cl_assert_equal_i(list->nr, expect_len);
+ cl_assert(list->nr <= list->alloc);
+ for (size_t i = 0; i < expect_len; i++)
+ cl_assert_equal_s(list->items[i].string,
+ expected_strings->items[i].string);
+}
+
+static void t_string_list_clear(struct string_list *list, int free_util)
+{
+ string_list_clear(list, free_util);
+ cl_assert_equal_p(list->items, NULL);
+ cl_assert_equal_i(list->nr, 0);
+ cl_assert_equal_i(list->alloc, 0);
+}
+
+static void t_vcreate_string_list_dup(struct string_list *list,
+ int free_util, va_list ap)
+{
+ const char *arg;
+
+ cl_assert(list->strdup_strings);
+
+ t_string_list_clear(list, free_util);
+ while ((arg = va_arg(ap, const char *)))
+ 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);
+
+ t_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_split(const char *data, int delim, int maxsplit,
+ struct string_list *expected_strings)
+{
+ struct string_list list = STRING_LIST_INIT_DUP;
+ int len;
+
+ len = string_list_split(&list, data, delim, maxsplit);
+ cl_assert_equal_i(len, expected_strings->nr);
+ t_check_string_list(&list, expected_strings);
+
+ t_string_list_clear(&list, 0);
+}
+
+void test_string_list__split(void)
+{
+ struct string_list expected_strings = STRING_LIST_INIT_DUP;
+
+ t_create_string_list_dup(&expected_strings, 0, "foo", "bar", "baz", NULL);
+ t_string_list_split("foo:bar:baz", ':', -1, &expected_strings);
+
+ t_create_string_list_dup(&expected_strings, 0, "foo:bar:baz", NULL);
+ t_string_list_split("foo:bar:baz", ':', 0, &expected_strings);
+
+ t_create_string_list_dup(&expected_strings, 0, "foo", "bar:baz", NULL);
+ t_string_list_split("foo:bar:baz", ':', 1, &expected_strings);
+
+ t_create_string_list_dup(&expected_strings, 0, "foo", "bar", "baz", NULL);
+ t_string_list_split("foo:bar:baz", ':', 2, &expected_strings);
+
+ t_create_string_list_dup(&expected_strings, 0, "foo", "bar", "", NULL);
+ t_string_list_split("foo:bar:", ':', -1, &expected_strings);
+
+ t_create_string_list_dup(&expected_strings, 0, "", NULL);
+ t_string_list_split("", ':', -1, &expected_strings);
+
+ t_create_string_list_dup(&expected_strings, 0, "", "", NULL);
+ t_string_list_split(":", ':', -1, &expected_strings);
+
+ t_string_list_clear(&expected_strings, 0);
+}
--
2.49.0
