Code

t/unit/: Create one test binary for each *_test.c file.
[sysdb.git] / t / unit / core / store_test.c
index f459b6e0afd461be0754fb64cd192928e8b3e2c9..7ea53bcaf76d25bb8efd70e12ea4f13db6dadb8d 100644 (file)
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif
+
 #include "core/store.h"
 #include "core/store-private.h"
-#include "libsysdb_test.h"
+#include "testutils.h"
 
 #include <check.h>
 #include <string.h>
+#include <strings.h>
 
 static void
 populate(void)
@@ -55,6 +60,7 @@ populate(void)
 
        sdb_store_metric("h1", "m1", /* store */ NULL, 2);
        sdb_store_metric("h1", "m2", /* store */ NULL, 1);
+       sdb_store_metric("h2", "m1", /* store */ NULL, 1);
 
        sdb_store_service("h2", "s1", 1);
        sdb_store_service("h2", "s2", 2);
@@ -406,301 +412,6 @@ START_TEST(test_store_service_attr)
 }
 END_TEST
 
-static void
-verify_json_output(sdb_strbuf_t *buf, const char *expected,
-               sdb_store_matcher_t *filter, int flags)
-{
-       int pos;
-       size_t len1, len2;
-       size_t i;
-
-       len1 = strlen(sdb_strbuf_string(buf));
-       len2 = strlen(expected);
-
-       pos = -1;
-       if (len1 != len2)
-               pos = (int)(len1 <= len2 ? len1 : len2);
-
-       for (i = 0; i < (len1 <= len2 ? len1 : len2); ++i) {
-               if (sdb_strbuf_string(buf)[i] != expected[i]) {
-                       pos = (int)i;
-                       break;
-               }
-       }
-
-       fail_unless(pos == -1,
-                       "sdb_store_tojson(<buf>, %p, %x) returned unexpected result\n"
-                       "         got: %s\n              %*s\n    expected: %s",
-                       filter, flags, sdb_strbuf_string(buf), pos + 1, "^",
-                       expected);
-} /* verify_json_output */
-
-START_TEST(test_store_tojson)
-{
-       sdb_strbuf_t *buf;
-       size_t i;
-
-       struct {
-               struct {
-                       sdb_store_matcher_t *(*m)(sdb_store_expr_t *,
-                                       sdb_store_expr_t *);
-                       int field;
-                       sdb_data_t value;
-               } filter;
-               int flags;
-               const char *expected;
-       } golden_data[] = {
-               { { NULL, 0, SDB_DATA_INIT }, 0,
-                       "["
-                               "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                       "\"attributes\": ["
-                                               "{\"name\": \"k1\", \"value\": \"v1\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                                               "{\"name\": \"k2\", \"value\": \"v2\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                                               "{\"name\": \"k3\", \"value\": \"v3\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []}"
-                                       "], "
-                                       "\"metrics\": ["
-                                               "{\"name\": \"m1\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                                       "\"attributes\": ["
-                                                               "{\"name\": \"k3\", \"value\": 42, "
-                                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                                       "\"update_interval\": \"0s\", \"backends\": []}"
-                                                       "]},"
-                                               "{\"name\": \"m2\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                                       "\"attributes\": []}"
-                                       "], "
-                                       "\"services\": []},"
-                               "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                       "\"attributes\": [], "
-                                       "\"metrics\": [], "
-                                       "\"services\": ["
-                                               "{\"name\": \"s1\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                                       "\"attributes\": []},"
-                                               "{\"name\": \"s2\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                                       "\"attributes\": ["
-                                                               "{\"name\": \"k1\", \"value\": 123, "
-                                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                                                               "{\"name\": \"k2\", \"value\": 4711, "
-                                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                                       "\"update_interval\": \"0s\", \"backends\": []}"
-                                                       "]}"
-                                       "]}"
-                       "]" },
-               { { NULL, 0, SDB_DATA_INIT }, SDB_SKIP_SERVICES,
-                       "["
-                               "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                       "\"attributes\": ["
-                                               "{\"name\": \"k1\", \"value\": \"v1\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                                               "{\"name\": \"k2\", \"value\": \"v2\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                                               "{\"name\": \"k3\", \"value\": \"v3\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []}"
-                                       "], "
-                                       "\"metrics\": ["
-                                               "{\"name\": \"m1\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                                       "\"attributes\": ["
-                                                               "{\"name\": \"k3\", \"value\": 42, "
-                                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                                       "\"update_interval\": \"0s\", \"backends\": []}"
-                                                       "]},"
-                                               "{\"name\": \"m2\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                                       "\"attributes\": []}"
-                                       "]},"
-                               "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                       "\"attributes\": [], "
-                                       "\"metrics\": []}"
-                       "]" },
-               { { NULL, 0, SDB_DATA_INIT }, SDB_SKIP_METRICS,
-                       "["
-                               "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                       "\"attributes\": ["
-                                               "{\"name\": \"k1\", \"value\": \"v1\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                                               "{\"name\": \"k2\", \"value\": \"v2\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                                               "{\"name\": \"k3\", \"value\": \"v3\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []}"
-                                       "], "
-                                       "\"services\": []},"
-                               "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                       "\"attributes\": [], "
-                                       "\"services\": ["
-                                               "{\"name\": \"s1\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                                       "\"attributes\": []},"
-                                               "{\"name\": \"s2\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                                       "\"attributes\": ["
-                                                               "{\"name\": \"k1\", \"value\": 123, "
-                                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                                                               "{\"name\": \"k2\", \"value\": 4711, "
-                                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                                       "\"update_interval\": \"0s\", \"backends\": []}"
-                                                       "]}"
-                                       "]}"
-                       "]" },
-               { { NULL, 0, SDB_DATA_INIT }, SDB_SKIP_ATTRIBUTES,
-                       "["
-                               "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                       "\"metrics\": ["
-                                               "{\"name\": \"m1\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                                               "{\"name\": \"m2\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []}"
-                                       "], "
-                                       "\"services\": []},"
-                               "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                       "\"metrics\": [], "
-                                       "\"services\": ["
-                                               "{\"name\": \"s1\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                                               "{\"name\": \"s2\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []}"
-                                       "]}"
-                       "]" },
-               { { NULL, 0, SDB_DATA_INIT }, SDB_SKIP_ALL,
-                       "["
-                               "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                               "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": []}"
-                       "]" },
-               { { sdb_store_eq_matcher, SDB_FIELD_NAME,
-                               { SDB_TYPE_STRING, { .string = "h1" } } }, 0,
-                       "["
-                               "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                       "\"attributes\": [], \"metrics\": [], \"services\": []}"
-                       "]" },
-               { { sdb_store_gt_matcher, SDB_FIELD_LAST_UPDATE,
-                               { SDB_TYPE_DATETIME, { .datetime = 1 } } }, 0,
-                       "["
-                               "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                       "\"attributes\": [], "
-                                       "\"metrics\": [], "
-                                       "\"services\": ["
-                                               "{\"name\": \"s2\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                                       "\"attributes\": ["
-                                                               "{\"name\": \"k1\", \"value\": 123, "
-                                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                                                       "]}"
-                                       "]}"
-                       "]" },
-               { { sdb_store_le_matcher, SDB_FIELD_LAST_UPDATE,
-                               { SDB_TYPE_DATETIME, { .datetime = 1 } } }, 0,
-                       "["
-                               "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                       "\"attributes\": ["
-                                               "{\"name\": \"k1\", \"value\": \"v1\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": []},"
-                                       "], "
-                                       "\"metrics\": ["
-                                               "{\"name\": \"m2\", "
-                                                       "\"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                                       "\"attributes\": []}"
-                                       "], "
-                                       "\"services\": []}"
-                       "]" },
-               { { sdb_store_ge_matcher, SDB_FIELD_LAST_UPDATE,
-                               { SDB_TYPE_DATETIME, { .datetime = 3 } } }, 0,
-                       "["
-                               "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", "
-                                       "\"update_interval\": \"0s\", \"backends\": [], "
-                                       "\"attributes\": [], "
-                                       "\"metrics\": [], "
-                                       "\"services\": []}"
-                       "]" },
-       };
-
-       buf = sdb_strbuf_create(0);
-       fail_unless(buf != NULL, "INTERNAL ERROR: failed to create string buffer");
-       populate();
-
-       for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
-               sdb_store_matcher_t *filter = NULL;
-               int status;
-
-               sdb_strbuf_clear(buf);
-
-               if (golden_data[i].filter.m) {
-                       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");
-
-                       filter = golden_data[i].filter.m(field, value);
-                       fail_unless(filter != NULL,
-                                       "INTERNAL ERROR: sdb_store_*_matcher() = NULL");
-
-                       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>, %p, %x) = %d; expected: 0",
-                               filter, golden_data[i].flags, status);
-
-               verify_json_output(buf, golden_data[i].expected,
-                               filter, golden_data[i].flags);
-               sdb_object_deref(SDB_OBJ(filter));
-       }
-       sdb_strbuf_destroy(buf);
-}
-END_TEST
-
 START_TEST(test_get_field)
 {
        sdb_store_obj_t *host;
@@ -795,6 +506,95 @@ START_TEST(test_get_field)
 }
 END_TEST
 
+START_TEST(test_get_child)
+{
+       struct {
+               const char *host;
+               const char *name;
+               int type;
+               int expected;
+       } golden_data[] = {
+               { "h1", NULL, SDB_HOST,       0 },
+               { "h1", NULL, SDB_SERVICE,   -1 },
+               { "h1", NULL, SDB_METRIC,    -1 },
+               { "h1", NULL, SDB_ATTRIBUTE, -1 },
+               { "h2", NULL, SDB_HOST,       0 },
+               { "h2", NULL, SDB_SERVICE,   -1 },
+               { "h2", NULL, SDB_METRIC,    -1 },
+               { "h2", NULL, SDB_ATTRIBUTE, -1 },
+               { "h3", NULL, SDB_HOST,      -1 },
+               { "h1", "k1", SDB_ATTRIBUTE,  0 },
+               { "h1", "x1", SDB_ATTRIBUTE, -1 },
+               { "h2", "k1", SDB_ATTRIBUTE, -1 },
+               { "h1", "k1", SDB_SERVICE,   -1 },
+               { "h1", "k1", SDB_METRIC,    -1 },
+               { "h1", "s1", SDB_SERVICE,   -1 },
+               { "h2", "s1", SDB_SERVICE,    0 },
+               { "h1", "m2", SDB_METRIC,     0 },
+               { "h2", "m2", SDB_METRIC,    -1 },
+       };
+
+       size_t i;
+
+       populate();
+
+       for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+               sdb_store_obj_t *obj;
+               const char *expected_name = golden_data[i].host;
+
+               obj = sdb_store_get_host(golden_data[i].host);
+               if (golden_data[i].expected && (golden_data[i].type == SDB_HOST))
+                       fail_unless(obj == NULL,
+                                       "sdb_store_get_host(%s) = %p; expected: NULL",
+                                       golden_data[i].host, obj);
+               else
+                       fail_unless(obj != NULL,
+                                       "sdb_store_get_host(%s) = NULL; expected: <host>",
+                                       golden_data[i].host);
+
+               if (golden_data[i].type != SDB_HOST) {
+                       sdb_store_obj_t *tmp;
+
+                       expected_name = golden_data[i].name;
+
+                       tmp = sdb_store_get_child(obj,
+                                       golden_data[i].type, golden_data[i].name);
+                       if (golden_data[i].expected)
+                               fail_unless(tmp == NULL,
+                                               "sdb_store_get_child(<%s>, %s, %s) = %p; "
+                                               "expected: NULL", golden_data[i].host,
+                                               SDB_STORE_TYPE_TO_NAME(golden_data[i].type),
+                                               golden_data[i].name, tmp);
+                       else
+                               fail_unless(tmp != NULL,
+                                               "sdb_store_get_child(<%s>, %s, %s) = NULL; "
+                                               "expected: <obj>", golden_data[i].host,
+                                               SDB_STORE_TYPE_TO_NAME(golden_data[i].type),
+                                               golden_data[i].name);
+
+                       sdb_object_deref(SDB_OBJ(obj));
+                       obj = tmp;
+               }
+
+               if (golden_data[i].expected)
+                       continue;
+
+               fail_unless(obj->type == golden_data[i].type,
+                               "sdb_store_get_<%s>(%s, %s) returned object of type %d; "
+                               "expected: %d", SDB_STORE_TYPE_TO_NAME(golden_data[i].type),
+                               golden_data[i].host, golden_data[i].name, obj->type,
+                               golden_data[i].type);
+               fail_unless(! strcasecmp(SDB_OBJ(obj)->name, expected_name),
+                               "sdb_store_get_<%s>(%s, %s) returned object named '%s'; "
+                               "expected: '%s'", SDB_STORE_TYPE_TO_NAME(golden_data[i].type),
+                               golden_data[i].host, golden_data[i].name, SDB_OBJ(obj)->name,
+                               expected_name);
+
+               sdb_object_deref(SDB_OBJ(obj));
+       }
+}
+END_TEST
+
 START_TEST(test_interval)
 {
        sdb_store_obj_t *host;
@@ -852,75 +652,99 @@ START_TEST(test_interval)
 END_TEST
 
 static int
-iter_incr(sdb_store_obj_t *obj, void *user_data)
+scan_count(sdb_store_obj_t *obj, sdb_store_matcher_t *filter, void *user_data)
 {
        intptr_t *i = user_data;
 
+       if (! sdb_store_matcher_matches(filter, obj, NULL))
+               return 0;
+
        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_count */
 
 static int
-iter_error(sdb_store_obj_t *obj, void *user_data)
+scan_error(sdb_store_obj_t *obj, sdb_store_matcher_t *filter, void *user_data)
 {
        intptr_t *i = user_data;
 
+       if (! sdb_store_matcher_matches(filter, obj, NULL))
+               return 0;
+
        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);
-       fail_unless(check == -1,
-                       "sdb_store_iterate(), empty store = %d; expected: -1", check);
+       check = sdb_store_scan(SDB_HOST, /* m, filter = */ NULL, NULL,
+                       scan_count, &i);
+       fail_unless(check == 0,
+                       "sdb_store_scan(HOST), empty store = %d; expected: 0", check);
        fail_unless(i == 0,
-                       "sdb_store_iterate called callback %d times; expected: 0", (int)i);
+                       "sdb_store_scan(HOST) called callback %d times; "
+                       "expected: 0", (int)i);
 
        populate();
 
-       check = sdb_store_iterate(iter_incr, &i);
+       check = sdb_store_scan(SDB_HOST, /* m, filter = */ NULL, NULL,
+                       scan_count, &i);
        fail_unless(check == 0,
-                       "sdb_store_iterate() = %d; expected: 0", check);
+                       "sdb_store_scan(HOST) = %d; expected: 0", check);
        fail_unless(i == 2,
-                       "sdb_store_iterate called callback %d times; expected: 1", (int)i);
+                       "sdb_store_scan(HOST) called callback %d times; "
+                       "expected: 1", (int)i);
 
        i = 0;
-       check = sdb_store_iterate(iter_error, &i);
+       check = sdb_store_scan(SDB_HOST, /* m, filter = */ NULL, NULL,
+                       scan_error, &i);
        fail_unless(check == -1,
-                       "sdb_store_iterate(), error callback = %d; expected: -1", check);
+                       "sdb_store_scan(HOST), error callback = %d; expected: -1", check);
        fail_unless(i == 1,
-                       "sdb_store_iterate called callback %d times "
+                       "sdb_store_scan(HOST) called callback %d times "
                        "(callback returned error); expected: 1", (int)i);
+
+       i = 0;
+       check = sdb_store_scan(SDB_SERVICE, /* m, filter = */ NULL, NULL,
+                       scan_count, &i);
+       fail_unless(check == 0,
+                       "sdb_store_scan(SERVICE) = %d; expected: 0", check);
+       fail_unless(i == 2,
+                       "sdb_store_scan(SERVICE) called callback %d times; "
+                       "expected: 2", (int)i);
+
+       i = 0;
+       check = sdb_store_scan(SDB_METRIC, /* m, filter = */ NULL, NULL,
+                       scan_count, &i);
+       fail_unless(check == 0,
+                       "sdb_store_scan(METRIC) = %d; expected: 0", check);
+       fail_unless(i == 3,
+                       "sdb_store_scan(METRIC) called callback %d times; "
+                       "expected: 3", (int)i);
 }
 END_TEST
 
-Suite *
-core_store_suite(void)
+TEST_MAIN("core::store")
 {
-       Suite *s = suite_create("core::store");
-       TCase *tc;
-
-       tc = tcase_create("core");
-       tcase_add_test(tc, test_store_tojson);
+       TCase *tc = tcase_create("core");
        tcase_add_test(tc, test_store_host);
        tcase_add_test(tc, test_store_get_host);
        tcase_add_test(tc, test_store_attr);
@@ -929,13 +753,13 @@ core_store_suite(void)
        tcase_add_test(tc, test_store_service);
        tcase_add_test(tc, test_store_service_attr);
        tcase_add_test(tc, test_get_field);
+       tcase_add_test(tc, test_get_child);
        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);
-
-       return s;
-} /* core_store_suite */
+       ADD_TCASE(tc);
+}
+TEST_MAIN_END
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */