From: Daniel Buch <boogiewasthere@gmail.com>
Date: Wed, 13 Feb 2013 15:13:37 +0000 (+0100)
Subject: test-strv.c: added strv_merge_concat test
X-Git-Tag: v198~260
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=343a896935b9573949f57918c375ad783d71febf;hp=a1022300b9f5af6249292acf93f5c6d4bf45e655;p=elogind.git

test-strv.c: added strv_merge_concat test
---

diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 3ed5a0983..fabc26e25 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;
 }