X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2Funit%2Fcore%2Fstore_json_test.c;h=a0447b639e8b5ea73de65ab8b15f4d9289c3da1a;hp=9dc157068183b49c2e2c4e1e74276bcccee9c064;hb=5cf58d25c37585bdc7aef79cfc899fdf5ba02ef2;hpb=1e0fdabbbd59d4c868f731664743d4e2dc0fecc9 diff --git a/t/unit/core/store_json_test.c b/t/unit/core/store_json_test.c index 9dc1570..a0447b6 100644 --- a/t/unit/core/store_json_test.c +++ b/t/unit/core/store_json_test.c @@ -25,71 +25,90 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "core/store.h" -#include "libsysdb_test.h" +#if HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include "core/memstore.h" +#include "core/store.h" +#include "testutils.h" #include #include +/* Make SDB_INTERVAL_SECOND a constant initializer. */ +#undef SDB_INTERVAL_SECOND +#define SDB_INTERVAL_SECOND 1000000000L + +static sdb_memstore_t *store; + static void populate(void) { sdb_data_t datum; - sdb_store_host("h1", 1); - sdb_store_host("h2", 3); + store = sdb_memstore_create(); + ck_assert(store != NULL); + + sdb_memstore_host(store, "h1", 1 * SDB_INTERVAL_SECOND, 0); + sdb_memstore_host(store, "h2", 3 * SDB_INTERVAL_SECOND, 0); datum.type = SDB_TYPE_STRING; datum.data.string = "v1"; - sdb_store_attribute("h1", "k1", &datum, 1); + sdb_memstore_attribute(store, "h1", "k1", &datum, 1 * SDB_INTERVAL_SECOND, 0); datum.data.string = "v2"; - sdb_store_attribute("h1", "k2", &datum, 2); + sdb_memstore_attribute(store, "h1", "k2", &datum, 2 * SDB_INTERVAL_SECOND, 0); datum.data.string = "v3"; - sdb_store_attribute("h1", "k3", &datum, 2); + sdb_memstore_attribute(store, "h1", "k3", &datum, 2 * SDB_INTERVAL_SECOND, 0); +/* TODO: move these tests into generic store tests */ +#if 0 /* make sure that older updates don't overwrite existing values */ datum.data.string = "fail"; - sdb_store_attribute("h1", "k2", &datum, 1); - sdb_store_attribute("h1", "k3", &datum, 2); + sdb_memstore_attribute(store, "h1", "k2", &datum, 1 * SDB_INTERVAL_SECOND, 0); + sdb_memstore_attribute(store, "h1", "k3", &datum, 2 * SDB_INTERVAL_SECOND, 0); +#endif - 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_memstore_metric(store, "h1", "m1", /* store */ NULL, 2 * SDB_INTERVAL_SECOND, 0); + sdb_memstore_metric(store, "h1", "m2", /* store */ NULL, 1 * SDB_INTERVAL_SECOND, 0); + sdb_memstore_metric(store, "h2", "m1", /* store */ NULL, 1 * SDB_INTERVAL_SECOND, 0); - sdb_store_service("h2", "s1", 1); - sdb_store_service("h2", "s2", 2); + sdb_memstore_service(store, "h2", "s1", 1 * SDB_INTERVAL_SECOND, 0); + sdb_memstore_service(store, "h2", "s2", 2 * SDB_INTERVAL_SECOND, 0); datum.type = SDB_TYPE_INTEGER; datum.data.integer = 42; - sdb_store_metric_attr("h1", "m1", "k3", &datum, 2); + sdb_memstore_metric_attr(store, "h1", "m1", "k3", + &datum, 2 * SDB_INTERVAL_SECOND, 0); datum.data.integer = 123; - sdb_store_service_attr("h2", "s2", "k1", &datum, 2); + sdb_memstore_service_attr(store, "h2", "s2", "k1", + &datum, 2 * SDB_INTERVAL_SECOND, 0); datum.data.integer = 4711; - sdb_store_service_attr("h2", "s2", "k2", &datum, 1); - - /* don't overwrite k1 */ - datum.data.integer = 666; - sdb_store_service_attr("h2", "s2", "k1", &datum, 2); + sdb_memstore_service_attr(store, "h2", "s2", "k2", + &datum, 1 * SDB_INTERVAL_SECOND, 0); } /* populate */ +static void +turndown(void) +{ + sdb_object_deref(SDB_OBJ(store)); + store = NULL; +} /* turndown */ + static int -scan_tojson(sdb_store_obj_t *obj, - sdb_store_matcher_t __attribute__((unused)) *filter, +scan_tojson(sdb_memstore_obj_t *obj, + sdb_memstore_matcher_t __attribute__((unused)) *filter, void *user_data) { - sdb_store_json_formatter_t *f = user_data; - return sdb_store_json_emit(f, obj); + return sdb_memstore_emit(obj, &sdb_store_json_writer, user_data); } /* scan_tojson */ static int -scan_tojson_full(sdb_store_obj_t *obj, sdb_store_matcher_t *filter, +scan_tojson_full(sdb_memstore_obj_t *obj, sdb_memstore_matcher_t *filter, void *user_data) { - sdb_store_json_formatter_t *f = user_data; - return sdb_store_json_emit_full(f, obj, filter); + return sdb_memstore_emit_full(obj, filter, &sdb_store_json_writer, user_data); } /* scan_tojson_full */ static void @@ -120,67 +139,66 @@ verify_json_output(sdb_strbuf_t *buf, const char *expected) struct { struct { - sdb_store_matcher_t *(*m)(sdb_store_expr_t *, - sdb_store_expr_t *); + sdb_memstore_matcher_t *(*m)(sdb_memstore_expr_t *, sdb_memstore_expr_t *); int field; sdb_data_t value; } filter; int type; - int (*f)(sdb_store_obj_t *, sdb_store_matcher_t *, void *); + int (*f)(sdb_memstore_obj_t *, sdb_memstore_matcher_t *, void *); const char *expected; } store_tojson_data[] = { { { NULL, 0, SDB_DATA_INIT }, SDB_HOST, scan_tojson_full, "[" - "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " + "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:01 +0000\", " "\"update_interval\": \"0s\", \"backends\": [], " "\"attributes\": [" "{\"name\": \"k1\", \"value\": \"v1\", " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}," "{\"name\": \"k2\", \"value\": \"v2\", " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}," "{\"name\": \"k3\", \"value\": \"v3\", " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}" "], " "\"metrics\": [" "{\"name\": \"m1\", " "\"timeseries\": false, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": [], " "\"attributes\": [" "{\"name\": \"k3\", \"value\": 42, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}" "]}," "{\"name\": \"m2\", " "\"timeseries\": false, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}" "]}," - "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " + "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:03 +0000\", " "\"update_interval\": \"0s\", \"backends\": [], " "\"metrics\": [" "{\"name\": \"m1\", " "\"timeseries\": false, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}" "], " "\"services\": [" "{\"name\": \"s1\", " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}," "{\"name\": \"s2\", " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": [], " "\"attributes\": [" "{\"name\": \"k1\", \"value\": 123, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}," "{\"name\": \"k2\", \"value\": 4711, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}" "]}" "]}" @@ -188,61 +206,61 @@ struct { { { NULL, 0, SDB_DATA_INIT }, SDB_HOST, scan_tojson, "[" - "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " + "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:01 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}," - "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " + "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:03 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}" "]" }, - { { sdb_store_eq_matcher, SDB_FIELD_NAME, + { { sdb_memstore_eq_matcher, SDB_FIELD_NAME, { SDB_TYPE_STRING, { .string = "h1" } } }, SDB_HOST, scan_tojson_full, "[" - "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " + "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:01 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}" "]" }, - { { sdb_store_gt_matcher, SDB_FIELD_LAST_UPDATE, - { SDB_TYPE_DATETIME, { .datetime = 1 } } }, + { { sdb_memstore_gt_matcher, SDB_FIELD_LAST_UPDATE, + { SDB_TYPE_DATETIME, { .datetime = 1 * SDB_INTERVAL_SECOND } } }, SDB_HOST, scan_tojson_full, "[" - "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " + "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:03 +0000\", " "\"update_interval\": \"0s\", \"backends\": [], " "\"services\": [" "{\"name\": \"s2\", " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": [], " "\"attributes\": [" "{\"name\": \"k1\", \"value\": 123, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}" "]}" "]}" "]" }, - { { sdb_store_le_matcher, SDB_FIELD_LAST_UPDATE, - { SDB_TYPE_DATETIME, { .datetime = 1 } } }, + { { sdb_memstore_le_matcher, SDB_FIELD_LAST_UPDATE, + { SDB_TYPE_DATETIME, { .datetime = 1 * SDB_INTERVAL_SECOND } } }, SDB_HOST, scan_tojson_full, "[" - "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " + "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:01 +0000\", " "\"update_interval\": \"0s\", \"backends\": [], " "\"attributes\": [" "{\"name\": \"k1\", \"value\": \"v1\", " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}" "], " "\"metrics\": [" "{\"name\": \"m2\", " "\"timeseries\": false, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}" "]}" "]" }, - { { sdb_store_ge_matcher, SDB_FIELD_LAST_UPDATE, - { SDB_TYPE_DATETIME, { .datetime = 3 } } }, + { { sdb_memstore_ge_matcher, SDB_FIELD_LAST_UPDATE, + { SDB_TYPE_DATETIME, { .datetime = 3 * SDB_INTERVAL_SECOND } } }, SDB_HOST, scan_tojson_full, "[" - "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " + "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:03 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}" "]" }, - { { sdb_store_lt_matcher, SDB_FIELD_LAST_UPDATE, + { { sdb_memstore_lt_matcher, SDB_FIELD_LAST_UPDATE, { SDB_TYPE_DATETIME, { .datetime = 0 } } }, SDB_HOST, scan_tojson_full, "[]" }, @@ -250,127 +268,95 @@ struct { { { NULL, 0, SDB_DATA_INIT }, SDB_SERVICE, scan_tojson_full, "[" - "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " + "{\"name\": \"s1\", " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " + "\"update_interval\": \"0s\", \"backends\": []}," + "{\"name\": \"s2\", " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": [], " - "\"services\": [" - "{\"name\": \"s1\", " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"attributes\": [" + "{\"name\": \"k1\", \"value\": 123, " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}," - "{\"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\": []}" - "]}" + "{\"name\": \"k2\", \"value\": 4711, " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " + "\"update_interval\": \"0s\", \"backends\": []}" "]}" "]" }, { { NULL, 0, SDB_DATA_INIT }, SDB_SERVICE, scan_tojson, "[" - "{\"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\": []}" - "]}" + "{\"name\": \"s1\", " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " + "\"update_interval\": \"0s\", \"backends\": []}," + "{\"name\": \"s2\", " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " + "\"update_interval\": \"0s\", \"backends\": []}" "]" }, - { { sdb_store_gt_matcher, SDB_FIELD_LAST_UPDATE, - { SDB_TYPE_DATETIME, { .datetime = 1 } } }, + { { sdb_memstore_gt_matcher, SDB_FIELD_LAST_UPDATE, + { SDB_TYPE_DATETIME, { .datetime = 1 * SDB_INTERVAL_SECOND } } }, SDB_SERVICE, scan_tojson_full, "[" - "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " + "{\"name\": \"s2\", " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": [], " - "\"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\": []}" - "]}" + "\"attributes\": [" + "{\"name\": \"k1\", \"value\": 123, " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " + "\"update_interval\": \"0s\", \"backends\": []}" "]}" "]" }, - { { sdb_store_lt_matcher, SDB_FIELD_LAST_UPDATE, + { { sdb_memstore_lt_matcher, SDB_FIELD_LAST_UPDATE, { SDB_TYPE_DATETIME, { .datetime = 0 } } }, SDB_SERVICE, scan_tojson_full, "[]" }, { { NULL, 0, SDB_DATA_INIT }, SDB_METRIC, scan_tojson_full, "[" - "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " + "{\"name\": \"m1\", " + "\"timeseries\": false, " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": [], " - "\"metrics\": [" - "{\"name\": \"m1\", " - "\"timeseries\": false, " - "\"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\", " - "\"timeseries\": false, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " + "\"attributes\": [" + "{\"name\": \"k3\", \"value\": 42, " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " "\"update_interval\": \"0s\", \"backends\": []}" "]}," - "{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " - "\"update_interval\": \"0s\", \"backends\": [], " - "\"metrics\": [" - "{\"name\": \"m1\", " - "\"timeseries\": false, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " - "\"update_interval\": \"0s\", \"backends\": []}" - "]}" + "{\"name\": \"m2\", " + "\"timeseries\": false, " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " + "\"update_interval\": \"0s\", \"backends\": []}," + "{\"name\": \"m1\", " + "\"timeseries\": false, " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " + "\"update_interval\": \"0s\", \"backends\": []}" "]" }, { { NULL, 0, SDB_DATA_INIT }, SDB_METRIC, scan_tojson, "[" - "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " - "\"update_interval\": \"0s\", \"backends\": [], " - "\"metrics\": [" - "{\"name\": \"m1\", " - "\"timeseries\": false, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " - "\"update_interval\": \"0s\", \"backends\": []}," - "{\"name\": \"m2\", " - "\"timeseries\": false, " - "\"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\": [], " - "\"metrics\": [" - "{\"name\": \"m1\", " - "\"timeseries\": false, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " - "\"update_interval\": \"0s\", \"backends\": []}" - "]}" + "{\"name\": \"m1\", " + "\"timeseries\": false, " + "\"last_update\": \"1970-01-01 00:00:02 +0000\", " + "\"update_interval\": \"0s\", \"backends\": []}," + "{\"name\": \"m2\", " + "\"timeseries\": false, " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " + "\"update_interval\": \"0s\", \"backends\": []}," + "{\"name\": \"m1\", " + "\"timeseries\": false, " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " + "\"update_interval\": \"0s\", \"backends\": []}" "]" }, - { { sdb_store_le_matcher, SDB_FIELD_LAST_UPDATE, - { SDB_TYPE_DATETIME, { .datetime = 1 } } }, + { { sdb_memstore_le_matcher, SDB_FIELD_LAST_UPDATE, + { SDB_TYPE_DATETIME, { .datetime = 1 * SDB_INTERVAL_SECOND } } }, SDB_METRIC, scan_tojson_full, "[" - "{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:00 +0000\", " - "\"update_interval\": \"0s\", \"backends\": [], " - "\"metrics\": [" - "{\"name\": \"m2\", " - "\"timeseries\": false, " - "\"last_update\": \"1970-01-01 00:00:00 +0000\", " - "\"update_interval\": \"0s\", \"backends\": []}" - "]}" + "{\"name\": \"m2\", " + "\"timeseries\": false, " + "\"last_update\": \"1970-01-01 00:00:01 +0000\", " + "\"update_interval\": \"0s\", \"backends\": []}" "]" }, - { { sdb_store_lt_matcher, SDB_FIELD_LAST_UPDATE, + { { sdb_memstore_lt_matcher, SDB_FIELD_LAST_UPDATE, { SDB_TYPE_DATETIME, { .datetime = 0 } } }, SDB_METRIC, scan_tojson_full, "[]" }, @@ -379,62 +365,56 @@ struct { START_TEST(test_store_tojson) { sdb_strbuf_t *buf = sdb_strbuf_create(0); - sdb_store_matcher_t *filter = NULL; + sdb_memstore_matcher_t *filter = NULL; sdb_store_json_formatter_t *f; int status; if (store_tojson_data[_i].filter.m) { - sdb_store_expr_t *field; - sdb_store_expr_t *value; + sdb_memstore_expr_t *field; + sdb_memstore_expr_t *value; - field = sdb_store_expr_fieldvalue(store_tojson_data[_i].filter.field); + field = sdb_memstore_expr_fieldvalue(store_tojson_data[_i].filter.field); fail_unless(field != NULL, - "INTERNAL ERROR: sdb_store_expr_fieldvalue() = NULL"); - value = sdb_store_expr_constvalue(&store_tojson_data[_i].filter.value); + "INTERNAL ERROR: sdb_memstore_expr_fieldvalue() = NULL"); + value = sdb_memstore_expr_constvalue(&store_tojson_data[_i].filter.value); fail_unless(value != NULL, - "INTERNAL ERROR: sdb_store_expr_constvalue() = NULL"); + "INTERNAL ERROR: sdb_memstore_expr_constvalue() = NULL"); filter = store_tojson_data[_i].filter.m(field, value); fail_unless(filter != NULL, - "INTERNAL ERROR: sdb_store_*_matcher() = NULL"); + "INTERNAL ERROR: sdb_memstore_*_matcher() = NULL"); sdb_object_deref(SDB_OBJ(field)); sdb_object_deref(SDB_OBJ(value)); } sdb_strbuf_clear(buf); - f = sdb_store_json_formatter(buf, - store_tojson_data[_i].type, SDB_WANT_ARRAY); - assert(f); + f = sdb_store_json_formatter(buf, store_tojson_data[_i].type, SDB_WANT_ARRAY); + ck_assert(f != NULL); - status = sdb_store_scan(store_tojson_data[_i].type, + status = sdb_memstore_scan(store, store_tojson_data[_i].type, /* m = */ NULL, filter, store_tojson_data[_i].f, f); fail_unless(status == 0, - "sdb_store_scan(HOST, ..., tojson) = %d; expected: 0", + "sdb_memstore_scan(HOST, ..., tojson) = %d; expected: 0", status); sdb_store_json_finish(f); verify_json_output(buf, store_tojson_data[_i].expected); - free(f); sdb_object_deref(SDB_OBJ(filter)); + sdb_object_deref(SDB_OBJ(f)); sdb_strbuf_destroy(buf); } END_TEST -Suite * -core_store_json_suite(void) +TEST_MAIN("core::store_json") { - Suite *s = suite_create("core::store_json"); - TCase *tc; - - tc = tcase_create("core"); + TCase *tc = tcase_create("core"); + tcase_add_unchecked_fixture(tc, populate, turndown); TC_ADD_LOOP_TEST(tc, store_tojson); - tcase_add_unchecked_fixture(tc, populate, sdb_store_clear); - suite_add_tcase(s, tc); - - return s; -} /* core_store_json_suite */ + ADD_TCASE(tc); +} +TEST_MAIN_END /* vim: set tw=78 sw=4 ts=4 noexpandtab : */