1.1 --- a/test/string_tests.c Wed Jul 17 12:32:03 2013 +0200
1.2 +++ b/test/string_tests.c Wed Jul 17 15:56:01 2013 +0200
1.3 @@ -41,9 +41,9 @@
1.4 }
1.5
1.6 UCX_TEST_IMPLEMENT(test_sstr_len_cat) {
1.7 - sstr_t s1 = S("1234");
1.8 - sstr_t s2 = S(".:.:.");
1.9 - sstr_t s3 = S("X");
1.10 + sstr_t s1 = ST("1234");
1.11 + sstr_t s2 = ST(".:.:.");
1.12 + sstr_t s3 = ST("X");
1.13
1.14 size_t len = sstrnlen(3, s1, s2, s3);
1.15 sstr_t cat;
1.16 @@ -72,7 +72,7 @@
1.17 UCX_TEST_IMPLEMENT(test_sstrsplit) {
1.18
1.19 const char *original = "this,is,a,csv,string";
1.20 - sstr_t test = S("this,is,a,csv,string"); /* use copy of original here */
1.21 + sstr_t test = ST("this,is,a,csv,string"); /* use copy of original here */
1.22 size_t n;
1.23 sstr_t *list;
1.24
1.25 @@ -80,12 +80,12 @@
1.26
1.27 /* Nullpointer check */
1.28 n = 0;
1.29 - UCX_TEST_ASSERT(sstrsplit(test, ST(""), &n) == NULL,
1.30 + UCX_TEST_ASSERT(sstrsplit(test, S(""), &n) == NULL,
1.31 "empty delimiter must return NULL");
1.32
1.33 /* no delimiter occurence (ndo) */
1.34 n = 0;
1.35 - list = sstrsplit(test, ST("z"), &n);
1.36 + list = sstrsplit(test, S("z"), &n);
1.37 UCX_TEST_ASSERT(n == 1, "ndo, list length must be 1");
1.38 UCX_TEST_ASSERT(strcmp(list[0].ptr, original) == 0, "ndo, "
1.39 "original string shall be returned as single list element");
1.40 @@ -95,7 +95,7 @@
1.41
1.42 /* partially matching delimiter (pmd) */
1.43 n = 0;
1.44 - list = sstrsplit(test, ST("stringbuilder"), &n);
1.45 + list = sstrsplit(test, S("stringbuilder"), &n);
1.46 UCX_TEST_ASSERT(n == 1, "pmd, list length must be 1");
1.47 UCX_TEST_ASSERT(strcmp(list[0].ptr, original) == 0, "pmd, "
1.48 "original string shall be returned as single list element");
1.49 @@ -105,7 +105,7 @@
1.50
1.51 /* matching single-char delimiter (mscd) */
1.52 n = 0;
1.53 - list = sstrsplit(test, ST(","), &n);
1.54 + list = sstrsplit(test, S(","), &n);
1.55 UCX_TEST_ASSERT(n == 5, "mscd, list length must be 5");
1.56 UCX_TEST_ASSERT(strcmp(list[0].ptr, "this") == 0, "mscd, item 0 mismatch");
1.57 UCX_TEST_ASSERT(strcmp(list[1].ptr, "is") == 0, "mscd, item 1 mismatch");
1.58 @@ -118,7 +118,7 @@
1.59
1.60 /* matching multi-char delimiter (mmcd) */
1.61 n = 0;
1.62 - list = sstrsplit(test, ST("is"), &n);
1.63 + list = sstrsplit(test, S("is"), &n);
1.64 UCX_TEST_ASSERT(n == 3, "mscd, list length must be 3");
1.65 UCX_TEST_ASSERT(strcmp(list[0].ptr, "th") == 0, "mmcd, item 0 mismatch");
1.66 UCX_TEST_ASSERT(strcmp(list[1].ptr, ",") == 0, "mmcd, item 1 mismatch");
1.67 @@ -130,7 +130,7 @@
1.68
1.69 /* bounded list using single-char delimiter (blsc) */
1.70 n = 3;
1.71 - list = sstrsplit(test, ST(","), &n);
1.72 + list = sstrsplit(test, S(","), &n);
1.73 UCX_TEST_ASSERT(n == 3, "blsc, list length must be 3");
1.74 UCX_TEST_ASSERT(strcmp(list[0].ptr, "this") == 0, "blsc, item 0 mismatch");
1.75 UCX_TEST_ASSERT(strcmp(list[1].ptr, "is") == 0, "blsc, item 1 mismatch");
1.76 @@ -142,7 +142,7 @@
1.77
1.78 /* bounded list using multi-char delimiter (blmc) */
1.79 n = 2;
1.80 - list = sstrsplit(test, ST("is"), &n);
1.81 + list = sstrsplit(test, S("is"), &n);
1.82 UCX_TEST_ASSERT(n == 2, "blmc, list length must be 2");
1.83 UCX_TEST_ASSERT(strcmp(list[0].ptr, "th") == 0, "blmc, item 0 mismatch");
1.84 UCX_TEST_ASSERT(strcmp(list[1].ptr, ",is,a,csv,string") == 0,
1.85 @@ -153,7 +153,7 @@
1.86
1.87 /* start with delimiter (swd) */
1.88 n = 0;
1.89 - list = sstrsplit(test, ST("this"), &n);
1.90 + list = sstrsplit(test, S("this"), &n);
1.91 UCX_TEST_ASSERT(n == 2, "swd, list length must be 2");
1.92 UCX_TEST_ASSERT(list[0].length == 0, "swd, first item must be empty");
1.93 UCX_TEST_ASSERT(strcmp(list[1].ptr, ",is,a,csv,string") == 0,
1.94 @@ -164,7 +164,7 @@
1.95
1.96 /* end with delimiter (ewd) */
1.97 n = 0;
1.98 - list = sstrsplit(test, ST("string"), &n);
1.99 + list = sstrsplit(test, S("string"), &n);
1.100 UCX_TEST_ASSERT(n == 2, "ewd, list length must be 2");
1.101 UCX_TEST_ASSERT(strcmp(list[0].ptr, "this,is,a,csv,") == 0,
1.102 "swd, first item corrupt");
1.103 @@ -175,14 +175,14 @@
1.104
1.105 /* exact match (exm) */
1.106 n = 0;
1.107 - list = sstrsplit(test, ST("this,is,a,csv,string"), &n);
1.108 + list = sstrsplit(test, S("this,is,a,csv,string"), &n);
1.109 UCX_TEST_ASSERT(n == 0, "exm, list length must be 0");
1.110 UCX_TEST_ASSERT(list == NULL, "exm, list must be NULL");
1.111 free(list);
1.112
1.113 /* substring (subs) */
1.114 n = 0;
1.115 - list = sstrsplit(test, ST("this,is,a,csv,string,with,extension"), &n);
1.116 + list = sstrsplit(test, S("this,is,a,csv,string,with,extension"), &n);
1.117 UCX_TEST_ASSERT(n == 1, "subs, list length must be 1");
1.118 UCX_TEST_ASSERT(strcmp(list[0].ptr, original) == 0,
1.119 "subs, single item must be the original string");
