summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Buch <boogiewasthere@gmail.com>2013-02-13 16:13:37 +0100
committerLennart Poettering <lennart@poettering.net>2013-02-13 20:22:05 +0100
commit343a896935b9573949f57918c375ad783d71febf (patch)
tree4d86e8970b93437f2074c906b42432ca72436546
parenta1022300b9f5af6249292acf93f5c6d4bf45e655 (diff)
test-strv.c: added strv_merge_concat test
-rw-r--r--src/test/test-strv.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 3ed5a09836..fabc26e25e 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -158,6 +158,20 @@ static void test_strv_sort(void) {
assert(streq(input_table[4], "durian"));
}
+static void test_strv_merge_concat(void) {
+ _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL;
+
+ a = strv_new("without", "suffix", NULL);
+ b = strv_new("with", "suffix", NULL);
+
+ c = strv_merge_concat(a, b, "_suffix");
+
+ assert(streq(c[0], "without"));
+ assert(streq(c[1], "suffix"));
+ assert(streq(c[2], "with_suffix"));
+ assert(streq(c[3], "suffix_suffix"));
+}
+
static void test_strv_merge(void) {
_cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL;
@@ -185,6 +199,7 @@ int main(int argc, char *argv[]) {
test_strv_overlap();
test_strv_sort();
test_strv_merge();
+ test_strv_merge_concat();
return 0;
}