Code

data: Return the number of bytes that would have been returned.
[sysdb.git] / t / unit / core / data_test.c
index 2da33a19833b5d1204aa39ce2834511cb5e13031..cd76dff1c458f53994c7cff1383a9c14c5dd8115 100644 (file)
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif
+
 #include "core/data.h"
-#include "libsysdb_test.h"
+#include "testutils.h"
 
 #include <assert.h>
 #include <check.h>
@@ -225,10 +229,41 @@ END_TEST
 
 START_TEST(test_cmp)
 {
+       regex_t dummy_re;
        int64_t int_values1[] = { 1, 2, 3 };
        int64_t int_values2[] = { 1, 3, 2 };
+       double dec_values1[] = { 12.34, 47.11 };
+       double dec_values2[] = { 47.11, 12.34 };
        char *string_values1[] = { "a", "b", "c" };
        char *string_values2[] = { "a", "c", "b" };
+       sdb_time_t dt_values1[] = { 4711, 1234567890123456789L };
+       sdb_time_t dt_values2[] = { 1234567890123456789L, 4711 };
+       struct {
+               size_t length;
+               unsigned char *datum;
+       } bin_values1[] = {
+               { 3, (unsigned char *)"\x1\x2\x3" },
+               { 4, (unsigned char *)"\x42\x0\xa\x1b" },
+       };
+       struct {
+               size_t length;
+               unsigned char *datum;
+       } bin_values2[] = {
+               { 4, (unsigned char *)"\x42\x0\xa\x1b" },
+               { 3, (unsigned char *)"\x1\x2\x3" },
+       };
+       struct {
+               char *raw;
+               regex_t regex;
+       } re_values1[] = {
+               { "dummy regex A", dummy_re },
+       };
+       struct {
+               char *raw;
+               regex_t regex;
+       } re_values2[] = {
+               { "dummy regex B", dummy_re },
+       };
 
        struct {
                sdb_data_t d1;
@@ -405,6 +440,27 @@ START_TEST(test_cmp)
                        { SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
                        1,
                },
+               {
+                       { SDB_TYPE_ARRAY | SDB_TYPE_INTEGER, { .array = { 0, NULL } } },
+                       { SDB_TYPE_ARRAY | SDB_TYPE_INTEGER, { .array = { 0, NULL } } },
+                       0,
+               },
+               {
+                       { SDB_TYPE_ARRAY | SDB_TYPE_INTEGER, { .array = { 0, NULL } } },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+                               { .array = { SDB_STATIC_ARRAY_LEN(int_values1), int_values1 } },
+                       },
+                       -1,
+               },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+                               { .array = { SDB_STATIC_ARRAY_LEN(int_values1), int_values1 } },
+                       },
+                       { SDB_TYPE_ARRAY | SDB_TYPE_INTEGER, { .array = { 0, NULL } } },
+                       1,
+               },
                {
                        {
                                SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
@@ -438,6 +494,60 @@ START_TEST(test_cmp)
                        },
                        1,
                },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_DECIMAL,
+                               { .array = { SDB_STATIC_ARRAY_LEN(dec_values1), dec_values1 } },
+                       },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_DECIMAL,
+                               { .array = { SDB_STATIC_ARRAY_LEN(dec_values1), dec_values1 } },
+                       },
+                       0,
+               },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_DECIMAL,
+                               { .array = { SDB_STATIC_ARRAY_LEN(dec_values1), dec_values1 } },
+                       },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_DECIMAL,
+                               { .array = { SDB_STATIC_ARRAY_LEN(dec_values2), dec_values2 } },
+                       },
+                       -1,
+               },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_DECIMAL,
+                               { .array = { SDB_STATIC_ARRAY_LEN(dec_values2), dec_values2 } },
+                       },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_DECIMAL,
+                               { .array = { SDB_STATIC_ARRAY_LEN(dec_values1), dec_values1 } },
+                       },
+                       1,
+               },
+               {
+                       { SDB_TYPE_ARRAY | SDB_TYPE_STRING, { .array = { 0, NULL } } },
+                       { SDB_TYPE_ARRAY | SDB_TYPE_STRING, { .array = { 0, NULL } } },
+                       0,
+               },
+               {
+                       { SDB_TYPE_ARRAY | SDB_TYPE_STRING, { .array = { 0, NULL } } },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+                               { .array = { SDB_STATIC_ARRAY_LEN(string_values1), string_values1 } },
+                       },
+                       -1,
+               },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+                               { .array = { SDB_STATIC_ARRAY_LEN(string_values1), string_values1 } },
+                       },
+                       { SDB_TYPE_ARRAY | SDB_TYPE_STRING, { .array = { 0, NULL } } },
+                       1,
+               },
                {
                        {
                                SDB_TYPE_ARRAY | SDB_TYPE_STRING,
@@ -471,6 +581,105 @@ START_TEST(test_cmp)
                        },
                        1,
                },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_DATETIME,
+                               { .array = { SDB_STATIC_ARRAY_LEN(dt_values1), dt_values1 } },
+                       },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_DATETIME,
+                               { .array = { SDB_STATIC_ARRAY_LEN(dt_values1), dt_values1 } },
+                       },
+                       0,
+               },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_DATETIME,
+                               { .array = { SDB_STATIC_ARRAY_LEN(dt_values1), dt_values1 } },
+                       },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_DATETIME,
+                               { .array = { SDB_STATIC_ARRAY_LEN(dt_values2), dt_values2 } },
+                       },
+                       -1,
+               },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_DATETIME,
+                               { .array = { SDB_STATIC_ARRAY_LEN(dt_values2), dt_values2 } },
+                       },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_DATETIME,
+                               { .array = { SDB_STATIC_ARRAY_LEN(dt_values1), dt_values1 } },
+                       },
+                       1,
+               },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_BINARY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(bin_values1), bin_values1 } },
+                       },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_BINARY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(bin_values1), bin_values1 } },
+                       },
+                       0,
+               },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_BINARY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(bin_values1), bin_values1 } },
+                       },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_BINARY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(bin_values2), bin_values2 } },
+                       },
+                       -1,
+               },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_BINARY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(bin_values2), bin_values2 } },
+                       },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_BINARY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(bin_values1), bin_values1 } },
+                       },
+                       1,
+               },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_REGEX,
+                               { .array = { SDB_STATIC_ARRAY_LEN(re_values1), re_values1 } },
+                       },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_REGEX,
+                               { .array = { SDB_STATIC_ARRAY_LEN(re_values1), re_values1 } },
+                       },
+                       0,
+               },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_REGEX,
+                               { .array = { SDB_STATIC_ARRAY_LEN(re_values1), re_values1 } },
+                       },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_REGEX,
+                               { .array = { SDB_STATIC_ARRAY_LEN(re_values2), re_values2 } },
+                       },
+                       -1,
+               },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_REGEX,
+                               { .array = { SDB_STATIC_ARRAY_LEN(re_values2), re_values2 } },
+                       },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_REGEX,
+                               { .array = { SDB_STATIC_ARRAY_LEN(re_values1), re_values1 } },
+                       },
+                       1,
+               },
        };
 
        size_t i;
@@ -707,6 +916,7 @@ START_TEST(test_strcmp)
                        { SDB_TYPE_STRING, { .string = "/regex/" } },
                        0,
                },
+               /* TODO: add support for arrays */
        };
 
        size_t i;
@@ -730,21 +940,51 @@ END_TEST
 START_TEST(test_inarray)
 {
        int64_t int_values[] = { 47, 11, 64 };
+       int64_t int_values2[] = { 64, 11 };
+       int64_t int_values3[] = { 47, 11, 42 };
        double dec_values[] = { 12.3, 47.11, 64.0 };
+       double dec_values2[] = { 12.3, 47.11 };
+       double dec_values3[] = { 2.3, 47.11 };
        char *string_values[] = { "foo", "bar", "qux", "baz" };
+       char *string_values2[] = { "qux", "bar" };
+       char *string_values3[] = { "foo", "bar", "qux", "baz", "bay" };
 
        sdb_data_t int_array = {
                SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
                { .array = { SDB_STATIC_ARRAY_LEN(int_values), int_values } }
        };
+       sdb_data_t int_array2 = {
+               SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+               { .array = { SDB_STATIC_ARRAY_LEN(int_values2), int_values2 } }
+       };
+       sdb_data_t int_array3 = {
+               SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+               { .array = { SDB_STATIC_ARRAY_LEN(int_values3), int_values3 } }
+       };
        sdb_data_t dec_array = {
                SDB_TYPE_ARRAY | SDB_TYPE_DECIMAL,
                { .array = { SDB_STATIC_ARRAY_LEN(dec_values), dec_values } }
        };
+       sdb_data_t dec_array2 = {
+               SDB_TYPE_ARRAY | SDB_TYPE_DECIMAL,
+               { .array = { SDB_STATIC_ARRAY_LEN(dec_values2), dec_values2 } }
+       };
+       sdb_data_t dec_array3 = {
+               SDB_TYPE_ARRAY | SDB_TYPE_DECIMAL,
+               { .array = { SDB_STATIC_ARRAY_LEN(dec_values3), dec_values3 } }
+       };
        sdb_data_t string_array = {
                SDB_TYPE_ARRAY | SDB_TYPE_STRING,
                { .array = { SDB_STATIC_ARRAY_LEN(string_values), string_values } }
        };
+       sdb_data_t string_array2 = {
+               SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+               { .array = { SDB_STATIC_ARRAY_LEN(string_values2), string_values2 } }
+       };
+       sdb_data_t string_array3 = {
+               SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+               { .array = { SDB_STATIC_ARRAY_LEN(string_values3), string_values3 } }
+       };
 
        struct {
                sdb_data_t value;
@@ -756,8 +996,6 @@ START_TEST(test_inarray)
                { { SDB_TYPE_INTEGER, { .integer = 64    } }, int_array,    1 },
                { { SDB_TYPE_INTEGER, { .integer = 65    } }, int_array,    0 },
                { { SDB_TYPE_NULL,    { .integer = 0     } }, int_array,    0 },
-               { int_array, { SDB_TYPE_INTEGER, { .integer = 47    } },    0 },
-               { int_array, int_array, 0 },
                { { SDB_TYPE_DECIMAL, { .decimal = 12.3  } }, dec_array,    1 },
                { { SDB_TYPE_DECIMAL, { .decimal = 47.11 } }, dec_array,    1 },
                { { SDB_TYPE_DECIMAL, { .decimal = 64.0  } }, dec_array,    1 },
@@ -773,6 +1011,46 @@ START_TEST(test_inarray)
                { { SDB_TYPE_STRING,  { .string  = "ba"  } }, string_array, 0 },
                { { SDB_TYPE_STRING,  { .string  = "abc" } }, string_array, 0 },
                { { SDB_TYPE_NULL,    { .integer = 0     } }, string_array, 0 },
+               { int_array, { SDB_TYPE_INTEGER, { .integer = 47 } },       0 },
+               { int_array,     int_array,    1 },
+               { int_array2,    int_array,    1 },
+               { int_array3,    int_array,    0 },
+               { dec_array2,    int_array,    0 },
+               { string_array2, int_array,    0 },
+               { dec_array,     dec_array,    1 },
+               { dec_array2,    dec_array,    1 },
+               { dec_array3,    dec_array,    0 },
+               { int_array2,    dec_array,    0 },
+               { string_array2, dec_array,    0 },
+               { string_array,  string_array, 1 },
+               { string_array2, string_array, 1 },
+               { string_array3, string_array, 0 },
+               { int_array2,    string_array, 0 },
+               { dec_array2,    string_array, 0 },
+               {
+                       { SDB_TYPE_INTEGER | SDB_TYPE_ARRAY, { .array = { 0, NULL } } },
+                       int_array, 1,
+               },
+               {
+                       { SDB_TYPE_INTEGER | SDB_TYPE_ARRAY, { .array = { 0, NULL } } },
+                       dec_array, 0,
+               },
+               {
+                       { SDB_TYPE_DECIMAL | SDB_TYPE_ARRAY, { .array = { 0, NULL } } },
+                       dec_array, 1,
+               },
+               {
+                       { SDB_TYPE_DECIMAL | SDB_TYPE_ARRAY, { .array = { 0, NULL } } },
+                       int_array, 0,
+               },
+               {
+                       { SDB_TYPE_STRING | SDB_TYPE_ARRAY, { .array = { 0, NULL } } },
+                       string_array, 1,
+               },
+               {
+                       { SDB_TYPE_STRING | SDB_TYPE_ARRAY, { .array = { 0, NULL } } },
+                       dec_array, 0,
+               },
        };
 
        size_t i;
@@ -833,6 +1111,18 @@ START_TEST(test_array_get)
                { string_array, 4, { -1, { .integer = 0 } } },
                { { SDB_TYPE_INTEGER, { .integer = 666 } }, 0, { -1, { .integer = 0 } } },
                { { SDB_TYPE_INTEGER, { .integer = 666 } }, 1, { -1, { .integer = 0 } } },
+               {
+                       { SDB_TYPE_ARRAY | SDB_TYPE_INTEGER, { .array = { 0, NULL } } },
+                       0, { -1, { .integer = 0 } },
+               },
+               {
+                       { SDB_TYPE_ARRAY | SDB_TYPE_DECIMAL, { .array = { 0, NULL } } },
+                       0, { -1, { .integer = 0 } },
+               },
+               {
+                       { SDB_TYPE_ARRAY | SDB_TYPE_STRING, { .array = { 0, NULL } } },
+                       0, { -1, { .integer = 0 } },
+               },
        };
 
        size_t i;
@@ -911,8 +1201,12 @@ START_TEST(test_expr_eval)
        sdb_data_t err = { -1, { .integer = 0 } };
 
        int64_t int_values[] = { 47, 11, 23 };
+       int64_t expected_int_append[] = { 47, 11, 23, 42 };
+       int64_t expected_int_prepend[] = { 42, 47, 11, 23 };
        int64_t expected_int_concat[] = { 47, 11, 23, 47, 11, 23 };
        char *string_values[] = { "foo", "bar", "qux" "baz" };
+       char *expected_string_append[] = { "foo", "bar", "qux" "baz", "bay" };
+       char *expected_string_prepend[] = { "bay", "foo", "bar", "qux" "baz" };
        char *expected_string_concat[] =
                { "foo", "bar", "qux" "baz", "foo", "bar", "qux" "baz" };
 
@@ -1077,6 +1371,44 @@ START_TEST(test_expr_eval)
                                } },
                        },
                },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+                               { .array = { SDB_STATIC_ARRAY_LEN(int_values), int_values } },
+                       },
+                       { SDB_TYPE_INTEGER, { .integer = 42 }, },
+                       err,
+                       err,
+                       err,
+                       err,
+                       err,
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+                               { .array = {
+                                               SDB_STATIC_ARRAY_LEN(expected_int_append),
+                                               expected_int_append
+                               } },
+                       },
+               },
+               {
+                       { SDB_TYPE_INTEGER, { .integer = 42 }, },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+                               { .array = { SDB_STATIC_ARRAY_LEN(int_values), int_values } },
+                       },
+                       err,
+                       err,
+                       err,
+                       err,
+                       err,
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+                               { .array = {
+                                               SDB_STATIC_ARRAY_LEN(expected_int_prepend),
+                                               expected_int_prepend
+                               } },
+                       },
+               },
                {
                        {
                                SDB_TYPE_ARRAY | SDB_TYPE_STRING,
@@ -1099,6 +1431,108 @@ START_TEST(test_expr_eval)
                                } },
                        },
                },
+               {
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+                               { .array = { SDB_STATIC_ARRAY_LEN(string_values), string_values } },
+                       },
+                       { SDB_TYPE_STRING, { .string = "bay" } },
+                       err,
+                       err,
+                       err,
+                       err,
+                       err,
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+                               { .array = {
+                                               SDB_STATIC_ARRAY_LEN(expected_string_append),
+                                               expected_string_append
+                               } },
+                       },
+               },
+               {
+                       { SDB_TYPE_STRING, { .string = "bay" } },
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+                               { .array = { SDB_STATIC_ARRAY_LEN(string_values), string_values } },
+                       },
+                       err,
+                       err,
+                       err,
+                       err,
+                       err,
+                       {
+                               SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+                               { .array = {
+                                               SDB_STATIC_ARRAY_LEN(expected_string_prepend),
+                                               expected_string_prepend
+                               } },
+                       },
+               },
+               {
+                       { SDB_TYPE_INTEGER | SDB_TYPE_ARRAY, { .array = { 0, NULL } } },
+                       {
+                               SDB_TYPE_INTEGER | SDB_TYPE_ARRAY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(int_values), int_values } },
+                       },
+                       err,
+                       err,
+                       err,
+                       err,
+                       err,
+                       {
+                               SDB_TYPE_INTEGER | SDB_TYPE_ARRAY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(int_values), int_values } },
+                       },
+               },
+               {
+                       {
+                               SDB_TYPE_INTEGER | SDB_TYPE_ARRAY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(int_values), int_values } },
+                       },
+                       { SDB_TYPE_INTEGER | SDB_TYPE_ARRAY, { .array = { 0, NULL } } },
+                       err,
+                       err,
+                       err,
+                       err,
+                       err,
+                       {
+                               SDB_TYPE_INTEGER | SDB_TYPE_ARRAY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(int_values), int_values } },
+                       },
+               },
+               {
+                       { SDB_TYPE_STRING | SDB_TYPE_ARRAY, { .array = { 0, NULL } } },
+                       {
+                               SDB_TYPE_STRING | SDB_TYPE_ARRAY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(string_values), string_values } },
+                       },
+                       err,
+                       err,
+                       err,
+                       err,
+                       err,
+                       {
+                               SDB_TYPE_STRING | SDB_TYPE_ARRAY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(string_values), string_values } },
+                       },
+               },
+               {
+                       {
+                               SDB_TYPE_STRING | SDB_TYPE_ARRAY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(string_values), string_values } },
+                       },
+                       { SDB_TYPE_STRING | SDB_TYPE_ARRAY, { .array = { 0, NULL } } },
+                       err,
+                       err,
+                       err,
+                       err,
+                       err,
+                       {
+                               SDB_TYPE_STRING | SDB_TYPE_ARRAY,
+                               { .array = { SDB_STATIC_ARRAY_LEN(string_values), string_values } },
+                       },
+               },
                {
                        { SDB_TYPE_NULL, { .integer = 0 } },
                        { SDB_TYPE_NULL, { .integer = 0 } },
@@ -1598,6 +2032,10 @@ START_TEST(test_format)
                sdb_data_t datum;
                const char *expected;
        } golden_data[] = {
+               {
+                       { SDB_TYPE_NULL, { .integer = 0 } },
+                       "NULL",
+               },
                {
                        { SDB_TYPE_INTEGER, { .integer = 4711 } },
                        "4711",
@@ -1641,6 +2079,10 @@ START_TEST(test_format)
                        { SDB_TYPE_REGEX, { .re = { "some regex", empty_re } } },
                        "\"/some regex/\"",
                },
+               {
+                       { SDB_TYPE_INTEGER | SDB_TYPE_ARRAY, { .array = { 0, NULL } } },
+                       "[]",
+               },
                {
                        {
                                SDB_TYPE_INTEGER | SDB_TYPE_ARRAY,
@@ -1662,10 +2104,11 @@ START_TEST(test_format)
        for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
                sdb_data_t *datum = &golden_data[i].datum;
                char buf[sdb_data_strlen(datum) + 2];
-               int check;
+               size_t check_null, check;
 
                memset(buf, (int)'A', sizeof(buf));
 
+               check_null = sdb_data_format(datum, NULL, 0, SDB_DOUBLE_QUOTED);
                check = sdb_data_format(datum, buf, sizeof(buf) - 1,
                                SDB_DOUBLE_QUOTED);
                fail_unless(check > 0,
@@ -1675,7 +2118,17 @@ START_TEST(test_format)
                                "sdb_data_format(type=%s) used wrong format: %s; expected: %s",
                                SDB_TYPE_TO_STRING(datum->type), buf, golden_data[i].expected);
 
-               fail_unless((size_t)check <= sizeof(buf) - 2,
+               fail_unless(check_null == check,
+                               "sdb_data_format(type=%s, NULL) = %d; "
+                               "expected %d (matching sdb_data_format(type=%s, <buf>))",
+                               SDB_TYPE_TO_STRING(datum->type), check_null,
+                               check, SDB_TYPE_TO_STRING(datum->type));
+               fail_unless(check == strlen(golden_data[i].expected),
+                               "sdb_data_format(type=%s) = %d; expected %zu (strlen)",
+                               SDB_TYPE_TO_STRING(datum->type), check,
+                               strlen(golden_data[i].expected));
+
+               fail_unless(check <= sizeof(buf) - 2,
                                "sdb_data_format(type=%s) wrote %d bytes; "
                                "expected <= %zu based on sdb_data_strlen()",
                                SDB_TYPE_TO_STRING(datum->type), check, sizeof(buf) - 2);
@@ -1734,30 +2187,25 @@ START_TEST(test_parse)
                                golden_data[i].input, type);
 
                if (type == SDB_TYPE_STRING)
-                       fail_unless(golden_data[i].input == result.data.string,
-                                       "sdb_data_parse(%s, %d, <d>) modified input string",
+                       fail_unless(golden_data[i].input != result.data.string,
+                                       "sdb_data_parse(%s, %d, <d>) copied input string",
                                        golden_data[i].input, type);
                if (type == SDB_TYPE_BINARY)
-                       fail_unless(golden_data[i].input == (char *)result.data.binary.datum,
-                                       "sdb_data_parse(%s, %d, <d>) modified input string",
+                       fail_unless(golden_data[i].input != (char *)result.data.binary.datum,
+                                       "sdb_data_parse(%s, %d, <d>) copied input string",
                                        golden_data[i].input, type);
-               if (type == SDB_TYPE_REGEX) {
+               if (type == SDB_TYPE_REGEX)
                        fail_unless(golden_data[i].input != result.data.re.raw,
                                        "sdb_data_parse(%s, %d, <d>) copied input string",
                                        golden_data[i].input, type);
-                       sdb_data_free_datum(&result);
-               }
+               sdb_data_free_datum(&result);
        }
 }
 END_TEST
 
-Suite *
-core_data_suite(void)
+TEST_MAIN("core::data")
 {
-       Suite *s = suite_create("core::data");
-       TCase *tc;
-
-       tc = tcase_create("core");
+       TCase *tc = tcase_create("core");
        tcase_add_test(tc, test_data);
        tcase_add_test(tc, test_cmp);
        tcase_add_test(tc, test_strcmp);
@@ -1767,10 +2215,9 @@ core_data_suite(void)
        tcase_add_test(tc, test_expr_eval);
        tcase_add_test(tc, test_format);
        tcase_add_test(tc, test_parse);
-       suite_add_tcase(s, tc);
-
-       return s;
-} /* core_data_suite */
+       ADD_TCASE(tc);
+}
+TEST_MAIN_END
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */