X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Funit%2Fcore%2Fstore_lookup_test.c;h=b5cb0d2000df93f75249ccb9fb31064cd542123c;hb=f16f904e1f266e079ba6f06ae7952a11b29d5dfd;hp=efd2071e4590ef9b6846e2b3015ef5ffd39c5366;hpb=77a6c3b08a4ad75673a4b6209230a52082927589;p=sysdb.git

diff --git a/t/unit/core/store_lookup_test.c b/t/unit/core/store_lookup_test.c
index efd2071..b5cb0d2 100644
--- a/t/unit/core/store_lookup_test.c
+++ b/t/unit/core/store_lookup_test.c
@@ -54,6 +54,7 @@ populate(void)
 		sdb_data_t  value;
 	} attrs[] = {
 		{ "a", "k1", { SDB_TYPE_STRING, { .string = "v1" } } },
+		{ "a", "k2", { SDB_TYPE_INTEGER, { .integer = 123 } } },
 	};
 
 	size_t i;
@@ -82,193 +83,6 @@ populate(void)
 	}
 } /* populate */
 
-START_TEST(test_store_match)
-{
-	sdb_store_base_t *obj;
-
-	struct {
-		const char *hostname;
-		const char *hostname_re;
-
-		const char *service_name;
-		const char *service_name_re;
-
-		const char *attr_name;
-		const char *attr_name_re;
-		const char *attr_value;
-		const char *attr_value_re;
-
-		int expected;
-	} golden_data[] = {
-		{
-			/* host */ NULL, NULL,
-			/* svc  */ NULL, NULL,
-			/* attr */ NULL, NULL, NULL, NULL, 1
-		},
-		{
-			/* host */ "a", NULL,
-			/* svc  */ NULL, NULL,
-			/* attr */ NULL, NULL, NULL, NULL, 1
-		},
-		{
-			/* host */ "b", NULL,
-			/* svc  */ NULL, NULL,
-			/* attr */ NULL, NULL, NULL, NULL, 0
-		},
-		{
-			/* host */ NULL, "^a$",
-			/* svc  */ NULL, NULL,
-			/* attr */ NULL, NULL, NULL, NULL, 1
-		},
-		{
-			/* host */ NULL, "^b$",
-			/* svc  */ NULL, NULL,
-			/* attr */ NULL, NULL, NULL, NULL, 0
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ NULL, NULL,
-			/* attr */ NULL, NULL, NULL, NULL, 1
-		},
-		{
-			/* host */ "a", "^b$",
-			/* svc  */ NULL, NULL,
-			/* attr */ NULL, NULL, NULL, NULL, 0
-		},
-		{
-			/* host */ "b", "^a$",
-			/* svc  */ NULL, NULL,
-			/* attr */ NULL, NULL, NULL, NULL, 0
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ "s1", NULL,
-			/* attr */ NULL, NULL, NULL, NULL, 1
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ NULL, "^s1$",
-			/* attr */ NULL, NULL, NULL, NULL, 1
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ "s1", "^s1$",
-			/* attr */ NULL, NULL, NULL, NULL, 1
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ "x1", NULL,
-			/* attr */ NULL, NULL, NULL, NULL, 0
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ NULL, "x",
-			/* attr */ NULL, NULL, NULL, NULL, 0
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ "x1", "x",
-			/* attr */ NULL, NULL, NULL, NULL, 0
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ "s1", "x",
-			/* attr */ NULL, NULL, NULL, NULL, 0
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ "x1", "s",
-			/* attr */ NULL, NULL, NULL, NULL, 0
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ "s1", "^s1$",
-			/* attr */ "k1", NULL, NULL, NULL, 1
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ "s1", "^s1$",
-			/* attr */ NULL, "^k", NULL, NULL, 1
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ "s1", "^s1$",
-			/* attr */ NULL, NULL, "v1", NULL, 1
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ "s1", "^s1$",
-			/* attr */ NULL, NULL, NULL, "^v1$", 1
-		},
-		{
-			/* host */ "a", "^a$",
-			/* svc  */ "s1", "^s1$",
-			/* attr */ "k1", "1", "v1", "1", 1
-		},
-	};
-
-	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_matcher_t *h, *s, *a, *n;
-		int status;
-
-		s = sdb_store_service_matcher(golden_data[i].service_name,
-				golden_data[i].service_name_re, NULL);
-		fail_unless(s != NULL,
-				"sdb_store_service_matcher() = NULL; expected: <matcher>");
-
-		a = sdb_store_attr_matcher(golden_data[i].attr_name,
-				golden_data[i].attr_name_re, golden_data[i].attr_value,
-				golden_data[i].attr_value_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, s, a);
-		fail_unless(h != NULL,
-				"sdb_store_host_matcher() = NULL: expected: <matcher>");
-		/* pass ownership to the host matcher */
-		sdb_object_deref(SDB_OBJ(s));
-		sdb_object_deref(SDB_OBJ(a));
-
-		status = sdb_store_matcher_matches(h, obj);
-		fail_unless(status == golden_data[i].expected,
-				"sdb_store_matcher_matches({{%s, %s},{%s, %s},"
-				"{%s, %s, %s, %s}}, <host a>) = %d; expected: %d",
-				golden_data[i].hostname, golden_data[i].hostname_re,
-				golden_data[i].service_name, golden_data[i].service_name_re,
-				golden_data[i].attr_name, golden_data[i].attr_name_re,
-				golden_data[i].attr_value, golden_data[i].attr_value_re,
-				status, golden_data[i].expected);
-
-		n = sdb_store_inv_matcher(h);
-		fail_unless(n != NULL,
-				"sdb_store_inv_matcher() = NULL; expected: <matcher>");
-		sdb_object_deref(SDB_OBJ(h));
-
-		/* 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(NOT{{%s, %s},{%s, %s},"
-				"{%s, %s, %s, %s}}, <host a>) = %d; expected: %d",
-				golden_data[i].hostname, golden_data[i].hostname_re,
-				golden_data[i].service_name, golden_data[i].service_name_re,
-				golden_data[i].attr_name, golden_data[i].attr_name_re,
-				golden_data[i].attr_value, golden_data[i].attr_value_re,
-				status, !golden_data[i].expected);
-
-		sdb_object_deref(SDB_OBJ(n));
-	}
-
-	sdb_object_deref(SDB_OBJ(obj));
-}
-END_TEST
-
 START_TEST(test_store_match_name)
 {
 	sdb_store_base_t *obj;
@@ -304,11 +118,12 @@ START_TEST(test_store_match_name)
 		{ SDB_ATTRIBUTE, NULL,   0, 1 },
 		{ SDB_ATTRIBUTE, NULL,   1, 1 },
 		{ SDB_ATTRIBUTE, "k1",   0, 1 },
-		{ SDB_ATTRIBUTE, "k2",   0, 0 },
+		{ 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, "2",    1, 0 },
+		{ SDB_ATTRIBUTE, "3",    1, 0 },
 	};
 
 	size_t i;
@@ -344,8 +159,85 @@ START_TEST(test_store_match_name)
 		fail_unless(status == !golden_data[i].expected,
 				"sdb_store_matcher_matches(%s, <host a>) = %d; expected: %d",
 				sdb_store_matcher_tostring(n, buf, sizeof(buf)),
+				status, !golden_data[i].expected);
+
+		sdb_object_deref(SDB_OBJ(n));
+	}
+
+	sdb_object_deref(SDB_OBJ(obj));
+}
+END_TEST
+
+START_TEST(test_store_match_attr)
+{
+	sdb_store_base_t *obj;
+
+	struct {
+		const char *attr_name;
+		const char *attr_value;
+		_Bool re;
+
+		int expected;
+	} golden_data[] = {
+		{ "k1", NULL,   0, 1 },
+		{ "k",  NULL,   1, 0 },
+		{ "1",  NULL,   1, 0 },
+		{ "k3", NULL,   0, 0 },
+		{ "k3", 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;
+
+	obj = sdb_store_get_host("a");
+	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_attr_matcher(golden_data[i].attr_name,
+				golden_data[i].attr_value, golden_data[i].re);
+		fail_unless(m != NULL,
+				"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_tostring(m, buf, sizeof(buf)),
 				status, golden_data[i].expected);
 
+		n = sdb_store_inv_matcher(m);
+		fail_unless(n != NULL,
+				"sdb_store_inv_matcher() = NULL; expected: <matcher>");
+		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_tostring(n, buf, sizeof(buf)),
+				status, !golden_data[i].expected);
+
 		sdb_object_deref(SDB_OBJ(n));
 	}
 
@@ -353,12 +245,82 @@ START_TEST(test_store_match_name)
 }
 END_TEST
 
+START_TEST(test_store_cond)
+{
+	sdb_store_base_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 = tests[j].matcher(c);
+			char m_str[1024];
+			sdb_object_deref(SDB_OBJ(c));
+			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);
+		}
+	}
+}
+END_TEST
+
 START_TEST(test_store_match_op)
 {
 	sdb_store_base_t *obj;
 
-	sdb_store_matcher_t *always = sdb_store_host_matcher(NULL, NULL, NULL, NULL);
-	sdb_store_matcher_t *never = sdb_store_host_matcher("a", "b", NULL, 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;
@@ -425,6 +387,10 @@ END_TEST
 
 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;
@@ -433,56 +399,80 @@ START_TEST(test_parse_cmp)
 		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_HOST },
-		{ "attribute", "attr", "!=", "attrname", MATCHER_NOT },
-		{ "attribute", "attr", "=~", "attrname", MATCHER_HOST },
-		{ "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));
@@ -533,23 +523,16 @@ START_TEST(test_lookup)
 		{ "attribute.name = 'x'",  0,
 			"OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\}" },
 		{ "attribute.k1 = 'v1'",   1,
-			"HOST\\{ NAME\\{ NULL, \\(nil\\) \\}, SERVICE\\{\\}, ATTR\\{ "
-					"NAME\\{ 'k1', \\(nil\\) }, VALUE\\{ 'v1', \\(nil\\) \\} "
-				"\\} \\}" },
+			"ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}" },
 		{ "attribute.k1 != 'v1'",  2,
-			"\\(NOT, HOST\\{ NAME\\{ NULL, \\(nil\\) \\}, SERVICE\\{\\}, ATTR\\{ "
-					"NAME\\{ 'k1', \\(nil\\) }, VALUE\\{ 'v1', \\(nil\\) \\} "
-				"\\} \\})" },
+			"\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}\\)" },
 		{ "attribute.k1 != 'v2'",  3,
-			"\\(NOT, HOST\\{ NAME\\{ NULL, \\(nil\\) \\}, SERVICE\\{\\}, ATTR\\{ "
-					"NAME\\{ 'k1', \\(nil\\) }, VALUE\\{ 'v2', \\(nil\\) \\} "
-				"\\} \\})" },
+			"\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v2', \\(nil\\) \\} \\}\\)" },
 		{ "attribute.name != 'x' "
 		  "AND attribute.y !~ 'x'", 3,
-			"\\(AND, \\(NOT, OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\} "
-				"\\}\\), \\(NOT, HOST\\{ NAME\\{ NULL, \\(nil\\) \\}, SERVICE\\{\\}, ATTR\\{ "
-						"NAME\\{ 'y', \\(nil\\) }, VALUE\\{ NULL, "PTR_RE" \\} "
-					"\\} \\}\\)\\)" },
+			"\\(AND, "
+				"\\(NOT, OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\} \\}\\), "
+				"\\(NOT, ATTR\\[y\\]\\{ VALUE\\{ NULL, "PTR_RE" \\} \\}\\)\\)" },
 	};
 
 	int check, n;
@@ -595,8 +578,9 @@ core_store_lookup_suite(void)
 
 	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);