index 826d938fc4444a5d02a0bde60812dcb83ebc0933..ecbb39d93b601ebe4f2da1891f4779d379bbf368 100644 (file)
--- a/t/unit/core/store_test.c
+++ b/t/unit/core/store_test.c
static void
verify_json_output(sdb_strbuf_t *buf, const char *expected,
- const char *filter_str, int flags)
+ sdb_store_matcher_t *filter, int flags)
{
int pos;
size_t len1, len2;
}
fail_unless(pos == -1,
- "sdb_store_tojson(<buf>, %s, %x) returned unexpected result\n"
+ "sdb_store_tojson(<buf>, %p, %x) returned unexpected result\n"
" got: %s\n %*s\n expected: %s",
- filter_str, flags, sdb_strbuf_string(buf), pos + 1, "^",
+ filter, flags, sdb_strbuf_string(buf), pos + 1, "^",
expected);
} /* verify_json_output */
struct {
struct {
- sdb_store_matcher_t *(*m)(sdb_store_cond_t *);
+ sdb_store_matcher_t *(*m)(sdb_store_expr_t *,
+ sdb_store_expr_t *);
int field;
sdb_data_t value;
} filter;
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
sdb_store_matcher_t *filter = NULL;
- char filter_str[1024] = "<none>";
int status;
sdb_strbuf_clear(buf);
if (golden_data[i].filter.m) {
- sdb_store_expr_t *expr;
- sdb_store_cond_t *c = NULL;
-
- expr = sdb_store_expr_constvalue(&golden_data[i].filter.value);
- fail_unless(expr != NULL,
+ sdb_store_expr_t *field;
+ sdb_store_expr_t *value;
+
+ field = sdb_store_expr_fieldvalue(golden_data[i].filter.field);
+ fail_unless(field != NULL,
+ "INTERNAL ERROR: sdb_store_expr_fieldvalue() = NULL");
+ value = sdb_store_expr_constvalue(&golden_data[i].filter.value);
+ fail_unless(value != NULL,
"INTERNAL ERROR: sdb_store_expr_constvalue() = NULL");
- c = sdb_store_obj_cond(golden_data[i].filter.field, expr);
- sdb_object_deref(SDB_OBJ(expr));
- fail_unless(c != NULL,
- "INTERNAL ERROR: sdb_store_obj_cond() = NULL");
- filter = golden_data[i].filter.m(c);
- sdb_object_deref(SDB_OBJ(c));
+
+ filter = golden_data[i].filter.m(field, value);
fail_unless(filter != NULL,
"INTERNAL ERROR: sdb_store_*_matcher() = NULL");
- if (sdb_store_matcher_tostring(filter,
- filter_str, sizeof(filter_str)))
- snprintf(filter_str, sizeof(filter_str), "ERR");
+ sdb_object_deref(SDB_OBJ(field));
+ sdb_object_deref(SDB_OBJ(value));
}
status = sdb_store_tojson(buf, filter, golden_data[i].flags);
fail_unless(status == 0,
- "sdb_store_tojson(<buf>, %s, %x) = %d; expected: 0",
- filter_str, golden_data[i].flags, status);
+ "sdb_store_tojson(<buf>, %p, %x) = %d; expected: 0",
+ filter, golden_data[i].flags, status);
verify_json_output(buf, golden_data[i].expected,
- filter_str, golden_data[i].flags);
+ filter, golden_data[i].flags);
sdb_object_deref(SDB_OBJ(filter));
}
sdb_strbuf_destroy(buf);
END_TEST
static int
-iter_incr(sdb_store_obj_t *obj, void *user_data)
+scan_incr(sdb_store_obj_t *obj, void *user_data)
{
intptr_t *i = user_data;
fail_unless(obj != NULL,
- "sdb_store_iterate callback received NULL obj; expected: "
+ "sdb_store_scan callback received NULL obj; expected: "
"<store base obj>");
fail_unless(i != NULL,
- "sdb_store_iterate callback received NULL user_data; "
+ "sdb_store_scan callback received NULL user_data; "
"expected: <pointer to data>");
++(*i);
return 0;
-} /* iter_incr */
+} /* scan_incr */
static int
-iter_error(sdb_store_obj_t *obj, void *user_data)
+scan_error(sdb_store_obj_t *obj, void *user_data)
{
intptr_t *i = user_data;
fail_unless(obj != NULL,
- "sdb_store_iterate callback received NULL obj; expected: "
+ "sdb_store_scan callback received NULL obj; expected: "
"<store base obj>");
fail_unless(i != NULL,
- "sdb_store_iterate callback received NULL user_data; "
+ "sdb_store_scan callback received NULL user_data; "
"expected: <pointer to data>");
++(*i);
return -1;
-} /* iter_error */
+} /* scan_error */
-START_TEST(test_iterate)
+START_TEST(test_scan)
{
intptr_t i = 0;
int check;
/* empty store */
- check = sdb_store_iterate(iter_incr, &i);
+ check = sdb_store_scan(/* m, filter = */ NULL, NULL, scan_incr, &i);
fail_unless(check == -1,
- "sdb_store_iterate(), empty store = %d; expected: -1", check);
+ "sdb_store_scan(), empty store = %d; expected: -1", check);
fail_unless(i == 0,
- "sdb_store_iterate called callback %d times; expected: 0", (int)i);
+ "sdb_store_scan called callback %d times; expected: 0", (int)i);
populate();
- check = sdb_store_iterate(iter_incr, &i);
+ check = sdb_store_scan(/* m, filter = */ NULL, NULL, scan_incr, &i);
fail_unless(check == 0,
- "sdb_store_iterate() = %d; expected: 0", check);
+ "sdb_store_scan() = %d; expected: 0", check);
fail_unless(i == 2,
- "sdb_store_iterate called callback %d times; expected: 1", (int)i);
+ "sdb_store_scan called callback %d times; expected: 1", (int)i);
i = 0;
- check = sdb_store_iterate(iter_error, &i);
+ check = sdb_store_scan(/* m, filter = */ NULL, NULL, scan_error, &i);
fail_unless(check == -1,
- "sdb_store_iterate(), error callback = %d; expected: -1", check);
+ "sdb_store_scan(), error callback = %d; expected: -1", check);
fail_unless(i == 1,
- "sdb_store_iterate called callback %d times "
+ "sdb_store_scan called callback %d times "
"(callback returned error); expected: 1", (int)i);
}
END_TEST
tcase_add_test(tc, test_store_service_attr);
tcase_add_test(tc, test_get_field);
tcase_add_test(tc, test_interval);
- tcase_add_test(tc, test_iterate);
+ tcase_add_test(tc, test_scan);
tcase_add_unchecked_fixture(tc, NULL, sdb_store_clear);
suite_add_tcase(s, tc);