X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Funit%2Fcore%2Fstore_lookup_test.c;h=7ecaaf0c3706fb535909cf8488c23dc158234e99;hb=33d51d5f84495bc8d7805c2370af45948e46c30b;hp=7536f390bc96cfe9b556326271925c367ff6d0a7;hpb=ea9e77cb6bee990c4087a8cefc9d8cc2311b39d1;p=sysdb.git

diff --git a/t/unit/core/store_lookup_test.c b/t/unit/core/store_lookup_test.c
index 7536f39..7ecaaf0 100644
--- a/t/unit/core/store_lookup_test.c
+++ b/t/unit/core/store_lookup_test.c
@@ -410,36 +410,36 @@ START_TEST(test_parse_cmp)
 		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",      NULL,   "=",  &hostname, MATCHER_NAME },
+		{ "host",      NULL,   "!=", &hostname, MATCHER_NOT },
+		{ "host",      NULL,   "=~", &hostname, MATCHER_NAME },
+		{ "host",      NULL,   "!~", &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 },
+		{ "host",      NULL,   "&^", &hostname, -1 },
+		{ "host",      NULL,   "<",  &hostname, -1 },
+		{ "host",      NULL,   "<=", &hostname, -1 },
+		{ "host",      NULL,   ">=", &hostname, -1 },
+		{ "host",      NULL,   ">",  &hostname, -1 },
+		{ "service",   NULL,   "=",  &srvname,  MATCHER_NAME },
+		{ "service",   NULL,   "!=", &srvname,  MATCHER_NOT },
+		{ "service",   NULL,   "=~", &srvname,  MATCHER_NAME },
+		{ "service",   NULL,   "!~", &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 },
+		{ "service",   NULL,   "&^", &srvname,  -1 },
+		{ "service",   NULL,   "<",  &srvname,  -1 },
+		{ "service",   NULL,   "<=", &srvname,  -1 },
+		{ "service",   NULL,   ">=", &srvname,  -1 },
+		{ "service",   NULL,   ">",  &srvname,  -1 },
+		{ "attribute", NULL,   "=",  &attrname, MATCHER_NAME },
+		{ "attribute", NULL,   "!=", &attrname, MATCHER_NOT },
+		{ "attribute", NULL,   "=~", &attrname, MATCHER_NAME },
+		{ "attribute", NULL,   "!~", &attrname, MATCHER_NOT },
+		{ "attribute", NULL,   "<",  &attrname, -1 },
+		{ "attribute", NULL,   "<=", &attrname, -1 },
+		{ "attribute", NULL,   ">=", &attrname, -1 },
+		{ "attribute", NULL,   ">",  &attrname, -1 },
 		{ "attribute", "attr", "=",  &attrname, MATCHER_ATTR },
 		{ "attribute", "attr", "!=", &attrname, MATCHER_NOT },
 		{ "attribute", "attr", "=~", &attrname, MATCHER_ATTR },
@@ -452,7 +452,7 @@ START_TEST(test_parse_cmp)
 		{ "attribute", "attr", ">",  &attrname, MATCHER_GT },
 		{ "attribute", "attr", "IS", NULL,      MATCHER_ISNULL },
 		{ "attribute", "attr", "IS", &attrname, -1 },
-		{ "foo",       "name", "=",  &attrname, -1 },
+		{ "foo",       NULL,   "=",  &attrname, -1 },
 		{ "foo",       "attr", "=",  &attrname, -1 },
 	};
 
@@ -514,23 +514,23 @@ START_TEST(test_lookup)
 		int expected;
 		const char *tostring_re;
 	} golden_data[] = {
-		{ "host.name = 'a'",          1,
+		{ "host = 'a'",               1,
 			"OBJ\\[host\\]\\{ NAME\\{ 'a', \\(nil\\) \\} \\}" },
-		{ "host.name =~ 'a|b'",       2,
+		{ "host =~ 'a|b'",            2,
 			"OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" },
-		{ "host.name =~ 'host'",      0,
+		{ "host =~ 'host'",           0,
 			"OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" },
-		{ "host.name =~ '.'",         3,
+		{ "host =~ '.'",              3,
 			"OBJ\\[host\\]\\{ NAME\\{ NULL, "PTR_RE" \\} \\}" },
-		{ "service.name = 's1'",      2,
+		{ "service = 's1'",           2,
 			"OBJ\\[service\\]\\{ NAME\\{ 's1', \\(nil\\) } \\}" },
-		{ "service.name =~ 's'",      2,
+		{ "service =~ 's'",           2,
 			"OBJ\\[service\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}" },
-		{ "service.name !~ 's'",      1,
+		{ "service !~ 's'",           1,
 			"\\(NOT, OBJ\\[service\\]\\{ NAME\\{ NULL, "PTR_RE" } \\}\\)" },
-		{ "attribute.name = 'k1'",    1,
+		{ "attribute = 'k1'",         1,
 			"OBJ\\[attribute\\]\\{ NAME\\{ 'k1', \\(nil\\) \\} " },
-		{ "attribute.name = 'x'",     0,
+		{ "attribute = 'x'",          0,
 			"OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\}" },
 		{ "attribute.k1 = 'v1'",      1,
 			"ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}" },
@@ -558,7 +558,7 @@ START_TEST(test_lookup)
 			"\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v1', \\(nil\\) \\} \\}\\)" },
 		{ "attribute.k1 != 'v2'",     3,
 			"\\(NOT, ATTR\\[k1\\]\\{ VALUE\\{ 'v2', \\(nil\\) \\} \\}\\)" },
-		{ "attribute.name != 'x' "
+		{ "attribute != 'x' "
 		  "AND attribute.y !~ 'x'",   3,
 			"\\(AND, "
 				"\\(NOT, OBJ\\[attribute\\]\\{ NAME\\{ 'x', \\(nil\\) \\} \\}\\), "