![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 956cf3108c0a5d598afcb5eb75e72f938f61c3d8..cd76dff1c458f53994c7cff1383a9c14c5dd8115 100644 (file)
--- a/t/unit/core/data_test.c
+++ b/t/unit/core/data_test.c
* 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>
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;
{ 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,
},
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,
},
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;
{ SDB_TYPE_STRING, { .string = "/regex/" } },
0,
},
+ /* TODO: add support for arrays */
};
size_t i;
{ 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;
{ 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;
} },
},
},
+ {
+ { 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 } },
sdb_data_t datum;
const char *expected;
} golden_data[] = {
+ {
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ "NULL",
+ },
{
{ SDB_TYPE_INTEGER, { .integer = 4711 } },
"4711",
{ 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,
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,
"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);
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);
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 : */