u-string-list: move "test_split" into "u-string-list.c"
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" function to do this. Then port the shell script tests to C program and remove unused "test-tool" code and tests. Signed-off-by: shejialuo <shejialuo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
67cfd2924d
commit
07d90fda58
55
t/unit-tests/u-string-list.c
Normal file
55
t/unit-tests/u-string-list.c
Normal file
@@ -0,0 +1,55 @@
|
||||
#include "unit-test.h"
|
||||
#include "string-list.h"
|
||||
|
||||
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);
|
||||
|
||||
string_list_clear(list, free_util);
|
||||
while ((arg = va_arg(ap, const char *)))
|
||||
string_list_append(list, arg);
|
||||
}
|
||||
|
||||
static void t_string_list_equal(struct string_list *list,
|
||||
struct string_list *expected_strings)
|
||||
{
|
||||
cl_assert_equal_i(list->nr, expected_strings->nr);
|
||||
cl_assert(list->nr <= list->alloc);
|
||||
for (size_t i = 0; i < expected_strings->nr; i++)
|
||||
cl_assert_equal_s(list->items[i].string,
|
||||
expected_strings->items[i].string);
|
||||
}
|
||||
|
||||
static void t_string_list_split(const char *data, int delim, int maxsplit, ...)
|
||||
{
|
||||
struct string_list expected_strings = STRING_LIST_INIT_DUP;
|
||||
struct string_list list = STRING_LIST_INIT_DUP;
|
||||
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(&list, data, delim, maxsplit);
|
||||
cl_assert_equal_i(len, expected_strings.nr);
|
||||
t_string_list_equal(&list, &expected_strings);
|
||||
|
||||
string_list_clear(&expected_strings, 0);
|
||||
string_list_clear(&list, 0);
|
||||
}
|
||||
|
||||
void test_string_list__split(void)
|
||||
{
|
||||
t_string_list_split("foo:bar:baz", ':', -1, "foo", "bar", "baz", NULL);
|
||||
t_string_list_split("foo:bar:baz", ':', 0, "foo:bar:baz", NULL);
|
||||
t_string_list_split("foo:bar:baz", ':', 1, "foo", "bar:baz", NULL);
|
||||
t_string_list_split("foo:bar:baz", ':', 2, "foo", "bar", "baz", NULL);
|
||||
t_string_list_split("foo:bar:", ':', -1, "foo", "bar", "", NULL);
|
||||
t_string_list_split("", ':', -1, "", NULL);
|
||||
t_string_list_split(":", ':', -1, "", "", NULL);
|
||||
}
|
||||
Reference in New Issue
Block a user