X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2Funit%2Fcore%2Fstore_test.c;h=dbf220cef4f26d718a505b8a9678812bbd0a1360;hp=0d0c56bce6df859074e64590cf910eea3bfa67f5;hb=da52b4da948c741d20c7a3995ce5d133af377def;hpb=ffaf79ce48d2173371f7cbf07842b2bbbc6a993c diff --git a/t/unit/core/store_test.c b/t/unit/core/store_test.c index 0d0c56b..dbf220c 100644 --- a/t/unit/core/store_test.c +++ b/t/unit/core/store_test.c @@ -25,12 +25,17 @@ * 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 #include +#include static void populate(void) @@ -38,7 +43,7 @@ populate(void) sdb_data_t datum; sdb_store_host("h1", 1); - sdb_store_host("h2", 1); + sdb_store_host("h2", 3); datum.type = SDB_TYPE_STRING; datum.data.string = "v1"; @@ -53,14 +58,23 @@ populate(void) sdb_store_attribute("h1", "k2", &datum, 1); sdb_store_attribute("h1", "k3", &datum, 2); + 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", 1); + sdb_store_service("h2", "s2", 2); datum.type = SDB_TYPE_INTEGER; + datum.data.integer = 42; + sdb_store_metric_attr("h1", "m1", "k3", &datum, 2); + datum.data.integer = 123; sdb_store_service_attr("h2", "s2", "k1", &datum, 2); + datum.data.integer = 4711; + sdb_store_service_attr("h2", "s2", "k2", &datum, 1); - /* don't overwrite */ + /* don't overwrite k1 */ datum.data.integer = 666; sdb_store_service_attr("h2", "s2", "k1", &datum, 2); } /* populate */ @@ -218,6 +232,103 @@ START_TEST(test_store_attr) } END_TEST +START_TEST(test_store_metric) +{ + sdb_metric_store_t store1 = { "dummy-type1", "dummy-id1" }; + sdb_metric_store_t store2 = { "dummy-type2", "dummy-id2" }; + + struct { + const char *host; + const char *metric; + sdb_metric_store_t *store; + sdb_time_t last_update; + int expected; + } golden_data[] = { + { "k", "m", NULL, 1, -1 }, + { "k", "m", NULL, 1, -1 }, /* retry to ensure the host is not created */ + { "k", "m", &store1, 1, -1 }, + { "l", "m1", NULL, 1, 0 }, + { "l", "m1", &store1, 2, 0 }, + { "l", "m1", &store1, 3, 0 }, + { "l", "m1", NULL, 3, 1 }, + { "l", "m2", &store1, 1, 0 }, + { "l", "m2", &store2, 2, 0 }, + { "l", "m2", NULL, 3, 0 }, + { "m", "m", &store1, 1, 0 }, + { "m", "m", NULL, 2, 0 }, + { "m", "m", NULL, 2, 1 }, + { "m", "m", &store1, 3, 0 }, + { "m", "m", &store2, 4, 0 }, + { "m", "m", NULL, 5, 0 }, + }; + + size_t i; + + sdb_store_host("m", 1); + sdb_store_host("l", 1); + for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { + int status; + + status = sdb_store_metric(golden_data[i].host, + golden_data[i].metric, golden_data[i].store, + golden_data[i].last_update); + fail_unless(status == golden_data[i].expected, + "sdb_store_metric(%s, %s, %p, %d) = %d; expected: %d", + golden_data[i].host, golden_data[i].metric, + golden_data[i].store, golden_data[i].last_update, + status, golden_data[i].expected); + } +} +END_TEST + +START_TEST(test_store_metric_attr) +{ + struct { + const char *host; + const char *metric; + const char *attr; + const sdb_data_t value; + sdb_time_t last_update; + int expected; + } golden_data[] = { + { "k", "m1", "a1", { SDB_TYPE_INTEGER, { .integer = 123 } }, 1, -1 }, + /* retry, it should still fail */ + { "k", "m1", "a1", { SDB_TYPE_INTEGER, { .integer = 123 } }, 1, -1 }, + { "l", "mX", "a1", { SDB_TYPE_INTEGER, { .integer = 123 } }, 1, -1 }, + /* retry, it should still fail */ + { "l", "mX", "a1", { SDB_TYPE_INTEGER, { .integer = 123 } }, 1, -1 }, + { "l", "m1", "a1", { SDB_TYPE_INTEGER, { .integer = 123 } }, 1, 0 }, + { "l", "m1", "a1", { SDB_TYPE_INTEGER, { .integer = 123 } }, 1, 1 }, + { "l", "m1", "a1", { SDB_TYPE_INTEGER, { .integer = 123 } }, 2, 0 }, + { "l", "m1", "a2", { SDB_TYPE_INTEGER, { .integer = 123 } }, 1, 0 }, + { "l", "m1", "a2", { SDB_TYPE_INTEGER, { .integer = 123 } }, 1, 1 }, + { "l", "m2", "a2", { SDB_TYPE_INTEGER, { .integer = 123 } }, 1, 0 }, + { "m", "m1", "a1", { SDB_TYPE_INTEGER, { .integer = 123 } }, 1, 0 }, + }; + + size_t i; + + sdb_store_host("m", 1); + sdb_store_host("l", 1); + sdb_store_metric("m", "m1", NULL, 1); + sdb_store_metric("l", "m1", NULL, 1); + sdb_store_metric("l", "m2", NULL, 1); + + for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { + int status; + + status = sdb_store_metric_attr(golden_data[i].host, + golden_data[i].metric, golden_data[i].attr, + &golden_data[i].value, golden_data[i].last_update); + fail_unless(status == golden_data[i].expected, + "sdb_store_metric_attr(%s, %s, %s, %d, %d) = %d; " + "expected: %d", golden_data[i].host, golden_data[i].metric, + golden_data[i].attr, golden_data[i].value.data.integer, + golden_data[i].last_update, status, golden_data[i].expected); + } +} +END_TEST + START_TEST(test_store_service) { struct { @@ -301,136 +412,209 @@ START_TEST(test_store_service_attr) } END_TEST -static void -verify_json_output(sdb_strbuf_t *buf, const char *expected, int flags) +static struct { + const char *hostname; + const char *attr; /* optional */ + int field; + int expected; + sdb_data_t value; +} get_field_data[] = { + { NULL, NULL, 0, -1, { SDB_TYPE_NULL, { 0 } } }, + { NULL, NULL, SDB_FIELD_LAST_UPDATE, -1, { SDB_TYPE_NULL, { 0 } } }, + { NULL, NULL, SDB_FIELD_INTERVAL, -1, { SDB_TYPE_NULL, { 0 } } }, + { NULL, NULL, SDB_FIELD_AGE, -1, { SDB_TYPE_NULL, { 0 } } }, + { NULL, NULL, SDB_FIELD_NAME, -1, { SDB_TYPE_NULL, { 0 } } }, + { NULL, NULL, SDB_FIELD_BACKEND, -1, { SDB_TYPE_NULL, { 0 } } }, + { NULL, NULL, SDB_FIELD_VALUE, -1, { SDB_TYPE_NULL, { 0 } } }, + { "host", NULL, SDB_FIELD_LAST_UPDATE, 0, { SDB_TYPE_DATETIME, { .datetime = 20 } } }, + { "host", NULL, SDB_FIELD_INTERVAL, 0, { SDB_TYPE_DATETIME, { .datetime = 10 } } }, + /* the test will handle AGE specially */ + { "host", NULL, SDB_FIELD_AGE, 0, { SDB_TYPE_NULL, { 0 } } }, + { "host", NULL, SDB_FIELD_NAME, 0, { SDB_TYPE_STRING, { .string = "host" } } }, + { "host", NULL, SDB_FIELD_BACKEND, 0, { SDB_TYPE_ARRAY | SDB_TYPE_STRING, { .array = { 0, NULL } } } }, + { "host", NULL, SDB_FIELD_VALUE, -1, { SDB_TYPE_NULL, { 0 } } }, + { "host", "attr", SDB_FIELD_LAST_UPDATE, 0, { SDB_TYPE_DATETIME, { .datetime = 20 } } }, + { "host", "attr", SDB_FIELD_INTERVAL, 0, { SDB_TYPE_DATETIME, { .datetime = 10 } } }, + /* the test will handle AGE specially */ + { "host", "attr", SDB_FIELD_AGE, 0, { SDB_TYPE_NULL, { 0 } } }, + { "host", "attr", SDB_FIELD_NAME, 0, { SDB_TYPE_STRING, { .string = "attr" } } }, + { "host", "attr", SDB_FIELD_BACKEND, 0, { SDB_TYPE_ARRAY | SDB_TYPE_STRING, { .array = { 0, NULL } } } }, + { "host", "attr", SDB_FIELD_VALUE, 0, { SDB_TYPE_INTEGER, { .integer = 1 } } }, + { "host", "attr", SDB_FIELD_VALUE, 0, { SDB_TYPE_DECIMAL, { .decimal = 2.0 } } }, + { "host", "attr", SDB_FIELD_VALUE, 0, { SDB_TYPE_STRING, { .string = "foo" } } }, + { "host", "attr", SDB_FIELD_VALUE, 0, { SDB_TYPE_DATETIME, { .datetime = 1234567890L } } }, + { "host", "a", SDB_FIELD_LAST_UPDATE, -1, { SDB_TYPE_NULL, { 0 } } }, + { "host", "a", SDB_FIELD_INTERVAL, -1, { SDB_TYPE_NULL, { 0 } } }, + { "host", "a", SDB_FIELD_AGE, -1, { SDB_TYPE_NULL, { 0 } } }, + { "host", "a", SDB_FIELD_NAME, -1, { SDB_TYPE_NULL, { 0 } } }, + { "host", "a", SDB_FIELD_BACKEND, -1, { SDB_TYPE_NULL, { 0 } } }, + { "host", "a", SDB_FIELD_VALUE, -1, { SDB_TYPE_NULL, { 0 } } }, + { "host", "a", SDB_FIELD_VALUE, -1, { SDB_TYPE_NULL, { 0 } } }, + { "host", "a", SDB_FIELD_VALUE, -1, { SDB_TYPE_NULL, { 0 } } }, + { "host", "a", SDB_FIELD_VALUE, -1, { SDB_TYPE_NULL, { 0 } } }, +}; + +/* returns a tuple */ +#define OBJ_NAME(obj) \ + (obj) ? SDB_STORE_TYPE_TO_NAME(obj->type) : "NULL", \ + (obj) ? SDB_OBJ(obj)->name : "" +START_TEST(test_get_field) { - int pos; - size_t len1, len2; - size_t i; + sdb_store_obj_t *obj = NULL; + sdb_data_t value = SDB_DATA_INIT; + char value_str[128], expected_value_str[128]; + sdb_time_t now = sdb_gettime(); + int check; - len1 = strlen(sdb_strbuf_string(buf)); - len2 = strlen(expected); + sdb_store_host("host", 10); + sdb_store_host("host", 20); + sdb_store_attribute("host", "attr", &get_field_data[_i].value, 10); + sdb_store_attribute("host", "attr", &get_field_data[_i].value, 20); + + if (get_field_data[_i].hostname) { + obj = sdb_store_get_host(get_field_data[_i].hostname); + ck_assert(obj != NULL); + + if (get_field_data[_i].attr) { + sdb_store_obj_t *tmp = sdb_store_get_child(obj, + SDB_ATTRIBUTE, get_field_data[_i].attr); + sdb_object_deref(SDB_OBJ(obj)); + obj = tmp; + } + } - pos = -1; - if (len1 != len2) - pos = (int)(len1 <= len2 ? len1 : len2); + check = sdb_store_get_field(obj, get_field_data[_i].field, NULL); + fail_unless(check == get_field_data[_i].expected, + "sdb_store_get_field(%s %s, %s, NULL) = %d; expected: %d", + OBJ_NAME(obj), SDB_FIELD_TO_NAME(get_field_data[_i].field), + check, get_field_data[_i].expected); + check = sdb_store_get_field(obj, get_field_data[_i].field, &value); + fail_unless(check == get_field_data[_i].expected, + "sdb_store_get_field(%s %s, %s, ) = %d; expected: %d", + OBJ_NAME(obj), SDB_FIELD_TO_NAME(get_field_data[_i].field), + check, get_field_data[_i].expected); + + if (get_field_data[_i].expected) { + sdb_object_deref(SDB_OBJ(obj)); + return; + } - for (i = 0; i < (len1 <= len2 ? len1 : len2); ++i) { - if (sdb_strbuf_string(buf)[i] != expected[i]) { - pos = (int)i; - break; - } + if (get_field_data[_i].field == SDB_FIELD_AGE) { + get_field_data[_i].value.type = SDB_TYPE_DATETIME; + get_field_data[_i].value.data.datetime = now; } - fail_unless(pos == -1, - "sdb_store_tojson(%x) returned unexpected result\n" - " got: %s\n %*s\n expected: %s", - flags, sdb_strbuf_string(buf), pos + 1, "^", expected); -} /* verify_json_output */ + sdb_data_format(&value, value_str, sizeof(value_str), 0); + sdb_data_format(&get_field_data[_i].value, expected_value_str, + sizeof(expected_value_str), 0); + + if (get_field_data[_i].field == SDB_FIELD_AGE) { + fail_unless((value.type == SDB_TYPE_DATETIME) + && (value.data.datetime >= now), + "sdb_store_get_field(%s %s, %s, ) " + "returned value %s; expected >=%s", OBJ_NAME(obj), + SDB_FIELD_TO_NAME(get_field_data[_i].field), + value_str, expected_value_str); + } + else { + fail_unless(! sdb_data_cmp(&value, &get_field_data[_i].value), + "sdb_store_get_field(%s %s, %s, ) " + "returned value %s; expected %s", OBJ_NAME(obj), + SDB_FIELD_TO_NAME(get_field_data[_i].field), + value_str, expected_value_str); + } + sdb_data_free_datum(&value); + sdb_object_deref(SDB_OBJ(obj)); +} +END_TEST +#undef OBJ_NAME -START_TEST(test_store_tojson) +START_TEST(test_get_child) { - sdb_strbuf_t *buf; - size_t i; - struct { - int flags; - const char *expected; + const char *host; + const char *name; + int type; + int expected; } golden_data[] = { - { 0, "{\"hosts\":[" - "{\"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\": []}" - "]}" - "]}" - "]}" }, - { SDB_SKIP_SERVICES, - "{\"hosts\":[" - "{\"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\": []}" - "]}," - "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " - "\"update_interval\": \"0s\", \"backends\": [], " - "\"attributes\": []}" - "]}" }, - { SDB_SKIP_ATTRIBUTES, - "{\"hosts\":[" - "{\"name\": \"h1\", \"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\": [], " - "\"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\": []}" - "]}" - "]}" }, - { SDB_SKIP_SERVICES | SDB_SKIP_ATTRIBUTES, - "{\"hosts\":[" - "{\"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\": []}" - "]}" }, + { "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 }, }; - buf = sdb_strbuf_create(0); - fail_unless(buf != NULL, "INTERNAL ERROR: failed to create string buffer"); + size_t i; + populate(); for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { - int status; - - sdb_strbuf_clear(buf); - - status = sdb_store_tojson(buf, golden_data[i].flags); - fail_unless(status == 0, - "sdb_store_tojson(%x) = %d; expected: 0", - golden_data[i].flags, status); + 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: ", + 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: ", 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; + } - verify_json_output(buf, golden_data[i].expected, golden_data[i].flags); + 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)); } - sdb_strbuf_destroy(buf); } END_TEST @@ -450,7 +634,7 @@ START_TEST(test_interval) fail_unless(host->interval == 10, "sdb_store_host() did not calculate interval correctly: " - "got: %"PRIscTIME"; expected: %"PRIscTIME, host->interval, 10); + "got: %"PRIsdbTIME"; expected: %"PRIsdbTIME, host->interval, 10); /* multiple updates for the same timestamp don't modify the interval */ sdb_store_host("host", 40); @@ -460,8 +644,8 @@ START_TEST(test_interval) fail_unless(host->interval == 10, "sdb_store_host() changed interval when doing multiple updates " - "using the same timestamp; got: %"PRIscTIME"; " - "expected: %"PRIscTIME, host->interval, 10); + "using the same timestamp; got: %"PRIsdbTIME"; " + "expected: %"PRIsdbTIME, host->interval, 10); /* multiple updates using an timestamp don't modify the interval */ sdb_store_host("host", 20); @@ -471,107 +655,134 @@ START_TEST(test_interval) fail_unless(host->interval == 10, "sdb_store_host() changed interval when doing multiple updates " - "using an old timestamp; got: %"PRIscTIME"; expected: %"PRIscTIME, + "using an old timestamp; got: %"PRIsdbTIME"; expected: %"PRIsdbTIME, host->interval, 10); /* new interval: 20 us */ sdb_store_host("host", 60); fail_unless(host->interval == 11, "sdb_store_host() did not calculate interval correctly: " - "got: %"PRIscTIME"; expected: %"PRIscTIME, host->interval, 11); + "got: %"PRIsdbTIME"; expected: %"PRIsdbTIME, host->interval, 11); /* new interval: 40 us */ sdb_store_host("host", 100); fail_unless(host->interval == 13, "sdb_store_host() did not calculate interval correctly: " - "got: %"PRIscTIME"; expected: %"PRIscTIME, host->interval, 11); + "got: %"PRIsdbTIME"; expected: %"PRIsdbTIME, host->interval, 11); sdb_object_deref(SDB_OBJ(host)); } 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: " ""); fail_unless(i != NULL, - "sdb_store_iterate callback received NULL user_data; " + "sdb_store_scan callback received NULL user_data; " "expected: "); ++(*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: " ""); fail_unless(i != NULL, - "sdb_store_iterate callback received NULL user_data; " + "sdb_store_scan callback received NULL user_data; " "expected: "); ++(*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); + tcase_add_test(tc, test_store_metric); + tcase_add_test(tc, test_store_metric_attr); tcase_add_test(tc, test_store_service); tcase_add_test(tc, test_store_service_attr); + TC_ADD_LOOP_TEST(tc, 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 : */