[systemd-commits] 4 commits - src/test
Thomas H.P. Andersen
phomes at kemper.freedesktop.org
Mon Feb 18 15:05:00 PST 2013
src/test/test-strv.c | 37 ++++++++++++++++++++++++++++++++++---
src/test/test-util.c | 14 ++++++++++++++
2 files changed, 48 insertions(+), 3 deletions(-)
New commits:
commit 9f316366482471667dca20aba34c1f3a36fd56c3
Author: Daniel Buch <boogiewasthere at gmail.com>
Date: Sun Feb 17 20:15:52 2013 +0100
test-strv.c: ported test_specifier_printf() to _cleanup_free_ + assert_se + cleanup
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 7f475a6..504415a 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -27,7 +27,7 @@
#include "strv.h"
static void test_specifier_printf(void) {
- char *w;
+ _cleanup_free_ char *w = NULL;
const Specifier table[] = {
{ 'a', specifier_string, (char*) "AAAA" },
@@ -36,8 +36,10 @@ static void test_specifier_printf(void) {
};
w = specifier_printf("xxx a=%a b=%b yyy", table, NULL);
- printf("<%s>\n", w);
- free(w);
+ puts(w);
+
+ assert_se(w);
+ assert_se(streq(w, "xxx a=AAAA b=BBBB yyy"));
}
static void test_strv_find(void) {
commit 04045d8426fa03fc4414d71b0454c47e951840d8
Author: Daniel Buch <boogiewasthere at gmail.com>
Date: Mon Feb 18 16:48:12 2013 +0100
test-strv.c: added OOM check for current tests
New OOM check patch:
I do assert_se() before variable is used to do correct check.
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index ea1f088..7f475a6 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -85,18 +85,23 @@ static void test_strv_join(void) {
};
p = strv_join((char **)input_table_multiple, ", ");
+ assert_se(p);
assert_se(streq(p, "one, two, three"));
q = strv_join((char **)input_table_multiple, ";");
+ assert_se(q);
assert_se(streq(q, "one;two;three"));
r = strv_join((char **)input_table_multiple, NULL);
+ assert_se(r);
assert_se(streq(r, "one two three"));
s = strv_join((char **)input_table_one, ", ");
+ assert_se(s);
assert_se(streq(s, "one"));
t = strv_join((char **)input_table_none, ", ");
+ assert_se(t);
assert_se(streq(t, ""));
}
@@ -105,6 +110,7 @@ static void test_strv_split_nulstr(void) {
const char nulstr[] = "str0\0str1\0str2\0str3\0";
l = strv_split_nulstr (nulstr);
+ assert_se(l);
assert_se(streq(l[0], "str0"));
assert_se(streq(l[1], "str1"));
@@ -117,6 +123,7 @@ static void test_strv_parse_nulstr(void) {
const char nulstr[] = "fuck\0fuck2\0fuck3\0\0fuck5\0\0xxx";
l = strv_parse_nulstr(nulstr, sizeof(nulstr)-1);
+ assert_se(l);
puts("Parse nulstr:");
strv_print(l);
@@ -175,8 +182,11 @@ static void test_strv_merge_concat(void) {
a = strv_new("without", "suffix", NULL);
b = strv_new("with", "suffix", NULL);
+ assert_se(a);
+ assert_se(b);
c = strv_merge_concat(a, b, "_suffix");
+ assert_se(c);
assert_se(streq(c[0], "without"));
assert_se(streq(c[1], "suffix"));
@@ -189,8 +199,11 @@ static void test_strv_merge(void) {
a = strv_new("abc", "def", "ghi", NULL);
b = strv_new("jkl", "mno", "pqr", NULL);
+ assert_se(a);
+ assert_se(b);
c = strv_merge(a, b);
+ assert_se(c);
assert_se(streq(c[0], "abc"));
assert_se(streq(c[1], "def"));
@@ -206,8 +219,11 @@ static void test_strv_append(void) {
_cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL;
a = strv_new("test", "test1", NULL);
+ assert_se(a);
b = strv_append(a, "test2");
c = strv_append(NULL, "test3");
+ assert_se(b);
+ assert_se(c);
assert_se(streq(b[0], "test"));
assert_se(streq(b[1], "test1"));
commit 2f213f74939e4e34700a98ff789edca1ea92456e
Author: Daniel Buch <boogiewasthere at gmail.com>
Date: Mon Feb 18 23:53:33 2013 +0100
test-strv.c: added strv_split_nulstr() test
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index a8801b5..ea1f088 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -100,6 +100,18 @@ static void test_strv_join(void) {
assert_se(streq(t, ""));
}
+static void test_strv_split_nulstr(void) {
+ _cleanup_strv_free_ char **l = NULL;
+ const char nulstr[] = "str0\0str1\0str2\0str3\0";
+
+ l = strv_split_nulstr (nulstr);
+
+ assert_se(streq(l[0], "str0"));
+ assert_se(streq(l[1], "str1"));
+ assert_se(streq(l[2], "str2"));
+ assert_se(streq(l[3], "str3"));
+}
+
static void test_strv_parse_nulstr(void) {
_cleanup_strv_free_ char **l = NULL;
const char nulstr[] = "fuck\0fuck2\0fuck3\0\0fuck5\0\0xxx";
@@ -208,6 +220,7 @@ int main(int argc, char *argv[]) {
test_strv_find();
test_strv_find_prefix();
test_strv_join();
+ test_strv_split_nulstr();
test_strv_parse_nulstr();
test_strv_overlap();
test_strv_sort();
commit 0d585d82913f06cd6174dd8d35fe5aacc3e08719
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date: Mon Feb 18 23:49:04 2013 +0100
tests: add test of memdup_multiply
diff --git a/src/test/test-util.c b/src/test/test-util.c
index 476fa09..9ba984c 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -97,12 +97,26 @@ static void test_default_term_for_tty(void) {
puts(default_term_for_tty("console"));
}
+static void test_memdup_multiply(void) {
+ int org[] = {1, 2, 3};
+ int *dup;
+
+ dup = (int*)memdup_multiply(org, sizeof(int), 3);
+
+ assert_se(dup);
+ assert_se(dup[0] == 1);
+ assert_se(dup[1] == 2);
+ assert_se(dup[2] == 3);
+ free(dup);
+}
+
int main(int argc, char *argv[]) {
test_streq_ptr();
test_first_word();
test_parse_boolean();
test_default_term_for_tty();
test_foreach_word_quoted();
+ test_memdup_multiply();
return 0;
}
More information about the systemd-commits
mailing list