index 4bbfcc23864aa17e3a85a3d4e0563a7da4928eb3..1d4bf7aa267bda7a358de48ce58dd788391691aa 100644 (file)
sdb_data_t value;
} attrs[] = {
{ "a", "k1", { SDB_TYPE_STRING, { .string = "v1" } } },
+ { "a", "k2", { SDB_TYPE_INTEGER, { .integer = 123 } } },
};
size_t i;
}
} /* populate */
-START_TEST(test_store_match)
+START_TEST(test_store_match_name)
{
- sdb_store_base_t *obj;
+ sdb_store_obj_t *obj;
struct {
- const char *hostname;
- const char *hostname_re;
-
- const char *attr_name;
- const char *attr_value;
+ int type;
+ const char *name;
_Bool re;
int expected;
} golden_data[] = {
- {
- /* host */ NULL, NULL,
- /* attr */ NULL, NULL, 0, 1
- },
- {
- /* host */ NULL, NULL,
- /* attr */ NULL, NULL, 1, 1
- },
- {
- /* host */ "a", NULL,
- /* attr */ NULL, NULL, 0, 1
- },
- {
- /* host */ "b", NULL,
- /* attr */ NULL, NULL, 0, 0
- },
- {
- /* host */ NULL, "^a$",
- /* attr */ NULL, NULL, 0, 1
- },
- {
- /* host */ NULL, "^b$",
- /* attr */ NULL, NULL, 0, 0
- },
- {
- /* host */ "a", "^a$",
- /* attr */ NULL, NULL, 0, 1
- },
- {
- /* host */ "a", "^b$",
- /* attr */ NULL, NULL, 0, 0
- },
- {
- /* host */ "b", "^a$",
- /* attr */ NULL, NULL, 0, 0
- },
- {
- /* host */ "a", "^a$",
- /* attr */ "k1", NULL, 0, 1
- },
- {
- /* host */ "a", "^a$",
- /* attr */ NULL, "v1", 0, 1
- },
- {
- /* host */ "a", "^a$",
- /* attr */ NULL, "^v1$", 1, 1
- },
+ { SDB_HOST, NULL, 0, 1 },
+ { SDB_HOST, NULL, 1, 1 },
+ { SDB_HOST, "a", 0, 1 },
+ { SDB_HOST, "a", 1, 1 },
+ { SDB_HOST, "b", 0, 0 },
+ { SDB_HOST, "b", 1, 0 },
+ { SDB_HOST, "^a$", 1, 1 },
+ { SDB_HOST, "^b$", 1, 0 },
+ { SDB_HOST, "^a$", 0, 0 },
+ { SDB_HOST, "^b$", 0, 0 },
+ { SDB_SERVICE, NULL, 0, 1 },
+ { SDB_SERVICE, NULL, 1, 1 },
+ { SDB_SERVICE, "s1", 0, 1 },
+ { SDB_SERVICE, "s2", 0, 1 },
+ { SDB_SERVICE, "s3", 0, 0 },
+ { SDB_SERVICE, "s4", 0, 0 },
+ { SDB_SERVICE, "^s1$", 1, 1 },
+ { SDB_SERVICE, "^s1$", 0, 0 },
+ { SDB_SERVICE, "x1", 0, 0 },
+ { SDB_SERVICE, "x1", 1, 0 },
+ { SDB_SERVICE, "x", 1, 0 },
+ { SDB_ATTRIBUTE, NULL, 0, 1 },
+ { SDB_ATTRIBUTE, NULL, 1, 1 },
+ { SDB_ATTRIBUTE, "k1", 0, 1 },
+ { SDB_ATTRIBUTE, "k2", 0, 1 },
+ { SDB_ATTRIBUTE, "k3", 0, 0 },
+ { SDB_ATTRIBUTE, "k4", 0, 0 },
+ { SDB_ATTRIBUTE, "k", 1, 1 },
+ { SDB_ATTRIBUTE, "1", 1, 1 },
+ { SDB_ATTRIBUTE, "3", 1, 0 },
};
size_t i;
"sdb_store_get_host(a) = NULL; expected: <host>");
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
- sdb_store_matcher_t *h, *a, *n;
+ sdb_store_matcher_t *m, *n;
char buf[1024];
int status;
- a = sdb_store_attr_matcher(golden_data[i].attr_name,
- golden_data[i].attr_value, golden_data[i].re);
- fail_unless(a != NULL,
- "sdb_store_attr_matcher() = NULL; expected: <matcher>");
-
- h = sdb_store_host_matcher(golden_data[i].hostname,
- golden_data[i].hostname_re, a);
- fail_unless(h != NULL,
- "sdb_store_host_matcher() = NULL: expected: <matcher>");
- /* pass ownership to the host matcher */
- sdb_object_deref(SDB_OBJ(a));
+ m = sdb_store_name_matcher(golden_data[i].type,
+ golden_data[i].name, golden_data[i].re);
+ fail_unless(m != NULL,
+ "sdb_store_service_matcher(%d, %s, %d) = NULL; expected: <matcher>",
+ golden_data[i].type, golden_data[i].name, golden_data[i].re);
- status = sdb_store_matcher_matches(h, obj);
+ status = sdb_store_matcher_matches(m, obj);
fail_unless(status == golden_data[i].expected,
- "sdb_store_matcher_matches({%s, <host a>) = %d; expected: %d",
- sdb_store_matcher_tostring(h, buf, sizeof(buf)),
+ "sdb_store_matcher_matches(%s, <host a>) = %d; expected: %d",
+ sdb_store_matcher_tostring(m, buf, sizeof(buf)),
status, golden_data[i].expected);
- n = sdb_store_inv_matcher(h);
+ n = sdb_store_inv_matcher(m);
fail_unless(n != NULL,
"sdb_store_inv_matcher() = NULL; expected: <matcher>");
- sdb_object_deref(SDB_OBJ(h));
+ sdb_object_deref(SDB_OBJ(m));
/* now match the inverted set of objects */
status = sdb_store_matcher_matches(n, obj);
fail_unless(status == !golden_data[i].expected,
- "sdb_store_matcher_matches({%s, <host a>) = %d; expected: %d",
+ "sdb_store_matcher_matches(%s, <host a>) = %d; expected: %d",
sdb_store_matcher_tostring(n, buf, sizeof(buf)),
status, !golden_data[i].expected);
}
END_TEST
-START_TEST(test_store_match_name)
+START_TEST(test_store_match_attr)
{
- sdb_store_base_t *obj;
+ sdb_store_obj_t *obj;
struct {
- int type;
- const char *name;
+ const char *attr_name;
+ const char *attr_value;
_Bool re;
int expected;
} golden_data[] = {
- { SDB_HOST, NULL, 0, 1 },
- { SDB_HOST, NULL, 1, 1 },
- { SDB_HOST, "a", 0, 1 },
- { SDB_HOST, "a", 1, 1 },
- { SDB_HOST, "b", 0, 0 },
- { SDB_HOST, "b", 1, 0 },
- { SDB_HOST, "^a$", 1, 1 },
- { SDB_HOST, "^b$", 1, 0 },
- { SDB_HOST, "^a$", 0, 0 },
- { SDB_HOST, "^b$", 0, 0 },
- { SDB_SERVICE, NULL, 0, 1 },
- { SDB_SERVICE, NULL, 1, 1 },
- { SDB_SERVICE, "s1", 0, 1 },
- { SDB_SERVICE, "s2", 0, 1 },
- { SDB_SERVICE, "s3", 0, 0 },
- { SDB_SERVICE, "s4", 0, 0 },
- { SDB_SERVICE, "^s1$", 1, 1 },
- { SDB_SERVICE, "^s1$", 0, 0 },
- { SDB_SERVICE, "x1", 0, 0 },
- { SDB_SERVICE, "x1", 1, 0 },
- { SDB_SERVICE, "x", 1, 0 },
- { SDB_ATTRIBUTE, NULL, 0, 1 },
- { SDB_ATTRIBUTE, NULL, 1, 1 },
- { SDB_ATTRIBUTE, "k1", 0, 1 },
- { SDB_ATTRIBUTE, "k2", 0, 0 },
- { SDB_ATTRIBUTE, "k3", 0, 0 },
- { SDB_ATTRIBUTE, "k", 1, 1 },
- { SDB_ATTRIBUTE, "1", 1, 1 },
- { SDB_ATTRIBUTE, "2", 1, 0 },
+ { "k1", NULL, 0, 1 },
+ { "k", NULL, 1, 0 },
+ { "1", NULL, 1, 0 },
+ { "k3", NULL, 0, 0 },
+ { "k3", NULL, 1, 0 },
+ { "k1", "v1", 0, 1 },
+ { "k1", "v1", 1, 1 },
+ { "k1", "^v1$", 1, 1 },
+ { "k1", "v", 1, 1 },
+ { "k1", "1", 1, 1 },
+ { "k1", "v2", 0, 0 },
+ { "k1", "v2", 1, 0 },
+ { "k", "v1", 0, 0 },
+ { "k", "v1", 1, 0 },
+ { "k3", "1", 0, 0 },
+ { "k3", "1", 1, 0 },
};
size_t i;
fail_unless(obj != NULL,
"sdb_store_get_host(a) = NULL; expected: <host>");
+ fail_unless(sdb_store_attr_matcher(NULL, "re", 0) == NULL,
+ "sdb_store_attr_matcher(NULL, \"re\", 0) = <m>; expected: NULL");
+ fail_unless(sdb_store_attr_matcher(NULL, "re", 1) == NULL,
+ "sdb_store_attr_matcher(NULL, \"re\", 1) = <m>; expected: NULL");
+
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
sdb_store_matcher_t *m, *n;
char buf[1024];
int status;
- m = sdb_store_name_matcher(golden_data[i].type,
- golden_data[i].name, golden_data[i].re);
+ m = sdb_store_attr_matcher(golden_data[i].attr_name,
+ golden_data[i].attr_value, golden_data[i].re);
fail_unless(m != NULL,
- "sdb_store_service_matcher(%d, %s, %d) = NULL; expected: <matcher>",
- golden_data[i].type, golden_data[i].name, golden_data[i].re);
+ "sdb_store_attr_matcher() = NULL; expected: <matcher>");
status = sdb_store_matcher_matches(m, obj);
fail_unless(status == golden_data[i].expected,
- "sdb_store_matcher_matches(%s, <host a>) = %d; expected: %d",
+ "sdb_store_matcher_matches({%s, <host a>) = %d; expected: %d",
sdb_store_matcher_tostring(m, buf, sizeof(buf)),
status, golden_data[i].expected);
/* now match the inverted set of objects */
status = sdb_store_matcher_matches(n, obj);
fail_unless(status == !golden_data[i].expected,
- "sdb_store_matcher_matches(%s, <host a>) = %d; expected: %d",
+ "sdb_store_matcher_matches({%s, <host a>) = %d; expected: %d",
sdb_store_matcher_tostring(n, buf, sizeof(buf)),
status, !golden_data[i].expected);
}
END_TEST
+START_TEST(test_store_cond)
+{
+ sdb_store_obj_t *obj;
+
+ struct {
+ const char *attr;
+ const sdb_data_t value;
+ int expected_lt, expected_le, expected_eq, expected_ge, expected_gt;
+ } golden_data[] = {
+ { "k1", { SDB_TYPE_STRING, { .string = "v1" } }, 0, 1, 1, 1, 0 },
+ { "k1", { SDB_TYPE_STRING, { .string = "v2" } }, 1, 1, 0, 0, 0 },
+ { "k1", { SDB_TYPE_STRING, { .string = "v0" } }, 0, 0, 0, 1, 1 },
+ { "k2", { SDB_TYPE_INTEGER, { .integer = 123 } }, 0, 1, 1, 1, 0 },
+ { "k2", { SDB_TYPE_INTEGER, { .integer = 124 } }, 1, 1, 0, 0, 0 },
+ { "k2", { SDB_TYPE_INTEGER, { .integer = 122 } }, 0, 0, 0, 1, 1 },
+ /* key does not exist */
+ { "k3", { SDB_TYPE_STRING, { .string = "v1" } }, 0, 0, 0, 0, 0 },
+ { "k3", { SDB_TYPE_STRING, { .string = "123" } }, 0, 0, 0, 0, 0 },
+ { "k3", { SDB_TYPE_INTEGER, { .integer = 123 } }, 0, 0, 0, 0, 0 },
+ /* type mismatch */
+ { "k1", { SDB_TYPE_INTEGER, { .integer = 0 } }, 0, 0, 0, 0, 0 },
+ { "k2", { SDB_TYPE_STRING, { .string = "123" } }, 0, 0, 0, 0, 0 },
+ };
+
+ int status;
+ size_t i;
+
+ obj = sdb_store_get_host("a");
+ fail_unless(obj != NULL,
+ "sdb_store_get_host(a) = NULL; expected: <host>");
+
+ for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+ sdb_store_cond_t *c;
+ char buf[1024];
+ size_t j;
+
+ struct {
+ sdb_store_matcher_t *(*matcher)(sdb_store_cond_t *);
+ int *expected;
+ } tests[] = {
+ { sdb_store_lt_matcher, &golden_data[i].expected_lt },
+ { sdb_store_le_matcher, &golden_data[i].expected_le },
+ { sdb_store_eq_matcher, &golden_data[i].expected_eq },
+ { sdb_store_ge_matcher, &golden_data[i].expected_ge },
+ { sdb_store_gt_matcher, &golden_data[i].expected_gt },
+ };
+
+ sdb_data_format(&golden_data[i].value,
+ buf, sizeof(buf), SDB_UNQUOTED);
+
+ c = sdb_store_attr_cond(golden_data[i].attr,
+ &golden_data[i].value);
+ fail_unless(c != NULL,
+ "sdb_store_attr_cond(%s, %s) = NULL; expected: <cond>",
+ golden_data[i].attr, buf);
+
+ for (j = 0; j < SDB_STATIC_ARRAY_LEN(tests); ++j) {
+ sdb_store_matcher_t *m;
+ char m_str[1024];
+
+ m = tests[j].matcher(c);
+ fail_unless(m != NULL,
+ "sdb_store_<cond>_matcher() = NULL; expected: <matcher>");
+
+ status = sdb_store_matcher_matches(m, obj);
+ fail_unless(status == *tests[j].expected,
+ "sdb_store_matcher_matches(%s) = %d; expected: %d",
+ sdb_store_matcher_tostring(m, m_str, sizeof(m_str)),
+ status, *tests[j].expected);
+
+ sdb_object_deref(SDB_OBJ(m));
+ }
+
+ sdb_object_deref(SDB_OBJ(c));
+ }
+
+ sdb_object_deref(SDB_OBJ(obj));
+}
+END_TEST
+
START_TEST(test_store_match_op)
{
- sdb_store_base_t *obj;
+ sdb_store_obj_t *obj;
- sdb_store_matcher_t *always = sdb_store_host_matcher(NULL, NULL, NULL);
- sdb_store_matcher_t *never = sdb_store_host_matcher("a", "b", NULL);
+ sdb_store_matcher_t *always = sdb_store_name_matcher(SDB_HOST, "a", 0);
+ sdb_store_matcher_t *never = sdb_store_name_matcher(SDB_HOST, "z", 0);
struct {
const char *op;
START_TEST(test_parse_cmp)
{
+ sdb_data_t hostname = { SDB_TYPE_STRING, { .string = "hostname" } };
+ sdb_data_t srvname = { SDB_TYPE_STRING, { .string = "srvname" } };
+ sdb_data_t attrname = { SDB_TYPE_STRING, { .string = "attrname" } };
+
sdb_store_matcher_t *check;
size_t i;
const char *obj_type;
const char *attr;
const char *op;
- const char *value;
+ const sdb_data_t value;
int expected;
} golden_data[] = {
- { "host", "name", "=", "hostname", MATCHER_NAME },
- { "host", "name", "!=", "hostname", MATCHER_NOT },
- { "host", "name", "=~", "hostname", MATCHER_NAME },
- { "host", "name", "!~", "hostname", MATCHER_NOT },
- { "host", "attr", "=", "hostname", -1 },
- { "host", "attr", "!=", "hostname", -1 },
- { "host", "name", "&^", "hostname", -1 },
- { "service", "name", "=", "srvname", MATCHER_NAME },
- { "service", "name", "!=", "srvname", MATCHER_NOT },
- { "service", "name", "=~", "srvname", MATCHER_NAME },
- { "service", "name", "!~", "srvname", MATCHER_NOT },
- { "service", "attr", "=", "srvname", -1 },
- { "service", "attr", "!=", "srvname", -1 },
- { "service", "name", "&^", "srvname", -1 },
- { "attribute", "name", "=", "attrname", MATCHER_NAME },
- { "attribute", "name", "!=", "attrname", MATCHER_NOT },
- { "attribute", "name", "=~", "attrname", MATCHER_NAME },
- { "attribute", "name", "!~", "attrname", MATCHER_NOT },
- { "attribute", "attr", "=", "attrname", MATCHER_ATTR },
- { "attribute", "attr", "!=", "attrname", MATCHER_NOT },
- { "attribute", "attr", "=~", "attrname", MATCHER_ATTR },
- { "attribute", "attr", "!~", "attrname", MATCHER_NOT },
- { "attribute", "attr", "&^", "attrname", -1 },
+ { "host", "name", "=", hostname, MATCHER_NAME },
+ { "host", "name", "!=", hostname, MATCHER_NOT },
+ { "host", "name", "=~", hostname, MATCHER_NAME },
+ { "host", "name", "!~", hostname, MATCHER_NOT },
+ { "host", "attr", "=", hostname, -1 },
+ { "host", "attr", "!=", hostname, -1 },
+ { "host", "name", "&^", hostname, -1 },
+ { "host", "name", "<", hostname, -1 },
+ { "host", "name", "<=", hostname, -1 },
+ { "host", "name", ">=", hostname, -1 },
+ { "host", "name", ">", hostname, -1 },
+ { "service", "name", "=", srvname, MATCHER_NAME },
+ { "service", "name", "!=", srvname, MATCHER_NOT },
+ { "service", "name", "=~", srvname, MATCHER_NAME },
+ { "service", "name", "!~", srvname, MATCHER_NOT },
+ { "service", "attr", "=", srvname, -1 },
+ { "service", "attr", "!=", srvname, -1 },
+ { "service", "name", "&^", srvname, -1 },
+ { "service", "name", "<", srvname, -1 },
+ { "service", "name", "<=", srvname, -1 },
+ { "service", "name", ">=", srvname, -1 },
+ { "service", "name", ">", srvname, -1 },
+ { "attribute", "name", "=", attrname, MATCHER_NAME },
+ { "attribute", "name", "!=", attrname, MATCHER_NOT },
+ { "attribute", "name", "=~", attrname, MATCHER_NAME },
+ { "attribute", "name", "!~", attrname, MATCHER_NOT },
+ { "attribute", "name", "<", attrname, -1 },
+ { "attribute", "name", "<=", attrname, -1 },
+ { "attribute", "name", ">=", attrname, -1 },
+ { "attribute", "name", ">", attrname, -1 },
+ { "attribute", "attr", "=", attrname, MATCHER_ATTR },
+ { "attribute", "attr", "!=", attrname, MATCHER_NOT },
+ { "attribute", "attr", "=~", attrname, MATCHER_ATTR },
+ { "attribute", "attr", "!~", attrname, MATCHER_NOT },
+ { "attribute", "attr", "&^", attrname, -1 },
+ { "attribute", "attr", "<", attrname, MATCHER_LT },
+ { "attribute", "attr", "<=", attrname, MATCHER_LE },
+/* { "attribute", "attr", "=", attrname, MATCHER_EQ }, */
+ { "attribute", "attr", ">=", attrname, MATCHER_GE },
+ { "attribute", "attr", ">", attrname, MATCHER_GT },
+ { "foo", "name", "=", attrname, -1 },
+ { "foo", "attr", "=", attrname, -1 },
};
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+ char buf[1024];
+
check = sdb_store_matcher_parse_cmp(golden_data[i].obj_type,
- golden_data[i].attr, golden_data[i].op, golden_data[i].value);
+ golden_data[i].attr, golden_data[i].op,
+ &golden_data[i].value);
+
+ if (sdb_data_format(&golden_data[i].value,
+ buf, sizeof(buf), SDB_UNQUOTED) < 0)
+ snprintf(buf, sizeof(buf), "ERR");
if (golden_data[i].expected == -1) {
fail_unless(check == NULL,
"sdb_store_matcher_parse_cmp(%s, %s, %s, %s) = %p; "
"expected: NULL", golden_data[i].obj_type,
- golden_data[i].attr, golden_data[i].op,
- golden_data[i].value, check);
+ golden_data[i].attr, golden_data[i].op, buf, check);
continue;
}
fail_unless(check != NULL,
"sdb_store_matcher_parse_cmp(%s, %s, %s, %s) = %p; "
"expected: NULL", golden_data[i].obj_type,
- golden_data[i].attr, golden_data[i].op,
- golden_data[i].value, check);
+ golden_data[i].attr, golden_data[i].op, buf, check);
fail_unless(M(check)->type == golden_data[i].expected,
"sdb_store_matcher_parse_cmp(%s, %s, %s, %s) returned matcher "
"of type %d; expected: %d", golden_data[i].obj_type,
- golden_data[i].attr, golden_data[i].op, golden_data[i].value,
+ golden_data[i].attr, golden_data[i].op, buf,
M(check)->type, golden_data[i].expected);
sdb_object_deref(SDB_OBJ(check));
END_TEST
static int
-lookup_cb(sdb_store_base_t *obj, void *user_data)
+lookup_cb(sdb_store_obj_t *obj, void *user_data)
{
int *i = user_data;
"OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\}" },
{ "attribute.k1 = 'v1'", 1,
"ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}" },
+ { "attribute.k2 < 123", 0,
+ "ATTR\\[k2\\]\\{ < 123 \\}" },
+ { "attribute.k2 <= 123", 1,
+ "ATTR\\[k2\\]\\{ <= 123 \\}" },
+ { "attribute.k2 >= 123", 1,
+ "ATTR\\[k2\\]\\{ >= 123 \\}" },
+ { "attribute.k2 > 123", 0,
+ "ATTR\\[k2\\]\\{ > 123 \\}" },
+ { "attribute.k2 = 123", 1,
+ "ATTR\\[k2\\]\\{ = 123 \\}" },
+ { "attribute.k2 != 123", 2,
+ "\\(NOT, ATTR\\[k2\\]\\{ = 123 \\}\\)" },
{ "attribute.k1 != 'v1'", 2,
"\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}\\)" },
{ "attribute.k1 != 'v2'", 3,
tc = tcase_create("core");
tcase_add_checked_fixture(tc, populate, sdb_store_clear);
- tcase_add_test(tc, test_store_match);
tcase_add_test(tc, test_store_match_name);
+ tcase_add_test(tc, test_store_match_attr);
+ tcase_add_test(tc, test_store_cond);
tcase_add_test(tc, test_store_match_op);
tcase_add_test(tc, test_parse_cmp);
tcase_add_test(tc, test_lookup);