X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2Funit%2Fcore%2Fstore_json_test.c;h=4173831f824833b821e68b03183c024460e0ad2c;hp=f8ebac913633fe025df01344c2e2ecab521874cc;hb=3603db13105aefac4d6ceb356bcfd118a92fa654;hpb=b75718ea9fe4d6c90f1794e517a0712729553c0c

diff --git a/t/unit/core/store_json_test.c b/t/unit/core/store_json_test.c
index f8ebac9..4173831 100644
--- a/t/unit/core/store_json_test.c
+++ b/t/unit/core/store_json_test.c
@@ -271,54 +271,42 @@ struct {
 	{ { NULL, 0, SDB_DATA_INIT },
 		SDB_SERVICE, scan_tojson_full,
 		"["
-			"{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:03 +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:01 +0000\", "
-						"\"update_interval\": \"0s\", \"backends\": []},"
-					"{\"name\": \"s2\", "
+				"\"attributes\": ["
+					"{\"name\": \"k1\", \"value\": 123, "
 						"\"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:02 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []},"
-							"{\"name\": \"k2\", \"value\": 4711, "
-								"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []}"
-						"]}"
+						"\"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:03 +0000\", "
-				"\"update_interval\": \"0s\", \"backends\": [], "
-				"\"services\": ["
-					"{\"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\": []}"
-				"]}"
+			"{\"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_INTERVAL_SECOND } } },
 		SDB_SERVICE, scan_tojson_full,
 		"["
-			"{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:03 +0000\", "
+			"{\"name\": \"s2\", "
+				"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 				"\"update_interval\": \"0s\", \"backends\": [], "
-				"\"services\": ["
-					"{\"name\": \"s2\", "
+				"\"attributes\": ["
+					"{\"name\": \"k1\", \"value\": 123, "
 						"\"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:02 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []}"
-						"]}"
+						"\"update_interval\": \"0s\", \"backends\": []}"
 				"]}"
 		"]" },
 	{ { sdb_store_lt_matcher, SDB_FIELD_LAST_UPDATE,
@@ -328,68 +316,48 @@ struct {
 	{ { NULL, 0, SDB_DATA_INIT },
 		SDB_METRIC, scan_tojson_full,
 		"["
-			"{\"name\": \"h1\", \"last_update\": \"1970-01-01 00:00:01 +0000\", "
+			"{\"name\": \"m1\", "
+				"\"timeseries\": false, "
+				"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 				"\"update_interval\": \"0s\", \"backends\": [], "
-				"\"metrics\": ["
-					"{\"name\": \"m1\", "
-						"\"timeseries\": false, "
+				"\"attributes\": ["
+					"{\"name\": \"k3\", \"value\": 42, "
 						"\"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:02 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []}"
-						"]},"
-					"{\"name\": \"m2\", "
-						"\"timeseries\": false, "
-						"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
 						"\"update_interval\": \"0s\", \"backends\": []}"
 				"]},"
-			"{\"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:01 +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:01 +0000\", "
-				"\"update_interval\": \"0s\", \"backends\": [], "
-				"\"metrics\": ["
-					"{\"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\": \"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:01 +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_INTERVAL_SECOND } } },
 		SDB_METRIC, scan_tojson_full,
 		"["
-			"{\"name\": \"h1\", \"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:01 +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_TYPE_DATETIME, { .datetime = 0 } } },