X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Funit%2Fcore%2Fdata_test.c;h=a41a3c2a5c584f0eaca5911e6dae1ecd7ac616e8;hb=2f85566fbc79498eb7abfaf1cbd279f71f7ea8d1;hp=a1b4caa59965c7b307dcf848d40f0011ea4ea1b8;hpb=613d33154547150d227282dd1fe7ea382255e67c;p=sysdb.git

diff --git a/t/unit/core/data_test.c b/t/unit/core/data_test.c
index a1b4caa..a41a3c2 100644
--- a/t/unit/core/data_test.c
+++ b/t/unit/core/data_test.c
@@ -38,6 +38,10 @@ START_TEST(test_data)
 	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));
@@ -174,18 +178,58 @@ START_TEST(test_data)
 	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;
@@ -361,6 +405,72 @@ START_TEST(test_cmp)
 			{ 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;
@@ -656,6 +766,14 @@ 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;
@@ -674,7 +792,7 @@ START_TEST(test_expr_eval)
 			{ 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 } },
@@ -684,46 +802,46 @@ START_TEST(test_expr_eval)
 			{ 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" } },
 		},
 		{
@@ -734,37 +852,37 @@ START_TEST(test_expr_eval)
 			{ 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,
 		},
 		{
 			{
@@ -775,11 +893,11 @@ START_TEST(test_expr_eval)
 				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" } },
@@ -788,57 +906,231 @@ START_TEST(test_expr_eval)
 		{
 			{ 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,
 		},
 	};
 
@@ -870,13 +1162,22 @@ START_TEST(test_expr_eval)
 
 			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] = "";
@@ -884,9 +1185,11 @@ START_TEST(test_expr_eval)
 						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);