index 7ecaaf0c3706fb535909cf8488c23dc158234e99..43bb1e53d7746bcc4689895be686f5eeacd04aff 100644 (file)
{ "host", NULL, "<=", &hostname, -1 },
{ "host", NULL, ">=", &hostname, -1 },
{ "host", NULL, ">", &hostname, -1 },
+ { "host", NULL, "=", NULL, -1 },
{ "service", NULL, "=", &srvname, MATCHER_NAME },
{ "service", NULL, "!=", &srvname, MATCHER_NOT },
{ "service", NULL, "=~", &srvname, MATCHER_NAME },
{ "service", NULL, "<=", &srvname, -1 },
{ "service", NULL, ">=", &srvname, -1 },
{ "service", NULL, ">", &srvname, -1 },
+ { "service", NULL, "=", NULL, -1 },
{ "attribute", NULL, "=", &attrname, MATCHER_NAME },
{ "attribute", NULL, "!=", &attrname, MATCHER_NOT },
{ "attribute", NULL, "=~", &attrname, MATCHER_NAME },
{ "attribute", NULL, "<=", &attrname, -1 },
{ "attribute", NULL, ">=", &attrname, -1 },
{ "attribute", NULL, ">", &attrname, -1 },
+ { "attribute", NULL, "=", NULL, -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", "<", NULL, -1 },
{ "attribute", "attr", "<", &attrname, MATCHER_LT },
{ "attribute", "attr", "<=", &attrname, MATCHER_LE },
/* { "attribute", "attr", "=", &attrname, MATCHER_EQ }, */
END_TEST
static int
-lookup_cb(sdb_store_obj_t *obj, void *user_data)
+scan_cb(sdb_store_obj_t *obj, void *user_data)
{
int *i = user_data;
fail_unless(obj != NULL,
- "sdb_store_lookup callback received NULL obj; expected: "
+ "sdb_store_scan callback received NULL obj; expected: "
"<store base obj>");
fail_unless(i != NULL,
- "sdb_store_lookup callback received NULL user_data; "
+ "sdb_store_scan callback received NULL user_data; "
"expected: <pointer to data>");
++(*i);
return 0;
-} /* lookup_cb */
+} /* scan_cb */
-START_TEST(test_lookup)
+START_TEST(test_scan)
{
#define PTR_RE "0x[0-9a-f]+"
struct {
size_t i;
n = 0;
- check = sdb_store_lookup(NULL, lookup_cb, &n);
+ check = sdb_store_scan(NULL, scan_cb, &n);
fail_unless(check == 0,
- "sdb_store_lookup() = %d; expected: 0", check);
+ "sdb_store_scan() = %d; expected: 0", check);
fail_unless(n == 3,
- "sdb_store_lookup called callback %d times; expected: 3", (int)n);
+ "sdb_store_scan called callback %d times; expected: 3", (int)n);
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
sdb_store_matcher_t *m;
golden_data[i].tostring_re);
n = 0;
- sdb_store_lookup(m, lookup_cb, &n);
+ sdb_store_scan(m, scan_cb, &n);
fail_unless(n == golden_data[i].expected,
- "sdb_store_lookup(matcher{%s}) found %d hosts; expected: %d",
+ "sdb_store_scan(matcher{%s}) found %d hosts; expected: %d",
golden_data[i].query, n, golden_data[i].expected);
sdb_object_deref(SDB_OBJ(m));
}
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);
+ tcase_add_test(tc, test_scan);
suite_add_tcase(s, tc);
return s;