chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cbb7712
)
test-strv.c: added strv_merge test
author
Daniel Buch
<boogiewasthere@gmail.com>
Wed, 13 Feb 2013 15:13:36 +0000
(16:13 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 13 Feb 2013 19:21:44 +0000
(20:21 +0100)
src/test/test-strv.c
patch
|
blob
|
history
diff --git
a/src/test/test-strv.c
b/src/test/test-strv.c
index 07aac3a670c96795364b37a166264b8b342d74cb..3ed5a09836ccd6a1ad5003fc35d4e68116753f93 100644
(file)
--- 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"));
}
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();
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_parse_nulstr();
test_strv_overlap();
test_strv_sort();
+ test_strv_merge();
return 0;
}
return 0;
}