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

test-strv.c: added strv_merge test
---

diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 07aac3a67..3ed5a0983 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -158,6 +158,24 @@ static void test_strv_sort(void) {
         assert(streq(input_table[4], "durian"));
 }
 
+static void test_strv_merge(void) {
+         _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL;
+
+         a = strv_new("abc", "def", "ghi", NULL);
+         b = strv_new("jkl", "mno", "pqr", NULL);
+
+         c = strv_merge(a, b);
+
+         assert(streq(c[0], "abc"));
+         assert(streq(c[1], "def"));
+         assert(streq(c[2], "ghi"));
+         assert(streq(c[3], "jkl"));
+         assert(streq(c[4], "mno"));
+         assert(streq(c[5], "pqr"));
+
+         assert(strv_length(c) == 6);
+}
+
 int main(int argc, char *argv[]) {
         test_specifier_printf();
         test_strv_find();
@@ -166,6 +184,7 @@ int main(int argc, char *argv[]) {
         test_strv_parse_nulstr();
         test_strv_overlap();
         test_strv_sort();
+        test_strv_merge();
 
         return 0;
 }