X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2Funit%2Fcore%2Fstore_expr_test.c;h=153e52f1c84bb393bcd560541485ee71e5af8044;hp=48c128c0573b5943e2fdfec200958be71e51bb64;hb=9345a64b2fa015c30d6b3fcba76211f8d0d7cfd6;hpb=c2f7813397319e930c81c4f64b213bec64549167

diff --git a/t/unit/core/store_expr_test.c b/t/unit/core/store_expr_test.c
index 48c128c..153e52f 100644
--- a/t/unit/core/store_expr_test.c
+++ b/t/unit/core/store_expr_test.c
@@ -29,9 +29,10 @@
 #	include "config.h"
 #endif
 
+#include "core/plugin.h"
 #include "core/store.h"
 #include "core/store-private.h"
-#include "frontend/parser.h"
+#include "parser/parser.h"
 #include "testutils.h"
 
 #include <check.h>
@@ -92,38 +93,40 @@ populate(void)
 
 	size_t i;
 
+	sdb_store_init();
+
 	for (i = 0; i < SDB_STATIC_ARRAY_LEN(hosts); ++i) {
-		int status = sdb_store_host(hosts[i], 1);
+		int status = sdb_plugin_store_host(hosts[i], 1);
 		ck_assert(status == 0);
 	}
 
 	for (i = 0; i < SDB_STATIC_ARRAY_LEN(metrics); ++i) {
-		int status = sdb_store_metric(metrics[i].host,
+		int status = sdb_plugin_store_metric(metrics[i].host,
 				metrics[i].metric, /* store */ NULL, 1);
 		ck_assert(status == 0);
 	}
 
 	for (i = 0; i < SDB_STATIC_ARRAY_LEN(services); ++i) {
-		int status = sdb_store_service(services[i].host,
+		int status = sdb_plugin_store_service(services[i].host,
 				services[i].service, 1);
 		ck_assert(status == 0);
 	}
 
 	for (i = 0; i < SDB_STATIC_ARRAY_LEN(attrs); ++i) {
-		int status = sdb_store_attribute(attrs[i].host,
+		int status = sdb_plugin_store_attribute(attrs[i].host,
 				attrs[i].name, &attrs[i].value, 1);
 		ck_assert(status == 0);
 	}
 
 	for (i = 0; i < SDB_STATIC_ARRAY_LEN(svc_attrs); ++i) {
-		int status = sdb_store_service_attr(svc_attrs[i].host,
+		int status = sdb_plugin_store_service_attribute(svc_attrs[i].host,
 				svc_attrs[i].service, svc_attrs[i].name,
 				&svc_attrs[i].value, 1);
 		ck_assert(status == 0);
 	}
 
 	for (i = 0; i < SDB_STATIC_ARRAY_LEN(metric_attrs); ++i) {
-		int status = sdb_store_metric_attr(metric_attrs[i].host,
+		int status = sdb_plugin_store_metric_attribute(metric_attrs[i].host,
 				metric_attrs[i].metric, metric_attrs[i].name,
 				&metric_attrs[i].value, 1);
 		ck_assert(status == 0);
@@ -567,7 +570,10 @@ START_TEST(test_expr_iter)
 	}
 
 	if (expr_iter_data[_i].filter) {
-		filter = sdb_fe_parse_matcher(expr_iter_data[_i].filter, -1, NULL);
+		sdb_ast_node_t *ast;
+		ast = sdb_parser_parse_conditional(expr_iter_data[_i].filter, -1, NULL);
+		filter = sdb_store_query_prepare_matcher(ast);
+		sdb_object_deref(SDB_OBJ(ast));
 		ck_assert(filter != NULL);
 	}