![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 01b63502bd5bab44c68cbcea7c6f5577fd63a418..bc5f910d117bcf599497538a4202e0c447964263 100644 (file)
START_TEST(test_marshal_data)
{
-#define INT_TYPE "\0\0\0\1"
-#define DECIMAL_TYPE "\0\0\0\2"
-#define STRING_TYPE "\0\0\0\3"
-#define DATETIME_TYPE "\0\0\0\4"
-#define BINARY_TYPE "\0\0\0\5"
-#define REGEX_TYPE "\0\0\0\6"
-
+#define BOOL_TYPE "\0\0\0\1"
+#define INT_TYPE "\0\0\0\2"
+#define DECIMAL_TYPE "\0\0\0\3"
+#define STRING_TYPE "\0\0\0\4"
+#define DATETIME_TYPE "\0\0\0\5"
+#define BINARY_TYPE "\0\0\0\6"
+#define REGEX_TYPE "\0\0\0\7"
+
+#define BOOL_ARRAY "\0\0\1\1"
#define NULL_ARRAY "\0\0\1\0"
-#define INT_ARRAY "\0\0\1\1"
-#define DECIMAL_ARRAY "\0\0\1\2"
-#define STRING_ARRAY "\0\0\1\3"
-#define DATETIME_ARRAY "\0\0\1\4"
-#define BINARY_ARRAY "\0\0\1\5"
-#define REGEX_ARRAY "\0\0\1\6"
+#define INT_ARRAY "\0\0\1\2"
+#define DECIMAL_ARRAY "\0\0\1\3"
+#define STRING_ARRAY "\0\0\1\4"
+#define DATETIME_ARRAY "\0\0\1\5"
+#define BINARY_ARRAY "\0\0\1\6"
+#define REGEX_ARRAY "\0\0\1\7"
regex_t dummy_re;
+ bool bool_values[] = { true, false };
int64_t int_values[] = { 47, 11, 23 };
double dec_values[] = { 47.11, .5 };
char *string_values[] = { "foo", "abcd" };
{ SDB_TYPE_NULL, { .integer = 0 } },
4, "\0\0\0\0",
},
+ {
+ { SDB_TYPE_BOOLEAN, { .boolean = true } },
+ 5, BOOL_TYPE "\1",
+ },
+ {
+ { SDB_TYPE_BOOLEAN, { .boolean = false } },
+ 5, BOOL_TYPE "\0",
+ },
{
{ SDB_TYPE_INTEGER, { .integer = 4711 } },
12, INT_TYPE "\0\0\0\0\0\0\x12\x67",
{ SDB_TYPE_REGEX, { .re = { "dummy", dummy_re } } },
10, REGEX_TYPE "dummy\0",
},
+ {
+ { SDB_TYPE_BOOLEAN | SDB_TYPE_ARRAY, { .array = {
+ SDB_STATIC_ARRAY_LEN(bool_values), bool_values,
+ } } },
+ 10, BOOL_ARRAY "\0\0\0\x2" "\1\0"
+ },
{
{ SDB_TYPE_INTEGER | SDB_TYPE_ARRAY, { .array = {
- 3, int_values } } },
+ SDB_STATIC_ARRAY_LEN(int_values), int_values,
+ } } },
32, INT_ARRAY "\0\0\0\x3" "\0\0\0\0\0\0\0\x2f"
"\0\0\0\0\0\0\0\xb" "\0\0\0\0\0\0\0\x17"
},
{
{ SDB_TYPE_DECIMAL | SDB_TYPE_ARRAY, { .array = {
- 2, dec_values } } },
+ SDB_STATIC_ARRAY_LEN(dec_values), dec_values,
+ } } },
24, DECIMAL_ARRAY "\0\0\0\x2" "\x40\x47\x8e\x14\x7a\xe1\x47\xae"
"\x3f\xe0\0\0\0\0\0\0"
},
{
{ SDB_TYPE_STRING | SDB_TYPE_ARRAY, { .array = {
- 2, string_values } } },
+ SDB_STATIC_ARRAY_LEN(string_values), string_values,
+ } } },
17, STRING_ARRAY "\0\0\0\x2" "foo\0" "abcd\0"
},
{
{ SDB_TYPE_DATETIME | SDB_TYPE_ARRAY, { .array = {
- 2, datetime_values } } },
+ SDB_STATIC_ARRAY_LEN(datetime_values), datetime_values,
+ } } },
24, DATETIME_ARRAY "\0\0\0\x2" "\0\0\0\0\0\0\x12\x67"
"\x11\x22\x10\xf4\x7d\xe9\x81\x15"
},
{
{ SDB_TYPE_BINARY | SDB_TYPE_ARRAY, { .array = {
- 2, binary_values } } },
+ SDB_STATIC_ARRAY_LEN(binary_values), binary_values,
+ } } },
23, BINARY_ARRAY "\0\0\0\x2" "\0\0\0\x3" "\x1\x2\x3"
"\0\0\0\4" "\x42\x0\xa\x1b"
},
{
{ SDB_TYPE_REGEX | SDB_TYPE_ARRAY, { .array = {
- 1, regex_values } } },
+ SDB_STATIC_ARRAY_LEN(regex_values), regex_values,
+ } } },
20, REGEX_ARRAY "\0\0\0\1" "dummy regex\0"
},
};
sdb_data_t datum = SDB_DATA_INIT;
ssize_t check;
- if (sdb_data_format(&golden_data[i].datum, v1, sizeof(v1), 0) < 0)
+ if (! sdb_data_format(&golden_data[i].datum, v1, sizeof(v1), 0))
snprintf(v1, sizeof(v1), "<ERR>");
fail_unless(len == golden_data[i].expected_len,
}
check = sdb_proto_unmarshal_data(buf, len, &datum);
- if (sdb_data_format(&datum, v2, sizeof(v2), 0) < 0)
+ if (! sdb_data_format(&datum, v2, sizeof(v2), 0))
snprintf(v2, sizeof(v2), "<ERR>");
if (sdb_data_isnull(&golden_data[i].datum))
char *expected;
} golden_data[] = {
{
- { 4711, "hostA", "metricX", NULL, NULL },
+ { 4711, "hostA", "metricX", NULL, NULL, 0 },
26, METRIC_TYPE "\0\0\0\0\0\0\x12\x67" "hostA\0metricX\0"
},
{
- { 0, "hostA", "metricX", NULL, NULL },
+ { 0, "hostA", "metricX", NULL, NULL, 0 },
+ 26, METRIC_TYPE "\0\0\0\0\0\0\0\0" "hostA\0metricX\0"
+ },
+ {
+ { 0, "hostA", "metricX", "type", NULL, 0 },
26, METRIC_TYPE "\0\0\0\0\0\0\0\0" "hostA\0metricX\0"
},
{
- { 0, "hostA", "metricX", "type", NULL },
+ { 0, "hostA", "metricX", NULL, "id", 0 },
26, METRIC_TYPE "\0\0\0\0\0\0\0\0" "hostA\0metricX\0"
},
{
- { 0, "hostA", "metricX", NULL, "id" },
+ { 0, "hostA", "metricX", NULL, NULL, 4711 },
26, METRIC_TYPE "\0\0\0\0\0\0\0\0" "hostA\0metricX\0"
},
{
- { 4711, "hostA", "metricX", "type", "id" },
+ { 4711, "hostA", "metricX", "type", "id", 0 },
34, METRIC_TYPE "\0\0\0\0\0\0\x12\x67" "hostA\0metricX\0type\0id\0"
},
- { { 4711, "hostA", NULL, NULL, NULL }, -1, NULL },
- { { 4711, NULL, "metricX", NULL, NULL }, -1, NULL },
- { { 4711, NULL, NULL, NULL, NULL }, -1, NULL },
+ {
+ { 4711, "hostA", "metricX", "type", "id", 4711 },
+ 42, METRIC_TYPE "\0\0\0\0\0\0\x12\x67" "hostA\0metricX\0type\0id\0" "\0\0\0\0\0\0\x12\x67"
+ },
+ { { 4711, "hostA", NULL, NULL, NULL, 0 }, -1, NULL },
+ { { 4711, NULL, "metricX", NULL, NULL, 0 }, -1, NULL },
+ { { 4711, NULL, NULL, NULL, NULL, 0 }, -1, NULL },
};
size_t i;
if ((! golden_data[i].metric.store_type)
|| (! golden_data[i].metric.store_id)) {
- /* if any of these is NULL, we expect both to be NULL */
+ /* if any of these is NULL, we expect all to be NULL */
golden_data[i].metric.store_type = NULL;
golden_data[i].metric.store_id = NULL;
+ golden_data[i].metric.store_last_update = 0;
}
check = sdb_proto_unmarshal_metric(buf, len, &metric);
&& streq(metric.hostname, golden_data[i].metric.hostname)
&& streq(metric.name, golden_data[i].metric.name)
&& streq(metric.store_type, golden_data[i].metric.store_type)
- && streq(metric.store_id, golden_data[i].metric.store_id),
+ && streq(metric.store_id, golden_data[i].metric.store_id)
+ && metric.store_last_update == golden_data[i].metric.store_last_update,
"<%zu> sdb_proto_unmarshal_metric(buf<%s>) = "
- "{ %"PRIsdbTIME", %s, %s, %s, %s }; expected: "
- "{ %"PRIsdbTIME", %s, %s, %s, %s }", i, golden_data[i].metric.name,
+ "{ %"PRIsdbTIME", %s, %s, %s, %s, %"PRIsdbTIME" }; expected: "
+ "{ %"PRIsdbTIME", %s, %s, %s, %s, %"PRIsdbTIME" }",
+ i, golden_data[i].metric.name,
metric.last_update, metric.hostname, metric.name,
- metric.store_type, metric.store_id,
+ metric.store_type, metric.store_id, metric.store_last_update,
golden_data[i].metric.last_update,
golden_data[i].metric.hostname, golden_data[i].metric.name,
- golden_data[i].metric.store_type, golden_data[i].metric.store_id);
+ golden_data[i].metric.store_type, golden_data[i].metric.store_id,
+ golden_data[i].metric.store_last_update);
}
}
END_TEST
START_TEST(test_marshal_attribute)
{
sdb_data_t v = { SDB_TYPE_INTEGER, { .integer = 4711 } };
-#define VAL "\0\0\0\1" "\0\0\0\0\0\0\x12\x67"
+#define VAL "\0\0\0\2" "\0\0\0\0\0\0\x12\x67"
struct {
sdb_proto_attribute_t attr;
ssize_t expected_len;
pos, (int)buf[pos], (int)golden_data[i].expected[pos]);
}
- if (sdb_data_format(&golden_data[i].attr.value, v1, sizeof(v1), 0) < 0)
+ if (! sdb_data_format(&golden_data[i].attr.value, v1, sizeof(v1), 0))
snprintf(v1, sizeof(v1), "<ERR>");
check = sdb_proto_unmarshal_attribute(buf, len, &attr);
"<%zu> sdb_proto_unmarshal_attribute(buf<%s>) = %zi; expected: %zi",
i, golden_data[i].attr.key, check, len);
- if (sdb_data_format(&attr.value, v2, sizeof(v2), 0) < 0)
+ if (! sdb_data_format(&attr.value, v2, sizeof(v2), 0))
snprintf(v2, sizeof(v2), "<ERR>");
fail_unless((attr.last_update == golden_data[i].attr.last_update)
&& (attr.parent_type == golden_data[i].attr.parent_type)