1.1 --- a/test/string_tests.c Wed Feb 27 14:52:52 2013 +0100
1.2 +++ b/test/string_tests.c Wed Feb 27 16:59:02 2013 +0100
1.3 @@ -21,22 +21,15 @@
1.4 sstr_t s2 = S(".:.:.");
1.5 sstr_t s3 = S("X");
1.6
1.7 + size_t len = sstrnlen(3, s1, s2, s3);
1.8 sstr_t cat;
1.9 -
1.10 - size_t len = sstrnlen(3, s1, s2, s3);
1.11 + cat.ptr = (char*) malloc(16);
1.12 + cat.length = 16;
1.13 + cat = sstrncat(3, cat, s1, s2, s3);
1.14
1.15 UCX_TEST_BEGIN
1.16
1.17 - UCX_TEST_ASSERT(len == s1.length + s2.length + s3.length,
1.18 - "sstrnlen returned wrong size");
1.19 -
1.20 - len = s1.length + s2.length + s3.length;
1.21 -
1.22 - cat.ptr = (char*) malloc(len + 1);
1.23 - cat.ptr[len] = 0;
1.24 - cat.length = len;
1.25 -
1.26 - sstrncat(3, cat, s1, s2, s3);
1.27 + UCX_TEST_ASSERT(len == 10, "sstrnlen returned wrong size");
1.28
1.29 UCX_TEST_ASSERT(cat.ptr[0] == '1', "sstrncat, wrong content");
1.30 UCX_TEST_ASSERT(cat.ptr[1] == '2', "sstrncat, wrong content");
1.31 @@ -45,6 +38,7 @@
1.32 UCX_TEST_ASSERT(cat.ptr[4] == '.', "sstrncat, wrong content");
1.33 UCX_TEST_ASSERT(cat.ptr[8] == '.', "sstrncat, wrong content");
1.34 UCX_TEST_ASSERT(cat.ptr[9] == 'X', "sstrncat, wrong content");
1.35 + UCX_TEST_ASSERT(cat.length == 10, "sstrncat, wrong length");
1.36
1.37 UCX_TEST_END
1.38
1.39 @@ -176,8 +170,8 @@
1.40 }
1.41
1.42 UCX_TEST_IMPLEMENT(test_sstrtrim) {
1.43 - sstr_t test = sstrtrim(sstr(" ein test "));
1.44 - sstr_t empty = sstrtrim(sstr(""));
1.45 + sstr_t test = sstrtrim(sstr((char*)" ein test "));
1.46 + sstr_t empty = sstrtrim(sstr((char*)""));
1.47 UCX_TEST_BEGIN
1.48 UCX_TEST_ASSERT(strncmp(test.ptr, "ein test", test.length) == 0, "failed");
1.49 UCX_TEST_ASSERT(empty.length == 0, "empty string failed");
