From 0eca32a852593c9bda46b48a8547af7d306b60b2 Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Mon, 23 Feb 2015 16:22:37 +0300 Subject: [PATCH] Ticket #2309: "Shell patterns" broken beyond repair. Fix tests execution. Add new test which covers current functionality of glob2regexp. Signed-off-by: Slava Zanko --- m4.include/mc-tests.m4 | 2 + tests/lib/search/Makefile.am | 4 ++ ...e_glob_to_regex.c => glob_translate_to_regex.c} | 58 +++++++++++++++------- tests/lib/search/translate_replace_glob_to_regex.c | 3 +- 4 files changed, 49 insertions(+), 18 deletions(-) copy tests/lib/search/{translate_replace_glob_to_regex.c => glob_translate_to_regex.c} (64%) diff --git a/m4.include/mc-tests.m4 b/m4.include/mc-tests.m4 index cc6fc6763..037e658c3 100644 --- a/m4.include/mc-tests.m4 +++ b/m4.include/mc-tests.m4 @@ -20,6 +20,8 @@ AC_DEFUN([MC_UNIT_TESTS],[ [check >= 0.9.8], [have_check=yes], [AC_MSG_WARN(['Check' utility not found. Check your environment])]) + AC_SUBST(CHECK_CFLAGS) + AC_SUBST(CHECK_LIBS) fi AM_CONDITIONAL(HAVE_TESTS, test x"$have_check" = "xyes") diff --git a/tests/lib/search/Makefile.am b/tests/lib/search/Makefile.am index 04c63ccc1..1d88190ac 100644 --- a/tests/lib/search/Makefile.am +++ b/tests/lib/search/Makefile.am @@ -9,6 +9,7 @@ LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la TESTS = \ glob_prepare_replace_str \ + glob_translate_to_regex \ regex_replace_esc_seq \ regex_process_escape_sequence \ translate_replace_glob_to_regex @@ -26,3 +27,6 @@ regex_process_escape_sequence_SOURCES = \ translate_replace_glob_to_regex_SOURCES = \ translate_replace_glob_to_regex.c + +glob_translate_to_regex_SOURCES = \ + glob_translate_to_regex.c diff --git a/tests/lib/search/translate_replace_glob_to_regex.c b/tests/lib/search/glob_translate_to_regex.c similarity index 64% copy from tests/lib/search/translate_replace_glob_to_regex.c copy to tests/lib/search/glob_translate_to_regex.c index fccf456b1..84e540999 100644 --- a/tests/lib/search/translate_replace_glob_to_regex.c +++ b/tests/lib/search/glob_translate_to_regex.c @@ -32,46 +32,70 @@ /* --------------------------------------------------------------------------------------------- */ -/* @DataSource("test_translate_replace_glob_to_regex_ds") */ +/* @DataSource("test_glob_translate_to_regex_ds") */ /* *INDENT-OFF* */ -static const struct test_translate_replace_glob_to_regex_ds +static const struct test_glob_translate_to_regex_ds { const char *input_value; const char *expected_result; -} test_translate_replace_glob_to_regex_ds[] = +} test_glob_translate_to_regex_ds[] = { { - "a&a?a", - "a\\&a\\1a" + "test*", + "test(.*)" }, { - "a\\&a?a", - "a\\&a\\1a" + "t?es*t", + "t(.)es(.*)t" }, { - "a&a\\?a", - "a\\&a\\?a" + "te{st}", + "te(st)" }, { - "a\\&a\\?a", - "a\\&a\\?a" + "te{st|ts}", + "te(st|ts)" + }, + { + "te{st,ts}", + "te(st|ts)" + }, + { + "te[st]", + "te[st]" + }, + { + "t,e.st", + "t|e\\.st" + }, + { + "^t,e.+st+$", + "\\^t|e\\.\\+st\\+\\$" + }, + { + "te!@#$%^&*()_+|\";:'{}:><(.)\\\\\\.|/[]|\\/st" }, }; /* *INDENT-ON* */ -/* @Test(dataSource = "test_translate_replace_glob_to_regex_ds") */ +/* @Test(dataSource = "test_glob_translate_to_regex_ds") */ /* *INDENT-OFF* */ -START_PARAMETRIZED_TEST (test_translate_replace_glob_to_regex, test_translate_replace_glob_to_regex_ds) +START_PARAMETRIZED_TEST (test_glob_translate_to_regex, test_glob_translate_to_regex_ds) /* *INDENT-ON* */ { /* given */ + GString *tmp = g_string_new (data->input_value); GString *dest_str; /* when */ - dest_str = mc_search__translate_replace_glob_to_regex (data->input_value); + dest_str = mc_search__glob_translate_to_regex (tmp); /* then */ - mctest_assert_str_eq (dest_str->str, data->expected_result) g_string_free (dest_str, TRUE); + g_string_free (tmp, TRUE); + + mctest_assert_str_eq (dest_str->str, data->expected_result); + g_string_free (dest_str, TRUE); } /* *INDENT-OFF* */ END_PARAMETRIZED_TEST @@ -89,8 +113,8 @@ main (void) SRunner *sr; /* Add new tests here: *************** */ - mctest_add_parameterized_test (tc_core, test_translate_replace_glob_to_regex, - test_translate_replace_glob_to_regex_ds); + mctest_add_parameterized_test (tc_core, test_glob_translate_to_regex, + test_glob_translate_to_regex_ds); /* *********************************** */ suite_add_tcase (s, tc_core); diff --git a/tests/lib/search/translate_replace_glob_to_regex.c b/tests/lib/search/translate_replace_glob_to_regex.c index fccf456b1..86fb07adf 100644 --- a/tests/lib/search/translate_replace_glob_to_regex.c +++ b/tests/lib/search/translate_replace_glob_to_regex.c @@ -71,7 +71,8 @@ START_PARAMETRIZED_TEST (test_translate_replace_glob_to_regex, test_translate_re dest_str = mc_search__translate_replace_glob_to_regex (data->input_value); /* then */ - mctest_assert_str_eq (dest_str->str, data->expected_result) g_string_free (dest_str, TRUE); + mctest_assert_str_eq (dest_str->str, data->expected_result); + g_string_free (dest_str, TRUE); } /* *INDENT-OFF* */ END_PARAMETRIZED_TEST -- 2.11.4.GIT