![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 88765a47f6176c126eb39858de023f15c926f394..702afa487a0fa9aa7fbc31090f7d133f770ffe20 100644 (file)
--- a/t/unit/core/data_test.c
+++ b/t/unit/core/data_test.c
#include "core/data.h"
#include "libsysdb_test.h"
+#include <assert.h>
#include <check.h>
+static regex_t empty_re;
+
START_TEST(test_data)
{
sdb_data_t d1, d2;
fail_unless(!memcmp(d1.data.binary.datum, d2.data.binary.datum,
d2.data.binary.length),
"sdb_data_copy() didn't copy binary data: got: %s; expected: %s",
- d1.data.string, d2.data.string);
+ d1.data.binary.datum, d2.data.binary.datum);
sdb_data_free_datum(&d1);
fail_unless(d1.data.binary.length == 0,
d1.data.binary.length, d2.data.binary.length);
fail_unless(d1.data.binary.datum == d2.data.binary.datum,
"sdb_data_copy() didn't copy binary data: got: %s; expected: %s",
- d1.data.string, d2.data.string);
+ d1.data.binary.datum, d2.data.binary.datum);
sdb_data_free_datum(&d1);
fail_unless(d1.data.binary.length == 0,
"sdb_data_free_datum() didn't reset binary datum length");
fail_unless(d1.data.binary.datum == NULL,
"sdb_data_free_datum() didn't free binary datum");
+
+ check = sdb_data_parse(".", SDB_TYPE_REGEX, &d2);
+ fail_unless(check == 0,
+ "INTERNAL ERROR: Failed to parse regex '.'");
+ assert(d2.type == SDB_TYPE_REGEX);
+ 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.re.raw != d2.data.re.raw,
+ "sdb_data_copy() copy string pointer");
+ fail_unless(!strcmp(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);
+ sdb_data_free_datum(&d2);
+
+ sdb_data_free_datum(&d1);
+ fail_unless(d1.data.re.raw == NULL,
+ "sdb_data_free_datum() didn't reset raw regex");
+
+ d2.type = SDB_TYPE_REGEX;
+ d2.data.re.raw = NULL;
+ 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);
}
END_TEST
sdb_data_t d2;
int expected;
} golden_data[] = {
- /* same data as for the sdb_data_cmp test; in case the types match,
- * both functions should behave the same (except for some loss in
- * precision, e.g. when formatting datetime values) */
{
{ SDB_TYPE_INTEGER, { .integer = 47 } },
{ SDB_TYPE_INTEGER, { .integer = 4711 } },
1,
},
{
- { SDB_TYPE_DATETIME, { .datetime = 471047114711471100 } },
+ { SDB_TYPE_DATETIME, { .datetime = 471147114711471000 } },
{ SDB_TYPE_DATETIME, { .datetime = 471147114711471100 } },
-1,
},
},
{
{ SDB_TYPE_DATETIME, { .datetime = 471147114711471100 } },
- { SDB_TYPE_DATETIME, { .datetime = 471047114711471100 } },
+ { SDB_TYPE_DATETIME, { .datetime = 471147114711471000 } },
1,
},
{
},
1,
},
- /* type mismatches */
{
- { SDB_TYPE_INTEGER, { .integer = 123 } },
- { SDB_TYPE_STRING, { .string = "123" } },
+ { SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+ { SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
0,
},
{
- { SDB_TYPE_INTEGER, { .integer = 120 } },
- { SDB_TYPE_STRING, { .string = "123" } },
+ { SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+ { SDB_TYPE_REGEX, { .re = { "b", empty_re } } },
-1,
},
{
- { SDB_TYPE_STRING, { .string = "123" } },
- { SDB_TYPE_INTEGER, { .integer = 120 } },
- 1,
- },
- {
- { SDB_TYPE_STRING, { .string = "12.3" } },
- { SDB_TYPE_DECIMAL, { .decimal = 12.3 } },
- 0,
- },
- {
- { SDB_TYPE_STRING, { .string = "12.0" } },
- { SDB_TYPE_DECIMAL, { .decimal = 12.3 } },
- -1,
- },
- {
- { SDB_TYPE_DECIMAL, { .decimal = 12.3 } },
- { SDB_TYPE_STRING, { .string = "12.0" } },
+ { SDB_TYPE_REGEX, { .re = { "b", empty_re } } },
+ { SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
1,
},
};
size_t i;
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
- int check = sdb_data_strcmp(&golden_data[i].d1, &golden_data[i].d2);
+ int check = sdb_data_cmp(&golden_data[i].d1, &golden_data[i].d2);
check = check < 0 ? -1 : check > 0 ? 1 : 0;
if (check != golden_data[i].expected) {
char d1_str[64] = "", d2_str[64] = "";
SDB_DOUBLE_QUOTED);
sdb_data_format(&golden_data[i].d2, d2_str, sizeof(d2_str),
SDB_DOUBLE_QUOTED);
- fail("sdb_data_strcmp(%s, %s) = %d; expected: %d",
+ fail("sdb_data_cmp(%s, %s) = %d; expected: %d",
d1_str, d2_str, check, golden_data[i].expected);
}
}
sdb_data_t d2;
int expected;
} golden_data[] = {
+ /* same data as for the sdb_data_cmp test; in case the types match,
+ * both functions should behave the same (except for some loss in
+ * precision, e.g. when formatting datetime values) */
{
{ SDB_TYPE_INTEGER, { .integer = 47 } },
{ SDB_TYPE_INTEGER, { .integer = 4711 } },
1,
},
{
- { SDB_TYPE_DATETIME, { .datetime = 471147114711471000 } },
+ { SDB_TYPE_DATETIME, { .datetime = 471047114711471100 } },
{ SDB_TYPE_DATETIME, { .datetime = 471147114711471100 } },
-1,
},
},
{
{ SDB_TYPE_DATETIME, { .datetime = 471147114711471100 } },
- { SDB_TYPE_DATETIME, { .datetime = 471147114711471000 } },
+ { SDB_TYPE_DATETIME, { .datetime = 471047114711471100 } },
1,
},
{
},
1,
},
+ {
+ { SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+ { SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+ 0,
+ },
+ {
+ { SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+ { SDB_TYPE_REGEX, { .re = { "b", empty_re } } },
+ -1,
+ },
+ {
+ { SDB_TYPE_REGEX, { .re = { "b", empty_re } } },
+ { SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+ 1,
+ },
+ /* type mismatches */
+ {
+ { SDB_TYPE_INTEGER, { .integer = 123 } },
+ { SDB_TYPE_STRING, { .string = "123" } },
+ 0,
+ },
+ {
+ { SDB_TYPE_INTEGER, { .integer = 120 } },
+ { SDB_TYPE_STRING, { .string = "123" } },
+ -1,
+ },
+ {
+ { SDB_TYPE_STRING, { .string = "123" } },
+ { SDB_TYPE_INTEGER, { .integer = 120 } },
+ 1,
+ },
+ {
+ { SDB_TYPE_STRING, { .string = "12.3" } },
+ { SDB_TYPE_DECIMAL, { .decimal = 12.3 } },
+ 0,
+ },
+ {
+ { SDB_TYPE_STRING, { .string = "12.0" } },
+ { SDB_TYPE_DECIMAL, { .decimal = 12.3 } },
+ -1,
+ },
+ {
+ { SDB_TYPE_DECIMAL, { .decimal = 12.3 } },
+ { SDB_TYPE_STRING, { .string = "12.0" } },
+ 1,
+ },
+ {
+ { SDB_TYPE_REGEX, { .re = { "regex", empty_re } } },
+ { SDB_TYPE_STRING, { .string = "/regex/" } },
+ 0,
+ },
};
size_t i;
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
- int check = sdb_data_cmp(&golden_data[i].d1, &golden_data[i].d2);
+ int check = sdb_data_strcmp(&golden_data[i].d1, &golden_data[i].d2);
check = check < 0 ? -1 : check > 0 ? 1 : 0;
if (check != golden_data[i].expected) {
char d1_str[64] = "", d2_str[64] = "";
SDB_DOUBLE_QUOTED);
sdb_data_format(&golden_data[i].d2, d2_str, sizeof(d2_str),
SDB_DOUBLE_QUOTED);
- fail("sdb_data_cmp(%s, %s) = %d; expected: %d",
+ fail("sdb_data_strcmp(%s, %s) = %d; expected: %d",
d1_str, d2_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 } };
+
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 } } },
+ err,
+ err,
+ err,
+ err,
+ err,
+ err,
+ },
+ {
+ { 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,
},
};
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);
+ 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) {
char res_str[64] = "", expected_str[64] = "";
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);
},
"\"\\x62\\x69\\x6e\\x61\\x72\\x79\\x0\\x63\\x72\\x61\\x70\\x42\"",
},
+ {
+ { SDB_TYPE_REGEX, { .re = { "some regex", empty_re } } },
+ "\"/some regex/\"",
+ },
};
size_t i;
sdb_data_t result;
int expected;
} golden_data[] = {
- { "4711", { SDB_TYPE_INTEGER, { .integer = 4711 } }, 0 },
- { "0x10", { SDB_TYPE_INTEGER, { .integer = 16 } }, 0 },
- { "010", { SDB_TYPE_INTEGER, { .integer = 8 } }, 0 },
- { "abc", { SDB_TYPE_INTEGER, { .integer = 0 } }, -1 },
- { "1.2", { SDB_TYPE_DECIMAL, { .decimal = 1.2 } }, 0 },
- { "0x1p+16", { SDB_TYPE_DECIMAL, { .decimal = 65536.0 } }, 0 },
- { "abc", { SDB_TYPE_DECIMAL, { .decimal = 0.0 } }, -1 },
- { "abc", { SDB_TYPE_STRING, { .string = "abc" } }, 0 },
- { ".4", { SDB_TYPE_DATETIME, { .datetime = 400000000 } }, 0 },
- { "abc", { SDB_TYPE_DATETIME, { .datetime = 0 } }, -1 },
+ { "4711", { SDB_TYPE_INTEGER, { .integer = 4711 } }, 0 },
+ { "0x10", { SDB_TYPE_INTEGER, { .integer = 16 } }, 0 },
+ { "010", { SDB_TYPE_INTEGER, { .integer = 8 } }, 0 },
+ { "abc", { SDB_TYPE_INTEGER, { .integer = 0 } }, -1 },
+ { "1.2", { SDB_TYPE_DECIMAL, { .decimal = 1.2 } }, 0 },
+ { "0x1p+16", { SDB_TYPE_DECIMAL, { .decimal = 65536.0 } }, 0 },
+ { "abc", { SDB_TYPE_DECIMAL, { .decimal = 0.0 } }, -1 },
+ { "abc", { SDB_TYPE_STRING, { .string = "abc" } }, 0 },
+ { ".4", { SDB_TYPE_DATETIME, { .datetime = 400000000 } }, 0 },
+ { "abc", { SDB_TYPE_DATETIME, { .datetime = 0 } }, -1 },
{ "abc", { SDB_TYPE_BINARY,
{ .binary = { 3, (unsigned char *)"abc" } } }, 0 },
+ { "abc", { SDB_TYPE_REGEX, { .re = { "abc", empty_re } } }, 0 },
+ { "(|", { SDB_TYPE_REGEX, { .re = { "", empty_re } } }, -1 },
};
size_t i;
fail_unless(golden_data[i].input == (char *)result.data.binary.datum,
"sdb_data_parse(%s, %d, <d>) modified input string",
golden_data[i].input, type);
+ 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);
+ }
}
}
END_TEST
tcase_add_test(tc, test_data);
tcase_add_test(tc, test_cmp);
tcase_add_test(tc, test_strcmp);
+ 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);