u-string-list: move "remove duplicates" test to "u-string-list.c"

We use "test-tool string-list remove_duplicates" to test the
"string_list_remove_duplicates" 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.

As all the tests in shell script are removed, let's just delete the
"t0063-string-list.sh" and update the "meson.build" file to align with
this change.

Also we could simply remove "DISABLE_SIGN_COMPARE_WARNINGS" due to we
have already deleted related code.

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 262b28c599310a25b4ae2cfaa44d00ad700a6abb..6be0cdb8e2006a97dc3f8cd24f6ae3ab0c02f02d 100644 (file)
--- a/t/helper/test-string-list.c
+++ b/t/helper/test-string-list.c
@@ -1,48 +1,9 @@
-#define DISABLE_SIGN_COMPARE_WARNINGS
-
 #include "test-tool.h"
 #include "strbuf.h"
 #include "string-list.h"
 
-/*
- * Parse an argument into a string list.  arg should either be a
- * ':'-separated list of strings, or "-" to indicate an empty string
- * list (as opposed to "", which indicates a string list containing a
- * single empty string).  list->strdup_strings must be set.
- */
-static void parse_string_list(struct string_list *list, const char *arg)
-{
-       if (!strcmp(arg, "-"))
-               return;
-
-       (void)string_list_split(list, arg, ':', -1);
-}
-
-static void write_list_compact(const struct string_list *list)
-{
-       int i;
-       if (!list->nr)
-               printf("-\n");
-       else {
-               printf("%s", list->items[0].string);
-               for (i = 1; i < list->nr; i++)
-                       printf(":%s", list->items[i].string);
-               printf("\n");
-       }
-}
-
 int cmd__string_list(int argc, const char **argv)
 {
-       if (argc == 3 && !strcmp(argv[1], "remove_duplicates")) {
-               struct string_list list = STRING_LIST_INIT_DUP;
-
-               parse_string_list(&list, argv[2]);
-               string_list_remove_duplicates(&list, 0);
-               write_list_compact(&list);
-               string_list_clear(&list, 0);
-               return 0;
-       }
-
        if (argc == 2 && !strcmp(argv[1], "sort")) {
                struct string_list list = STRING_LIST_INIT_NODUP;
                struct strbuf sb = STRBUF_INIT;

diff --git a/t/meson.build b/t/meson.build
index e0edea8581f08ed54bec96e995b619f21de81a3a..39a6fdcd02fbcdc0e3a220b285a255b66dd7e765 100644 (file)
--- a/t/meson.build
+++ b/t/meson.build
@@ -124,7 +124,6 @@ integration_tests = [
   't0060-path-utils.sh',
   't0061-run-command.sh',
   't0062-revision-walking.sh',
-  't0063-string-list.sh',
   't0066-dir-iterator.sh',
   't0067-parse_pathspec_file.sh',
   't0068-for-each-repo.sh',

diff --git a/t/t0063-string-list.sh b/t/t0063-string-list.sh
deleted file mode 100755 (executable)
index 31fd62b..0000000
--- a/t/t0063-string-list.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2012 Michael Haggerty
-#
-
-test_description='Test string list functionality'
-
-. ./test-lib.sh
-
-test_expect_success "test remove_duplicates" '
-       test "x-" = "x$(test-tool string-list remove_duplicates -)" &&
-       test "x" = "x$(test-tool string-list remove_duplicates "")" &&
-       test a = "$(test-tool string-list remove_duplicates a)" &&
-       test a = "$(test-tool string-list remove_duplicates a:a)" &&
-       test a = "$(test-tool string-list remove_duplicates a:a:a:a:a)" &&
-       test a:b = "$(test-tool string-list remove_duplicates a:b)" &&
-       test a:b = "$(test-tool string-list remove_duplicates a:a:b)" &&
-       test a:b = "$(test-tool string-list remove_duplicates a:b:b)" &&
-       test a:b:c = "$(test-tool string-list remove_duplicates a:b:c)" &&
-       test a:b:c = "$(test-tool string-list remove_duplicates a:a:b:c)" &&
-       test a:b:c = "$(test-tool string-list remove_duplicates a:b:b:c)" &&
-       test a:b:c = "$(test-tool string-list remove_duplicates a:b:c:c)" &&
-       test a:b:c = "$(test-tool string-list remove_duplicates a:a:b:b:c:c)" &&
-       test a:b:c = "$(test-tool string-list remove_duplicates a:a:a:b:b:b:c:c:c)"
-'
-
-test_done

diff --git a/t/unit-tests/u-string-list.c b/t/unit-tests/u-string-list.c
index be2bb5f1036f2334689623ad76656e4239593b19..a575fdda9732c3371f50ae585d17736eab1e6506 100644 (file)
--- a/t/unit-tests/u-string-list.c
+++ b/t/unit-tests/u-string-list.c
@@ -169,3 +169,65 @@ void test_string_list__filter(void)
 
        t_string_list_clear(&list, 0);
 }
+
+static void t_string_list_remove_duplicates(struct string_list *list, ...)
+{
+       struct string_list expected_strings = STRING_LIST_INIT_DUP;
+       va_list ap;
+
+       va_start(ap, list);
+       t_vcreate_string_list_dup(&expected_strings, 0, ap);
+       va_end(ap);
+
+       string_list_remove_duplicates(list, 0);
+       t_string_list_equal(list, &expected_strings);
+
+       string_list_clear(&expected_strings, 0);
+}
+
+void test_string_list__remove_duplicates(void)
+{
+       struct string_list list = STRING_LIST_INIT_DUP;
+
+       t_create_string_list_dup(&list, 0, NULL);
+       t_string_list_remove_duplicates(&list, NULL);
+
+       t_create_string_list_dup(&list, 0, "", NULL);
+       t_string_list_remove_duplicates(&list, "", NULL);
+
+       t_create_string_list_dup(&list, 0, "a", NULL);
+       t_string_list_remove_duplicates(&list, "a", NULL);
+
+       t_create_string_list_dup(&list, 0, "a", "a", NULL);
+       t_string_list_remove_duplicates(&list, "a", NULL);
+
+       t_create_string_list_dup(&list, 0, "a", "a", "a", NULL);
+       t_string_list_remove_duplicates(&list, "a", NULL);
+
+       t_create_string_list_dup(&list, 0, "a", "a", "b", NULL);
+       t_string_list_remove_duplicates(&list, "a", "b", NULL);
+
+       t_create_string_list_dup(&list, 0, "a", "b", "b", NULL);
+       t_string_list_remove_duplicates(&list, "a", "b", NULL);
+
+       t_create_string_list_dup(&list, 0, "a", "b", "c", NULL);
+       t_string_list_remove_duplicates(&list, "a", "b", "c", NULL);
+
+       t_create_string_list_dup(&list, 0, "a", "a", "b", "c", NULL);
+       t_string_list_remove_duplicates(&list, "a", "b", "c", NULL);
+
+       t_create_string_list_dup(&list, 0, "a", "b", "b", "c", NULL);
+       t_string_list_remove_duplicates(&list, "a", "b", "c", NULL);
+
+       t_create_string_list_dup(&list, 0, "a", "b", "c", "c", NULL);
+       t_string_list_remove_duplicates(&list, "a", "b", "c", NULL);
+
+       t_create_string_list_dup(&list, 0, "a", "a", "b", "b", "c", "c", NULL);
+       t_string_list_remove_duplicates(&list, "a", "b", "c", NULL);
+
+       t_create_string_list_dup(&list, 0, "a", "a", "a", "b", "b", "b",
+                                "c", "c", "c", NULL);
+       t_string_list_remove_duplicates(&list, "a", "b", "c", NULL);
+
+       t_string_list_clear(&list, 0);
+}