aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Added more tests to str_replace

Browse Source 
Handles NULLs and empty strings better
This commit is contained in:
James Booth 2012-04-19 22:57:22 +01:00
parent 366eecc195
commit 4f454b6a64
2 changed files with 102 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
test_util.c
View File

@ -57,6 +57,94 @@ void replace_char(void)
assert_string_equals("some & a thing & something else", result);
}
void replace_when_none(void)
{
char *string = "its another string";
char *sub = "haha";
char *new = "replaced";
char *result = str_replace(string, sub, new);
assert_string_equals("its another string", result);
}
void replace_when_match(void)
{
char *string = "hello";
char *sub = "hello";
char *new = "goodbye";
char *result = str_replace(string, sub, new);
assert_string_equals("goodbye", result);
}
void replace_when_string_empty(void)
{
char *string = "";
char *sub = "hello";
char *new = "goodbye";
char *result = str_replace(string, sub, new);
assert_string_equals("", result);
}
void replace_when_string_null(void)
{
char *string = NULL;
char *sub = "hello";
char *new = "goodbye";
char *result = str_replace(string, sub, new);
assert_is_null(result);
}
void replace_when_sub_empty(void)
{
char *string = "hello";
char *sub = "";
char *new = "goodbye";
char *result = str_replace(string, sub, new);
assert_string_equals("hello", result);
}
void replace_when_sub_null(void)
{
char *string = "hello";
char *sub = NULL;
char *new = "goodbye";
char *result = str_replace(string, sub, new);
assert_string_equals("hello", result);
}
void replace_when_new_empty(void)
{
char *string = "hello";
char *sub = "hello";
char *new = "";
char *result = str_replace(string, sub, new);
assert_string_equals("", result);
}
void replace_when_new_null(void)
{
char *string = "hello";
char *sub = "hello";
char *new = NULL;
char *result = str_replace(string, sub, new);
assert_string_equals("hello", result);
}
void register_util_tests(void)
{
TEST_MODULE("util tests");
@ -65,4 +153,12 @@ void register_util_tests(void)
TEST(replace_one_substr_end);
TEST(replace_two_substr);
TEST(replace_char);
TEST(replace_when_none);
TEST(replace_when_match);
TEST(replace_when_string_empty);
TEST(replace_when_string_null);
TEST(replace_when_sub_empty);
TEST(replace_when_sub_null);
TEST(replace_when_new_empty);
TEST(replace_when_new_null);
}

7
util.c
View File

@ -62,7 +62,12 @@ char * str_replace (const char *string, const char *substr,
char *oldstr = NULL;
char *head = NULL;
if ( substr == NULL || replacement == NULL )
if (string == NULL)
return NULL;
if ( substr == NULL ||
replacement == NULL ||
(strcmp(substr, "") == 0))
return strdup (string);
newstr = strdup (string);