![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 9f24c81e43cf1b054be3e45c1c391cbca6636900..01b63502bd5bab44c68cbcea7c6f5577fd63a418 100644 (file)
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "core/store.h"
#include "utils/proto.h"
-#include "libsysdb_test.h"
+#include "testutils.h"
#include <check.h>
+#include <stdbool.h>
#include <stdio.h>
#include <string.h>
+static bool
+streq(const char *s1, const char *s2)
+{
+ if ((! s1) || (! s2))
+ return (s1 == NULL) == (s2 == NULL);
+ return strcmp(s1, s2) == 0;
+} /* streq */
+
START_TEST(test_marshal_data)
{
#define INT_TYPE "\0\0\0\1"
},
{
{ SDB_TYPE_STRING, { .string = "some string" } },
- /* length includes the null byte */
- 20, STRING_TYPE "\0\0\0\xc" "some string\0",
+ 16, STRING_TYPE "some string\0",
},
{
{ SDB_TYPE_DATETIME, { .datetime = 1418923804000000 } },
},
{
{ SDB_TYPE_REGEX, { .re = { "dummy", dummy_re } } },
- 14, REGEX_TYPE "\0\0\0\x6" "dummy\0",
+ 10, REGEX_TYPE "dummy\0",
},
{
{ SDB_TYPE_INTEGER | SDB_TYPE_ARRAY, { .array = {
{
{ SDB_TYPE_STRING | SDB_TYPE_ARRAY, { .array = {
2, string_values } } },
- 25, STRING_ARRAY "\0\0\0\x2" "\0\0\0\x4" "foo\0"
- "\0\0\0\x5" "abcd\0"
+ 17, STRING_ARRAY "\0\0\0\x2" "foo\0" "abcd\0"
},
{
{ SDB_TYPE_DATETIME | SDB_TYPE_ARRAY, { .array = {
{
{ SDB_TYPE_REGEX | SDB_TYPE_ARRAY, { .array = {
1, regex_values } } },
- 24, REGEX_ARRAY "\0\0\0\1" "\0\0\0\xc" "dummy regex\0"
+ 20, REGEX_ARRAY "\0\0\0\1" "dummy regex\0"
},
};
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
ssize_t len = sdb_proto_marshal_data(NULL, 0, &golden_data[i].datum);
char buf[len > 0 ? len : 1];
- char v[sdb_data_strlen(&golden_data[i].datum)];
+ char v1[sdb_data_strlen(&golden_data[i].datum)];
+ char v2[sdb_data_strlen(&golden_data[i].datum)];
- if (sdb_data_format(&golden_data[i].datum, v, sizeof(v), 0) < 0)
- snprintf(v, sizeof(v), "<ERR>");
+ sdb_data_t datum = SDB_DATA_INIT;
+ ssize_t check;
+
+ if (sdb_data_format(&golden_data[i].datum, v1, sizeof(v1), 0) < 0)
+ snprintf(v1, sizeof(v1), "<ERR>");
fail_unless(len == golden_data[i].expected_len,
- "sdb_proto_marshal_data(NULL, 0, %s) = %zi; expected: %zi",
- v, len, golden_data[i].expected_len);
+ "<%zu> sdb_proto_marshal_data(NULL, 0, %s) = %zi; expected: %zi",
+ i, v1, len, golden_data[i].expected_len);
if (len < 0)
continue;
len = sdb_proto_marshal_data(buf, sizeof(buf), &golden_data[i].datum);
fail_unless(len == golden_data[i].expected_len,
- "sdb_proto_marshal_data(<buf>, <size>, %s) = %zi; expected: %zi",
- v, len, golden_data[i].expected_len);
+ "<%zu> sdb_proto_marshal_data(<buf>, %zu, %s) = %zi; expected: %zi",
+ i, sizeof(buf), v1, len, golden_data[i].expected_len);
if (memcmp(buf, golden_data[i].expected, len) != 0) {
size_t pos;
for (pos = 0; pos < (size_t)len; ++pos)
if (buf[pos] != golden_data[i].expected[pos])
break;
- fail("sdb_proto_marshal_data(%s) -> \"%s\"; expected: \"%s\" "
+ fail("<%zu> sdb_proto_marshal_data(%s) -> \"%s\"; expected: \"%s\" "
"(bytes %zu differ: '%x' != '%x')",
- v, buf, golden_data[i].expected,
+ i, v1, buf, golden_data[i].expected,
pos, (int)buf[pos], (int)golden_data[i].expected[pos]);
}
+
+ check = sdb_proto_unmarshal_data(buf, len, &datum);
+ if (sdb_data_format(&datum, v2, sizeof(v2), 0) < 0)
+ snprintf(v2, sizeof(v2), "<ERR>");
+
+ if (sdb_data_isnull(&golden_data[i].datum))
+ fail_unless(sdb_data_isnull(&datum),
+ "<%zu> sdb_proto_unmarshal_data(buf<%s>) -> \"%s\"", i, v1, v2);
+ else
+ fail_unless(sdb_data_cmp(&golden_data[i].datum, &datum) == 0,
+ "<%zu> sdb_proto_unmarshal_data(buf<%s>) -> \"%s\"", i, v1, v2);
+ fail_unless(check == len,
+ "<%zu> sdb_proto_unmarshal_data(buf<%s>) = %zi; expected: %zi",
+ i, v1, check, len);
+
+ sdb_data_free_datum(&datum);
}
}
END_TEST
-Suite *
-util_proto_suite(void)
+#define HOST_TYPE "\0\0\0\1"
+#define SVC_TYPE "\0\0\0\2"
+#define METRIC_TYPE "\0\0\0\3"
+#define HOST_ATTR_TYPE "\0\0\0\x11"
+#define SVC_ATTR_TYPE "\0\0\0\x12"
+#define METRIC_ATTR_TYPE "\0\0\0\x13"
+
+START_TEST(test_marshal_host)
{
- Suite *s = suite_create("utils::proto");
- TCase *tc;
+ struct {
+ sdb_proto_host_t host;
+ ssize_t expected_len;
+ char *expected;
+ } golden_data[] = {
+ {
+ { 4711, "hostA" },
+ 18, HOST_TYPE "\0\0\0\0\0\0\x12\x67" "hostA\0"
+ },
+ {
+ { 0, "hostA" },
+ 18, HOST_TYPE "\0\0\0\0\0\0\0\0" "hostA\0"
+ },
+ { { 4711, NULL }, -1, NULL },
+ };
- tc = tcase_create("core");
- tcase_add_test(tc, test_marshal_data);
- suite_add_tcase(s, tc);
+ size_t i;
+
+ for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+ ssize_t len = sdb_proto_marshal_host(NULL, 0, &golden_data[i].host);
+ char buf[len > 0 ? len : 1];
+
+ sdb_proto_host_t host;
+ ssize_t check;
+
+ fail_unless(len == golden_data[i].expected_len,
+ "<%zu> sdb_proto_marshal_host(NULL, 0, %s) = %zi; expected: %zi",
+ i, golden_data[i].host.name, len, golden_data[i].expected_len);
+
+ if (len < 0)
+ continue;
+
+ len = sdb_proto_marshal_host(buf, sizeof(buf), &golden_data[i].host);
+ fail_unless(len == golden_data[i].expected_len,
+ "<%zu> sdb_proto_marshal_host(<buf>, %zu, %s) = %zi; expected: %zi",
+ i, sizeof(buf), golden_data[i].host.name,
+ len, golden_data[i].expected_len);
+ if (memcmp(buf, golden_data[i].expected, len) != 0) {
+ size_t pos;
+ for (pos = 0; pos < (size_t)len; ++pos)
+ if (buf[pos] != golden_data[i].expected[pos])
+ break;
+ fail("<%zu> sdb_proto_marshal_host(%s) -> \"%s\"; expected: \"%s\" "
+ "(bytes %zu differ: '%x' != '%x')",
+ i, golden_data[i].host.name, buf, golden_data[i].expected,
+ pos, (int)buf[pos], (int)golden_data[i].expected[pos]);
+ }
+
+ check = sdb_proto_unmarshal_host(buf, len, &host);
+ fail_unless(check == len,
+ "<%zu> sdb_proto_unmarshal_host(buf<%s>) = %zi; expected: %zi",
+ i, golden_data[i].host.name, check, len);
+ fail_unless((host.last_update == golden_data[i].host.last_update)
+ && streq(host.name, golden_data[i].host.name),
+ "<%zu> sdb_proto_unmarshal_host(buf<%s>) = { %"PRIsdbTIME", %s }; "
+ "expected: { %"PRIsdbTIME", %s }", i, golden_data[i].host.name,
+ host.last_update, host.name, golden_data[i].host.last_update,
+ golden_data[i].host.name);
+ }
+}
+END_TEST
- return s;
-} /* util_proto_suite */
+START_TEST(test_marshal_service)
+{
+ struct {
+ sdb_proto_service_t svc;
+ ssize_t expected_len;
+ char *expected;
+ } golden_data[] = {
+ {
+ { 4711, "hostA", "serviceX" },
+ 27, SVC_TYPE "\0\0\0\0\0\0\x12\x67" "hostA\0serviceX\0"
+ },
+ {
+ { 0, "hostA", "serviceX" },
+ 27, SVC_TYPE "\0\0\0\0\0\0\0\0" "hostA\0serviceX\0"
+ },
+ { { 4711, "hostA", NULL }, -1, NULL },
+ { { 4711, NULL, "serviceX" }, -1, NULL },
+ { { 4711, NULL, NULL }, -1, NULL },
+ };
+
+ size_t i;
+
+ for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+ ssize_t len = sdb_proto_marshal_service(NULL, 0, &golden_data[i].svc);
+ char buf[len > 0 ? len : 1];
+
+ sdb_proto_service_t svc;
+ ssize_t check;
+
+ fail_unless(len == golden_data[i].expected_len,
+ "<%zu> sdb_proto_marshal_service(NULL, 0, %s) = %zi; expected: %zi",
+ i, golden_data[i].svc.name, len, golden_data[i].expected_len);
+
+ if (len < 0)
+ continue;
+
+ len = sdb_proto_marshal_service(buf, sizeof(buf), &golden_data[i].svc);
+ fail_unless(len == golden_data[i].expected_len,
+ "<%zu> sdb_proto_marshal_service(<buf>, %zu, %s) = %zi; expected: %zi",
+ i, sizeof(buf), golden_data[i].svc.name,
+ len, golden_data[i].expected_len);
+ if (memcmp(buf, golden_data[i].expected, len) != 0) {
+ size_t pos;
+ for (pos = 0; pos < (size_t)len; ++pos)
+ if (buf[pos] != golden_data[i].expected[pos])
+ break;
+ fail("<%zu> sdb_proto_marshal_service(%s) -> \"%s\"; expected: \"%s\" "
+ "(bytes %zu differ: '%x' != '%x')",
+ i, golden_data[i].svc.name, buf, golden_data[i].expected,
+ pos, (int)buf[pos], (int)golden_data[i].expected[pos]);
+ }
+
+ check = sdb_proto_unmarshal_service(buf, len, &svc);
+ fail_unless(check == len,
+ "<%zu> sdb_proto_unmarshal_service(buf<%s>) = %zi; expected: %zi",
+ i, golden_data[i].svc.name, check, len);
+ fail_unless((svc.last_update == golden_data[i].svc.last_update)
+ && streq(svc.hostname, golden_data[i].svc.hostname)
+ && streq(svc.name, golden_data[i].svc.name),
+ "<%zu> sdb_proto_unmarshal_service(buf<%s>) = { %"PRIsdbTIME", %s, %s }; "
+ "expected: { %"PRIsdbTIME", %s, %s }", i, golden_data[i].svc.name,
+ svc.last_update, svc.hostname, svc.name, golden_data[i].svc.last_update,
+ golden_data[i].svc.hostname, golden_data[i].svc.name);
+ }
+}
+END_TEST
+
+START_TEST(test_marshal_metric)
+{
+ struct {
+ sdb_proto_metric_t metric;
+ ssize_t expected_len;
+ char *expected;
+ } golden_data[] = {
+ {
+ { 4711, "hostA", "metricX", NULL, NULL },
+ 26, METRIC_TYPE "\0\0\0\0\0\0\x12\x67" "hostA\0metricX\0"
+ },
+ {
+ { 0, "hostA", "metricX", NULL, NULL },
+ 26, METRIC_TYPE "\0\0\0\0\0\0\0\0" "hostA\0metricX\0"
+ },
+ {
+ { 0, "hostA", "metricX", "type", NULL },
+ 26, METRIC_TYPE "\0\0\0\0\0\0\0\0" "hostA\0metricX\0"
+ },
+ {
+ { 0, "hostA", "metricX", NULL, "id" },
+ 26, METRIC_TYPE "\0\0\0\0\0\0\0\0" "hostA\0metricX\0"
+ },
+ {
+ { 4711, "hostA", "metricX", "type", "id" },
+ 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 },
+ };
+
+ size_t i;
+
+ for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+ ssize_t len = sdb_proto_marshal_metric(NULL, 0, &golden_data[i].metric);
+ char buf[len > 0 ? len : 1];
+
+ sdb_proto_metric_t metric;
+ ssize_t check;
+
+ fail_unless(len == golden_data[i].expected_len,
+ "<%zu> sdb_proto_marshal_metric(NULL, 0, %s) = %zi; expected: %zi",
+ i, golden_data[i].metric.name, len, golden_data[i].expected_len);
+
+ if (len < 0)
+ continue;
+
+ len = sdb_proto_marshal_metric(buf, sizeof(buf), &golden_data[i].metric);
+ fail_unless(len == golden_data[i].expected_len,
+ "<%zu> sdb_proto_marshal_metric(<buf>, %zu, %s) = %zi; expected: %zi",
+ i, sizeof(buf), golden_data[i].metric.name,
+ len, golden_data[i].expected_len);
+ if (memcmp(buf, golden_data[i].expected, len) != 0) {
+ size_t pos;
+ for (pos = 0; pos < (size_t)len; ++pos)
+ if (buf[pos] != golden_data[i].expected[pos])
+ break;
+ fail("<%zu> sdb_proto_marshal_metric(%s) -> \"%s\"; expected: \"%s\" "
+ "(bytes %zu differ: '%x' != '%x')",
+ i, golden_data[i].metric.name, buf, golden_data[i].expected,
+ pos, (int)buf[pos], (int)golden_data[i].expected[pos]);
+ }
+
+ 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 */
+ golden_data[i].metric.store_type = NULL;
+ golden_data[i].metric.store_id = NULL;
+ }
+
+ check = sdb_proto_unmarshal_metric(buf, len, &metric);
+ fail_unless(check == len,
+ "<%zu> sdb_proto_unmarshal_metric(buf<%s>) = %zi; expected: %zi",
+ i, golden_data[i].metric.name, check, len);
+ fail_unless((metric.last_update == golden_data[i].metric.last_update)
+ && 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),
+ "<%zu> sdb_proto_unmarshal_metric(buf<%s>) = "
+ "{ %"PRIsdbTIME", %s, %s, %s, %s }; expected: "
+ "{ %"PRIsdbTIME", %s, %s, %s, %s }", i, golden_data[i].metric.name,
+ metric.last_update, metric.hostname, metric.name,
+ metric.store_type, metric.store_id,
+ 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);
+ }
+}
+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"
+ struct {
+ sdb_proto_attribute_t attr;
+ ssize_t expected_len;
+ char *expected;
+ } golden_data[] = {
+ {
+ { 4711, SDB_HOST, NULL, "hostA", "k1", v },
+ 33, HOST_ATTR_TYPE "\0\0\0\0\0\0\x12\x67" "hostA\0" "k1\0" VAL
+ },
+ {
+ { 4711, SDB_SERVICE, "hostA", "svc1", "k1", v },
+ 38, SVC_ATTR_TYPE "\0\0\0\0\0\0\x12\x67" "hostA\0" "svc1\0" "k1\0" VAL
+ },
+ {
+ { 4711, SDB_METRIC, "hostA", "m1", "k1", v },
+ 36, METRIC_ATTR_TYPE "\0\0\0\0\0\0\x12\x67" "hostA\0" "m1\0" "k1\0" VAL
+ },
+ { { 4711, SDB_HOST, NULL, NULL, "k1", v }, -1, NULL },
+ { { 4711, SDB_HOST, NULL, "hostA", NULL, v }, -1, NULL },
+ { { 4711, SDB_SERVICE, NULL, "svc1", "k1", v }, -1, NULL },
+ { { 4711, SDB_METRIC, NULL, "m1", "k1", v }, -1, NULL },
+ { { 4711, 0, "hostA", "svc1", "k1", v }, -1, NULL },
+ };
+
+ size_t i;
+
+ for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+ ssize_t len = sdb_proto_marshal_attribute(NULL, 0, &golden_data[i].attr);
+ char buf[len > 0 ? len : 1];
+
+ sdb_proto_attribute_t attr;
+ ssize_t check;
+ char v1[sdb_data_strlen(&golden_data[i].attr.value) + 1];
+ char v2[sdb_data_strlen(&golden_data[i].attr.value) + 1];
+
+ fail_unless(len == golden_data[i].expected_len,
+ "<%zu> sdb_proto_marshal_attribute(NULL, 0, %s) = %zi; expected: %zi",
+ i, golden_data[i].attr.key, len, golden_data[i].expected_len);
+
+ if (len < 0)
+ continue;
+
+ len = sdb_proto_marshal_attribute(buf, sizeof(buf), &golden_data[i].attr);
+ fail_unless(len == golden_data[i].expected_len,
+ "<%zu> sdb_proto_marshal_attribute(<buf>, %zu, %s) = %zi; expected: %zi",
+ i, sizeof(buf), golden_data[i].attr.key,
+ len, golden_data[i].expected_len);
+ if (memcmp(buf, golden_data[i].expected, len) != 0) {
+ size_t pos;
+ for (pos = 0; pos < (size_t)len; ++pos)
+ if (buf[pos] != golden_data[i].expected[pos])
+ break;
+ fail("<%zu> sdb_proto_marshal_attribute(%s) -> \"%s\"; expected: \"%s\" "
+ "(bytes %zu differ: '%x' != '%x')",
+ i, golden_data[i].attr.key, buf, golden_data[i].expected,
+ pos, (int)buf[pos], (int)golden_data[i].expected[pos]);
+ }
+
+ if (sdb_data_format(&golden_data[i].attr.value, v1, sizeof(v1), 0) < 0)
+ snprintf(v1, sizeof(v1), "<ERR>");
+
+ check = sdb_proto_unmarshal_attribute(buf, len, &attr);
+ fail_unless(check == len,
+ "<%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)
+ 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)
+ && streq(attr.hostname, golden_data[i].attr.hostname)
+ && streq(attr.parent, golden_data[i].attr.parent)
+ && streq(attr.key, golden_data[i].attr.key)
+ && (sdb_data_cmp(&attr.value, &golden_data[i].attr.value) == 0),
+ "<%zu> sdb_proto_unmarshal_attribute(buf<%s>) = "
+ "{ %"PRIsdbTIME", %s, %s, %s, %s, %s }; expected: "
+ "{ %"PRIsdbTIME", %s, %s, %s, %s, %s }", i, golden_data[i].attr.key,
+ attr.last_update, SDB_STORE_TYPE_TO_NAME(attr.parent_type),
+ attr.hostname, attr.parent, attr.key, v1,
+ golden_data[i].attr.last_update,
+ SDB_STORE_TYPE_TO_NAME(golden_data[i].attr.parent_type),
+ golden_data[i].attr.hostname, golden_data[i].attr.parent,
+ golden_data[i].attr.key, v2);
+ }
+}
+END_TEST
+
+TEST_MAIN("utils::proto")
+{
+ TCase *tc = tcase_create("core");
+ tcase_add_test(tc, test_marshal_data);
+ tcase_add_test(tc, test_marshal_host);
+ tcase_add_test(tc, test_marshal_service);
+ tcase_add_test(tc, test_marshal_metric);
+ tcase_add_test(tc, test_marshal_attribute);
+ ADD_TCASE(tc);
+}
+TEST_MAIN_END
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */