![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 742466eec0008c599824de8c49bb37aacefc3d65..a647e020bb7e63b8b34d3d95c6eee81201c00474 100644 (file)
--- a/t/unit/core/data_test.c
+++ b/t/unit/core/data_test.c
sdb_data_t d1, d2;
int check;
+ int64_t int_values[] = { 47, 11, 23 };
+ char *string_values[] = { "foo", "bar", "qux" "baz" };
+ size_t i;
+
d2.type = SDB_TYPE_INTEGER;
d2.data.integer = 4711;
memset(&d1, 0, sizeof(d1));
fail_unless(d1.type == d2.type,
"sdb_data_copy() didn't copy type; got: %i; expected: %i",
d1.type, d2.type);
- fail_unless(d1.data.re.raw == d2.data.re.raw,
- "sdb_data_copy() didn't copy raw regex: got: %s; expected: %s",
- d1.data.re.raw, d2.data.re.raw);
+ d2.type = SDB_TYPE_ARRAY | SDB_TYPE_INTEGER;
+ d2.data.array.length = SDB_STATIC_ARRAY_LEN(int_values);
+ d2.data.array.values = int_values;
+ check = sdb_data_copy(&d1, &d2);
+ fail_unless(!check, "sdb_data_copy() = %i; expected: 0", check);
+ fail_unless(d1.type == d2.type,
+ "sdb_data_copy() didn't copy type; got: %i; expected: %i",
+ d1.type, d2.type);
+ fail_unless(d1.data.array.values != d2.data.array.values,
+ "sdb_data_copy() didn't copy values: got: %p; expected: %p",
+ d1.data.array.values, d2.data.array.values);
+ for (i = 0; i < SDB_STATIC_ARRAY_LEN(int_values); ++i) {
+ int *i1 = d1.data.array.values;
+ int *i2 = d2.data.array.values;
+ fail_unless(i1[i] == i2[i],
+ "sdb_data_copy() modified integer value %d: "
+ "got: %d; expected: %d", i, i1[i], i2[i]);
+ }
+ sdb_data_free_datum(&d1);
+
+ d2.type = SDB_TYPE_ARRAY | SDB_TYPE_STRING;
+ d2.data.array.length = SDB_STATIC_ARRAY_LEN(string_values);
+ d2.data.array.values = string_values;
+ check = sdb_data_copy(&d1, &d2);
+ fail_unless(!check, "sdb_data_copy() = %i; expected: 0", check);
+ fail_unless(d1.type == d2.type,
+ "sdb_data_copy() didn't copy type; got: %i; expected: %i",
+ d1.type, d2.type);
+ fail_unless(d1.data.array.values != d2.data.array.values,
+ "sdb_data_copy() didn't copy values: got: %p; expected: %p",
+ d1.data.array.values, d2.data.array.values);
+ for (i = 0; i < SDB_STATIC_ARRAY_LEN(string_values); ++i) {
+ char **s1 = d1.data.array.values;
+ char **s2 = d2.data.array.values;
+ fail_unless(s1[i] != s2[i],
+ "sdb_data_copy() didn't copy string value %d", i);
+ fail_unless(!strcmp(s1[i], s2[i]),
+ "sdb_data_copy() modified string value %d: "
+ "got: %s; expected: %s", i, s1[i], s2[i]);
+ }
sdb_data_free_datum(&d1);
- fail_unless(d1.data.re.raw == NULL,
- "sdb_data_free_datum() didn't reset raw regex");
}
END_TEST
START_TEST(test_cmp)
{
+ int64_t int_values1[] = { 1, 2, 3 };
+ int64_t int_values2[] = { 1, 3, 2 };
+ char *string_values1[] = { "a", "b", "c" };
+ char *string_values2[] = { "a", "c", "b" };
+
struct {
sdb_data_t d1;
sdb_data_t d2;
{ SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
1,
},
+ {
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+ { .array = { SDB_STATIC_ARRAY_LEN(int_values1), int_values1 } },
+ },
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+ { .array = { SDB_STATIC_ARRAY_LEN(int_values1), int_values1 } },
+ },
+ 0,
+ },
+ {
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+ { .array = { SDB_STATIC_ARRAY_LEN(int_values1), int_values1 } },
+ },
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+ { .array = { SDB_STATIC_ARRAY_LEN(int_values2), int_values2 } },
+ },
+ -1,
+ },
+ {
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+ { .array = { SDB_STATIC_ARRAY_LEN(int_values2), int_values2 } },
+ },
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+ { .array = { SDB_STATIC_ARRAY_LEN(int_values1), int_values1 } },
+ },
+ 1,
+ },
+ {
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+ { .array = { SDB_STATIC_ARRAY_LEN(string_values1), string_values1 } },
+ },
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+ { .array = { SDB_STATIC_ARRAY_LEN(string_values1), string_values1 } },
+ },
+ 0,
+ },
+ {
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+ { .array = { SDB_STATIC_ARRAY_LEN(string_values1), string_values1 } },
+ },
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+ { .array = { SDB_STATIC_ARRAY_LEN(string_values2), string_values2 } },
+ },
+ -1,
+ },
+ {
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+ { .array = { SDB_STATIC_ARRAY_LEN(string_values2), string_values2 } },
+ },
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+ { .array = { SDB_STATIC_ARRAY_LEN(string_values1), string_values1 } },
+ },
+ 1,
+ },
};
size_t i;
}
END_TEST
+START_TEST(test_inarray)
+{
+ int64_t int_values[] = { 47, 11, 64 };
+ double dec_values[] = { 12.3, 47.11, 64.0 };
+ char *string_values[] = { "foo", "bar", "qux", "baz" };
+
+ sdb_data_t int_array = {
+ SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+ { .array = { SDB_STATIC_ARRAY_LEN(int_values), int_values } }
+ };
+ sdb_data_t dec_array = {
+ SDB_TYPE_ARRAY | SDB_TYPE_DECIMAL,
+ { .array = { SDB_STATIC_ARRAY_LEN(dec_values), dec_values } }
+ };
+ sdb_data_t string_array = {
+ SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+ { .array = { SDB_STATIC_ARRAY_LEN(string_values), string_values } }
+ };
+
+ struct {
+ sdb_data_t value;
+ sdb_data_t array;
+ _Bool expected;
+ } golden_data[] = {
+ { { SDB_TYPE_INTEGER, { .integer = 47 } }, int_array, 1 },
+ { { SDB_TYPE_INTEGER, { .integer = 11 } }, int_array, 1 },
+ { { 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 },
+ { { SDB_TYPE_DECIMAL, { .decimal = 60.0 } }, dec_array, 0 },
+ { { SDB_TYPE_INTEGER, { .integer = 64 } }, dec_array, 0 },
+ { { SDB_TYPE_NULL, { .integer = 0 } }, dec_array, 0 },
+ { { SDB_TYPE_STRING, { .string = "Foo" } }, string_array, 1 },
+ { { SDB_TYPE_STRING, { .string = "FOO" } }, string_array, 1 },
+ { { SDB_TYPE_STRING, { .string = "foo" } }, string_array, 1 },
+ { { SDB_TYPE_STRING, { .string = "bar" } }, string_array, 1 },
+ { { SDB_TYPE_STRING, { .string = "qux" } }, string_array, 1 },
+ { { SDB_TYPE_STRING, { .string = "baz" } }, string_array, 1 },
+ { { SDB_TYPE_STRING, { .string = "ba" } }, string_array, 0 },
+ { { SDB_TYPE_STRING, { .string = "abc" } }, string_array, 0 },
+ { { SDB_TYPE_NULL, { .integer = 0 } }, string_array, 0 },
+ };
+
+ size_t i;
+
+ for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+ char v_str[1024] = "", a_str[1024] = "";
+ _Bool check;
+
+ sdb_data_format(&golden_data[i].value,
+ v_str, sizeof(v_str), SDB_UNQUOTED);
+ sdb_data_format(&golden_data[i].array,
+ a_str, sizeof(a_str), SDB_UNQUOTED);
+
+ check = sdb_data_inarray(&golden_data[i].value, &golden_data[i].array);
+ fail_unless(check == golden_data[i].expected,
+ "sdb_data_inarray(%s, %s) = %d; expected: %d",
+ v_str, a_str, check, golden_data[i].expected);
+ }
+}
+END_TEST
+
+START_TEST(test_parse_op)
+{
+ struct {
+ const char *op;
+ int id;
+ } golden_data[] = {
+ { "+", SDB_DATA_ADD },
+ { "-", SDB_DATA_SUB },
+ { "*", SDB_DATA_MUL },
+ { "/", SDB_DATA_DIV },
+ { "%", SDB_DATA_MOD },
+ { "||", SDB_DATA_CONCAT },
+ { "&&", -1 },
+ };
+
+ size_t i;
+
+ for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+ const char *op;
+ int id;
+
+ id = sdb_data_parse_op(golden_data[i].op);
+ fail_unless(id == golden_data[i].id,
+ "sdb_data_parse_op(%s) = %d; expected: %d",
+ golden_data[i].op, id, golden_data[i].id);
+
+ if (id <= 0)
+ continue;
+
+ op = SDB_DATA_OP_TO_STRING(id);
+ fail_unless(!strcmp(op, golden_data[i].op),
+ "SDB_DATA_OP_TO_STRING(%d) = '%s'; expected: '%s'",
+ id, op, golden_data[i].op);
+ }
+}
+END_TEST
+
START_TEST(test_expr_eval)
{
+ sdb_data_t err = { -1, { .integer = 0 } };
+
+ int64_t int_values[] = { 47, 11, 23 };
+ int64_t expected_int_concat[] = { 47, 11, 23, 47, 11, 23 };
+ char *string_values[] = { "foo", "bar", "qux" "baz" };
+ char *expected_string_concat[] =
+ { "foo", "bar", "qux" "baz", "foo", "bar", "qux" "baz" };
+
struct {
sdb_data_t d1;
sdb_data_t d2;
{ SDB_TYPE_INTEGER, { .integer = 221417 } },
{ SDB_TYPE_INTEGER, { .integer = 100 } },
{ SDB_TYPE_INTEGER, { .integer = 11 } },
- SDB_DATA_INIT,
+ err,
},
{
{ SDB_TYPE_DECIMAL, { .decimal = 35.0 } },
{ SDB_TYPE_DECIMAL, { .decimal = 612.5 } },
{ SDB_TYPE_DECIMAL, { .decimal = 2.0 } },
{ SDB_TYPE_DECIMAL, { .decimal = 0.0 } },
- SDB_DATA_INIT,
+ err,
},
{
{ SDB_TYPE_STRING, { .string = NULL } },
{ SDB_TYPE_STRING, { .string = "" } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- { SDB_TYPE_STRING, { .string = "" } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
},
{
{ SDB_TYPE_STRING, { .string = NULL } },
{ SDB_TYPE_STRING, { .string = NULL } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- { SDB_TYPE_STRING, { .string = NULL } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
},
{
{ SDB_TYPE_STRING, { .string = "" } },
{ SDB_TYPE_STRING, { .string = NULL } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- { SDB_TYPE_STRING, { .string = "" } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
},
{
{ SDB_TYPE_STRING, { .string = "a" } },
{ SDB_TYPE_STRING, { .string = "b" } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
+ err,
+ err,
+ err,
+ err,
+ err,
{ SDB_TYPE_STRING, { .string = "ab" } },
},
{
{ SDB_TYPE_DATETIME, { .datetime = 221957403521 } },
{ SDB_TYPE_DATETIME, { .datetime = 10001 } },
{ SDB_TYPE_DATETIME, { .datetime = 0 } },
- SDB_DATA_INIT,
+ err,
},
{
{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
{ SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- { SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
},
{
{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- { SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
},
{
{ SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- { SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
},
{
{
SDB_TYPE_BINARY,
{ .binary = { 3, (unsigned char *)"b\0b" } },
},
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
+ err,
+ err,
+ err,
+ err,
+ err,
{
SDB_TYPE_BINARY,
{ .binary = { 6, (unsigned char *)"a\0ab\0b" } },
{
{ SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
{ SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
+ err,
+ err,
+ err,
+ err,
+ err,
+ err,
+ },
+ {
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+ { .array = { SDB_STATIC_ARRAY_LEN(int_values), int_values } },
+ },
+ {
+ 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_concat),
+ expected_int_concat
+ } },
+ },
+ },
+ {
+ {
+ SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+ { .array = { SDB_STATIC_ARRAY_LEN(string_values), string_values } },
+ },
+ {
+ 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_concat),
+ expected_string_concat
+ } },
+ },
+ },
+ {
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ },
+ {
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ { SDB_TYPE_INTEGER, { .integer = 42 } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ },
+ {
+ { SDB_TYPE_INTEGER, { .integer = 42 } },
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ },
+ {
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ { SDB_TYPE_DECIMAL, { .decimal = 47.11 } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ },
+ {
+ { SDB_TYPE_DECIMAL, { .decimal = 47.11 } },
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ },
+ {
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ { SDB_TYPE_STRING, { .string = "47.11" } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ },
+ {
+ { SDB_TYPE_STRING, { .string = "47.11" } },
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ },
+ {
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ { SDB_TYPE_DATETIME, { .datetime = 4711 } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ },
+ {
+ { SDB_TYPE_DATETIME, { .datetime = 4711 } },
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ },
+ {
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ { SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ },
+ {
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ },
+ {
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
+ SDB_DATA_NULL,
},
/* supported type-mismatches */
{
/* int * datetime */
{ SDB_TYPE_INTEGER, { .integer = 20 } },
{ SDB_TYPE_DATETIME, { .datetime = 2 } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
+ err,
+ err,
{ SDB_TYPE_DATETIME, { .datetime = 40 } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
+ err,
+ err,
+ err,
},
{
/* datetime * int, datetime / int, datetime % int */
{ SDB_TYPE_DATETIME, { .datetime = 20 } },
{ SDB_TYPE_INTEGER, { .integer = 2 } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
+ err,
+ err,
{ SDB_TYPE_DATETIME, { .datetime = 40 } },
{ SDB_TYPE_DATETIME, { .datetime = 10 } },
{ SDB_TYPE_DATETIME, { .datetime = 0 } },
- SDB_DATA_INIT,
+ err,
},
{
/* float * datetime */
{ SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
{ SDB_TYPE_DATETIME, { .datetime = 2 } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
+ err,
+ err,
{ SDB_TYPE_DATETIME, { .datetime = 40 } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
- SDB_DATA_INIT,
+ err,
+ err,
+ err,
},
{
/* datetime * float, datetime / float, datetime % float */
{ SDB_TYPE_DATETIME, { .datetime = 20 } },
{ SDB_TYPE_DECIMAL, { .decimal = 2.0 } },
- SDB_DATA_INIT,
- SDB_DATA_INIT,
+ err,
+ err,
{ SDB_TYPE_DATETIME, { .datetime = 40 } },
{ SDB_TYPE_DATETIME, { .datetime = 10 } },
{ SDB_TYPE_DATETIME, { .datetime = 0 } },
- SDB_DATA_INIT,
+ err,
+ },
+ /* unsupported type-mismatches */
+ {
+ { SDB_TYPE_INTEGER, { .integer = 20 } },
+ { SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_INTEGER, { .integer = 20 } },
+ { SDB_TYPE_STRING, { .string = "20" } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_INTEGER, { .integer = 20 } },
+ { SDB_TYPE_BINARY, { .binary = { 2, (unsigned char *)"20" } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_INTEGER, { .integer = 20 } },
+ { SDB_TYPE_BINARY, { .binary = { 3, (unsigned char *)"20" } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_INTEGER, { .integer = 20 } },
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_INTEGER, { .integer = 20 } },
+ { SDB_TYPE_REGEX + 1, { .integer = 0 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
+ { SDB_TYPE_INTEGER, { .integer = 20 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
+ { SDB_TYPE_STRING, { .string = "20.0" } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
+ { SDB_TYPE_BINARY, { .binary = { 2, (unsigned char *)"20" } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
+ { SDB_TYPE_BINARY, { .binary = { 3, (unsigned char *)"20" } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
+ { SDB_TYPE_BINARY, { .binary = { 4, (unsigned char *)"20.0" } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
+ { SDB_TYPE_REGEX + 1, { .integer = 0 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_STRING, { .string = "20" } },
+ { SDB_TYPE_INTEGER, { .integer = 20 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_STRING, { .string = "20" } },
+ { SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_STRING, { .string = "20" } },
+ { SDB_TYPE_DATETIME, { .datetime = 20 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_STRING, { .string = "20" } },
+ { SDB_TYPE_BINARY, { .binary = { 2, (unsigned char *)"20" } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_STRING, { .string = "20" } },
+ { SDB_TYPE_BINARY, { .binary = { 3, (unsigned char *)"20" } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_STRING, { .string = "20" } },
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_STRING, { .string = "20" } },
+ { SDB_TYPE_REGEX + 1, { .integer = 0 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_DATETIME, { .datetime = 20 } },
+ { SDB_TYPE_STRING, { .string = "20" } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_DATETIME, { .datetime = 20 } },
+ { SDB_TYPE_BINARY, { .binary = { 2, (unsigned char *)"20" } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_DATETIME, { .datetime = 20 } },
+ { SDB_TYPE_BINARY, { .binary = { 3, (unsigned char *)"20" } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_DATETIME, { .datetime = 20 } },
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_DATETIME, { .datetime = 20 } },
+ { SDB_TYPE_REGEX + 1, { .integer = 0 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 2, (unsigned char *)"20" } } },
+ { SDB_TYPE_INTEGER, { .integer = 20 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 3, (unsigned char *)"20" } } },
+ { SDB_TYPE_INTEGER, { .integer = 20 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 2, (unsigned char *)"20" } } },
+ { SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 3, (unsigned char *)"20" } } },
+ { SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 2, (unsigned char *)"20" } } },
+ { SDB_TYPE_DATETIME, { .datetime = 20 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 3, (unsigned char *)"20" } } },
+ { SDB_TYPE_DATETIME, { .datetime = 20 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 2, (unsigned char *)"20" } } },
+ { SDB_TYPE_STRING, { .string = "20" } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 3, (unsigned char *)"20" } } },
+ { SDB_TYPE_STRING, { .string = "20" } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 2, (unsigned char *)"20" } } },
+ { SDB_TYPE_STRING, { .string = "20" } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 3, (unsigned char *)"20" } } },
+ { SDB_TYPE_STRING, { .string = "20" } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 2, (unsigned char *)"20" } } },
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 3, (unsigned char *)"20" } } },
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 2, (unsigned char *)"20" } } },
+ { SDB_TYPE_REGEX + 1, { .integer = 0 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_BINARY, { .binary = { 3, (unsigned char *)"20" } } },
+ { SDB_TYPE_REGEX + 1, { .integer = 0 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ { SDB_TYPE_INTEGER, { .integer = 20 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ { SDB_TYPE_DECIMAL, { .decimal = 20.0 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ { SDB_TYPE_STRING, { .string = "20" } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ { SDB_TYPE_DATETIME, { .datetime = 20 } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ { SDB_TYPE_BINARY, { .binary = { 2, (unsigned char *)"20" } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ { SDB_TYPE_BINARY, { .binary = { 3, (unsigned char *)"20" } } },
+ err, err, err, err, err, err,
+ },
+ {
+ { SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+ { SDB_TYPE_REGEX + 1, { .integer = 0 } },
+ err, err, err, err, err, err,
},
};
for (j = 0; j < SDB_STATIC_ARRAY_LEN(tests); ++j) {
sdb_data_t res;
int check;
+ int type1, type2, type;
char d1_str[64] = "", d2_str[64] = "";
sdb_data_format(&golden_data[i].d1, d1_str, sizeof(d1_str),
sdb_data_format(&golden_data[i].d2, d2_str, sizeof(d2_str),
SDB_DOUBLE_QUOTED);
+ type1 = golden_data[i].d1.type;
+ type2 = golden_data[i].d2.type;
+ if (sdb_data_isnull(&golden_data[i].d1))
+ type1 = SDB_TYPE_NULL;
+ if (sdb_data_isnull(&golden_data[i].d2))
+ type2 = SDB_TYPE_NULL;
+ type = sdb_data_expr_type(tests[j].op, type1, type2);
+
check = sdb_data_expr_eval(tests[j].op,
&golden_data[i].d1, &golden_data[i].d2, &res);
- fail_unless((check == 0) == (tests[j].expected.type != 0),
+ fail_unless((check == 0) == (tests[j].expected.type != -1),
"sdb_data_expr_eval(%s, %s, %s) = %d; expected: %d",
SDB_DATA_OP_TO_STRING(tests[j].op), d1_str, d2_str, check,
- tests[j].expected.type == 0 ? -1 : 0);
- if (tests[j].expected.type == 0)
+ tests[j].expected.type == -1 ? -1 : 0);
+
+ fail_unless(tests[j].expected.type == type,
+ "sdb_data_expr_eval(%s, %s, %s) expected to evaluate "
+ "to type %d while sdb_data_expr_type(%d, %d, %d) "
+ "predicted type %d", SDB_DATA_OP_TO_STRING(tests[j].op),
+ d1_str, d2_str, tests[j].expected.type,
+ tests[j].op, golden_data[i].d1.type,
+ golden_data[i].d2.type, type);
+
+ if (tests[j].expected.type == -1)
+ continue;
+
+ if (tests[j].expected.type == SDB_TYPE_NULL) {
+ fail_unless(res.type == SDB_TYPE_NULL,
+ "sdb_data_expr_eval(%s, %s, %s) evaluated to "
+ "type %d; expected: SDB_TYPE_NULL",
+ SDB_DATA_OP_TO_STRING(tests[j].op),
+ d1_str, d2_str, res.type);
continue;
+ }
check = sdb_data_cmp(&res, &tests[j].expected);
if (check != 0) {
SDB_DOUBLE_QUOTED);
sdb_data_format(&tests[j].expected, expected_str,
sizeof(expected_str), SDB_DOUBLE_QUOTED);
- fail("sdb_data_expr_eval(%s, %s, %s) evaluated to %s; "
- "expected: %s", SDB_DATA_OP_TO_STRING(tests[j].op),
- d1_str, d2_str, res_str, expected_str);
+ fail("sdb_data_expr_eval(%s, %s, %s) evaluated to %s "
+ "(type %d); expected: %s (type %d)",
+ SDB_DATA_OP_TO_STRING(tests[j].op),
+ d1_str, d2_str, res_str, res.type,
+ expected_str, tests[j].expected.type);
}
sdb_data_free_datum(&res);
},
{
{ SDB_TYPE_STRING, { .string = NULL } },
- "\"<NULL>\"",
+ "NULL",
},
{
{ SDB_TYPE_STRING, { .string = "this is a test" } },
},
{
{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
- "\"<NULL>\"",
+ "NULL",
},
{
{
tcase_add_test(tc, test_data);
tcase_add_test(tc, test_cmp);
tcase_add_test(tc, test_strcmp);
+ tcase_add_test(tc, test_inarray);
+ tcase_add_test(tc, test_parse_op);
tcase_add_test(tc, test_expr_eval);
tcase_add_test(tc, test_format);
tcase_add_test(tc, test_parse);