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 (from parent 1:
a102230
)
test-strv.c: added strv_merge_concat test
author
Daniel Buch
<boogiewasthere@gmail.com>
Wed, 13 Feb 2013 15:13:37 +0000
(16:13 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 13 Feb 2013 19:22:05 +0000
(20:22 +0100)
src/test/test-strv.c
patch
|
blob
|
history
diff --git
a/src/test/test-strv.c
b/src/test/test-strv.c
index 3ed5a09836ccd6a1ad5003fc35d4e68116753f93..fabc26e25e4844bbbd328b31e850aac2e6405964 100644
(file)
--- 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"));
}
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;
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_overlap();
test_strv_sort();
test_strv_merge();
+ test_strv_merge_concat();
return 0;
}
return 0;
}