dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-03 22:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
shejialuo
2025-06-29 12:28:32 +08:00
committed by Junio C Hamano
parent 62c514a9ef
commit 7e7ce78265
3 changed files with 73 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
t/helper/test-string-list.c
View File

@@ -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;

11
t/t0063-string-list.sh
View File

@@ -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 "")" &&

73
t/unit-tests/u-string-list.c
View File

@@ -13,6 +13,26 @@ 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);
cl_assert_equal_p(list->items, NULL);
cl_assert_equal_i(list->nr, 0);
cl_assert_equal_i(list->alloc, 0);
}
static void t_string_list_equal(struct string_list *list,
struct string_list *expected_strings)
{
@@ -90,3 +110,56 @@ void test_string_list__split_in_place(void)
t_string_list_split_in_place("foo:;:bar:;:", ":;", -1,
"foo", "", "", "bar", "", "", "", NULL);
}
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, ...)
{
struct string_list expected_strings = STRING_LIST_INIT_DUP;
const char *prefix = "y";
va_list ap;
va_start(ap, list);
t_vcreate_string_list_dup(&expected_strings, 0, ap);
va_end(ap);
filter_string_list(list, 0, prefix_cb, (void *)prefix);
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;
t_create_string_list_dup(&list, 0, NULL);
t_string_list_filter(&list, NULL);
t_create_string_list_dup(&list, 0, "no", NULL);
t_string_list_filter(&list, NULL);
t_create_string_list_dup(&list, 0, "yes", NULL);
t_string_list_filter(&list, "yes", NULL);
t_create_string_list_dup(&list, 0, "no", "yes", NULL);
t_string_list_filter(&list, "yes", NULL);
t_create_string_list_dup(&list, 0, "yes", "no", NULL);
t_string_list_filter(&list, "yes", NULL);
t_create_string_list_dup(&list, 0, "y1", "y2", NULL);
t_string_list_filter(&list, "y1", "y2", NULL);
t_create_string_list_dup(&list, 0, "y2", "y1", NULL);
t_string_list_filter(&list, "y2", "y1", NULL);
t_create_string_list_dup(&list, 0, "x1", "x2", NULL);
t_string_list_filter(&list, NULL);
t_string_list_clear(&list, 0);
}