mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2952_zero_length_substitution'

Browse Source 
* 2952_zero_length_substitution:
  Add test for mc_search_glob_prepare_replace_str().
  Ticket #2952: search: fix zero-length substitution.
This commit is contained in:
Andrew Borodin 2015-01-14 09:51:22 +03:00
commit 3fae7c227d
3 changed files with 124 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/search/regex.c
View File

@ -8,7 +8,7 @@
Written by:
Slava Zanko <slavazanko@gmail.com>, 2009, 2010, 2011, 2013
Vitaliy Filippov <vitalif@yourcmc.ru>, 2011
Andrew Borodin <aborodin@vmail.ru>, 2013
Andrew Borodin <aborodin@vmail.ru>, 2013, 2014
This file is part of the Midnight Commander.
@ -368,8 +368,8 @@ mc_search_regex__get_token_by_num (const mc_search_t * lc_mc_search, gsize lc_in
fnd_end = lc_mc_search->iovector[lc_index * 2 + 1];
#endif /* SEARCH_TYPE_GLIB */
if (fnd_end - fnd_start == 0)
return NULL;
if (fnd_end == fnd_start)
return g_strdup ("");
return g_strndup (lc_mc_search->regex_buffer->str + fnd_start, fnd_end - fnd_start);
@ -913,7 +913,6 @@ GString *
mc_search_regex_prepare_replace_str (mc_search_t * lc_mc_search, GString * replace_str)
{
GString *ret;
gchar *tmp_str;
int num_replace_tokens;
gsize loop;
@ -941,6 +940,7 @@ mc_search_regex_prepare_replace_str (mc_search_t * lc_mc_search, GString * repla
for (loop = 0; loop < replace_str->len - 1; loop++)
{
int lc_index;
gchar *tmp_str;
lc_index = mc_search_regex__process_replace_str (replace_str, loop, &len, &replace_flags);
@ -994,8 +994,6 @@ mc_search_regex_prepare_replace_str (mc_search_t * lc_mc_search, GString * repla
}
tmp_str = mc_search_regex__get_token_by_num (lc_mc_search, lc_index);
if (tmp_str == NULL)
continue;
if (loop)
mc_search_regex__process_append_str (ret, prev_str, replace_str->str - prev_str + loop,

4
tests/lib/search/Makefile.am
View File

@ -8,12 +8,16 @@ AM_CPPFLAGS = \
LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la
TESTS = \
glob_prepare_replace_str \
regex_replace_esc_seq \
regex_process_escape_sequence \
translate_replace_glob_to_regex
check_PROGRAMS = $(TESTS)
glob_prepare_replace_str_SOURCES = \
glob_prepare_replace_str.c
regex_replace_esc_seq_SOURCES = \
regex_replace_esc_seq.c

116
tests/lib/search/glob_prepare_replace_str.c Normal file
View File

@ -0,0 +1,116 @@
/*
libmc - checks for processing esc sequences in replace string
Copyright (C) 2011-2014
Free Software Foundation, Inc.
Written by:
Andrew Borodin <aborodin@vmail.ru>, 2014
This file is part of the Midnight Commander.
The Midnight Commander is free software: you can redistribute it
and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the License,
or (at your option) any later version.
The Midnight Commander is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define TEST_SUITE_NAME "lib/search/glob"
#include "tests/mctest.h"
#include "glob.c" /* for testing static functions */
/* --------------------------------------------------------------------------------------------- */
/* @DataSource("test_glob_prepare_replace_str_ds") */
/* *INDENT-OFF* */
static const struct test_glob_prepare_replace_str_ds
{
const char *input_value;
const char *glob_str;
const char *replace_str;
const char *expected_result;
} test_glob_prepare_replace_str_ds[] =
{
{ /* 0. */
"qqwwee",
"*ww*",
"\\1AA\\2",
"qqAAee"
},
{ /* 1. */
"qqwwee",
"*qq*",
"\\1SS\\2",
"SSwwee"
},
{ /* 2. */
"qqwwee",
"*ee*",
"\\1RR\\2",
"qqwwRR"
}
};
/* *INDENT-ON* */
/* @Test(dataSource = "test_glob_prepare_replace_str_ds") */
/* *INDENT-OFF* */
START_PARAMETRIZED_TEST (test_glob_prepare_replace_str, test_glob_prepare_replace_str_ds)
/* *INDENT-ON* */
{
/* given */
mc_search_t *s;
char *dest_str;
s = mc_search_new (data->glob_str, -1, NULL);
s->is_case_sensitive = TRUE;
s->search_type = MC_SEARCH_T_GLOB;
/* when */
mc_search_run (s, data->input_value, 0, strlen (data->input_value), NULL);
dest_str = mc_search_prepare_replace_str2 (s, (char *) data->replace_str);
/* then */
mctest_assert_str_eq (dest_str, data->expected_result);
g_free (dest_str);
mc_search_free (s);
}
/* *INDENT-OFF* */
END_PARAMETRIZED_TEST
/* *INDENT-ON* */
/* --------------------------------------------------------------------------------------------- */
int
main (void)
{
int number_failed;
Suite *s = suite_create (TEST_SUITE_NAME);
TCase *tc_core = tcase_create ("Core");
SRunner *sr;
/* Add new tests here: *************** */
mctest_add_parameterized_test (tc_core, test_glob_prepare_replace_str,
test_glob_prepare_replace_str_ds);
/* *********************************** */
suite_add_tcase (s, tc_core);
sr = srunner_create (s);
srunner_run_all (sr, CK_NORMAL);
number_failed = srunner_ntests_failed (sr);
srunner_free (sr);
return (number_failed == 0) ? 0 : 1;
}
/* --------------------------------------------------------------------------------------------- */