From 950e3ec79856f8a78b2620b10f421801721289f5 Mon Sep 17 00:00:00 2001
From: Glebs Ivanovskis <git-no-reply@zabbix.com>
Date: Tue, 24 Oct 2017 13:01:28 +0000
Subject: ....I..... [DEV-628] renamed data file; added initial version of
 Makefile

---
 tests/zabbix_server/taskmanager/Makefile.am        | 10 +++
 tests/zabbix_server/taskmanager/data.json          | 97 ----------------------
 .../taskmanager/try_task_closes_problem.json       | 97 ++++++++++++++++++++++
 3 files changed, 107 insertions(+), 97 deletions(-)
 create mode 100644 tests/zabbix_server/taskmanager/Makefile.am
 delete mode 100644 tests/zabbix_server/taskmanager/data.json
 create mode 100644 tests/zabbix_server/taskmanager/try_task_closes_problem.json

(limited to 'tests/zabbix_server')

diff --git a/tests/zabbix_server/taskmanager/Makefile.am b/tests/zabbix_server/taskmanager/Makefile.am
new file mode 100644
index 00000000000..185bc7b0951
--- /dev/null
+++ b/tests/zabbix_server/taskmanager/Makefile.am
@@ -0,0 +1,10 @@
+noinst_PROGRAMS = try_task_closes_problem
+
+try_task_closes_problem_SOURCES = \
+	try_task_closes_problem.json \
+	try_task_closes_problem.c
+
+try_task_closes_problem_LDADD = \
+	$(top_srcdir)/tests/libzbxmockdata.a
+
+try_task_closes_problem_CFLAGS = -I@top_srcdir@/tests
diff --git a/tests/zabbix_server/taskmanager/data.json b/tests/zabbix_server/taskmanager/data.json
deleted file mode 100644
index bad831d8990..00000000000
--- a/tests/zabbix_server/taskmanager/data.json
+++ /dev/null
@@ -1,97 +0,0 @@
-[
-	{
-		"test_case": "successfully close the problem",
-		"tested_function": "try_task_closes_problem",
-		"in": {
-			"names": ["taskid"],
-			"values": [1]
-		},
-		"out": {
-			"names": ["return"],
-			"values": [0]
-		},
-		"db_data": {
-			"task_close_problem_events": {
-				"fields": [
-					"userid", "eventid", "objectid"
-				],
-				"rows": [
-					[1, 1, 1]
-				]
-			},
-			"problem": {
-				"fields": [
-				],
-				"rows" : [
-					[]
-				]
-			}
-		},
-		"functions": {
-			"DCconfig_lock_triggers_by_triggerids": {
-				"out": {
-					"params": ["triggerids"],
-					"values": [1]
-				}
-			}
-		}
-	},
-	{
-		"test_case": "cannot find a task in the db",
-		"tested_function": "try_task_closes_problem",
-		"in": {
-			"names": ["taskid"],
-			"values": [1]
-		},
-		"out": {
-			"names": ["return"],
-			"values": [-1]
-		},
-		"db_data": {
-			"task_close_problem_events": {
-				"fields" : [
-				],
-				"rows" : [
-					[]
-				]
-			}
-		}
-	},
-        {
-		"test_case": "fail close the problem if source trigger was not locked",
-		"tested_function": "try_task_closes_problem",
-		"in": {
-			"names": ["taskid"],
-			"values": [1]
-		},
-		"out": {
-			"names": ["return"],
-			"values": [-1]
-		},
-		"db_data": {
-			"task_close_problem_events": {
-				"fields": [
-					"userid", "eventid", "objectid"
-				],
-				"rows": [
-					[1, 1, 1]
-				]
-			},
-			"problem": {
-				"fields": [
-				],
-				"rows": [
-					[]
-				]
-			}
-		},
-		"functions": {
-			"DCconfig_lock_triggers_by_triggerids": {
-				"out": {
-					"params": [],
-					"values": []
-				}
-			}
-		}
-	}
-]
diff --git a/tests/zabbix_server/taskmanager/try_task_closes_problem.json b/tests/zabbix_server/taskmanager/try_task_closes_problem.json
new file mode 100644
index 00000000000..bad831d8990
--- /dev/null
+++ b/tests/zabbix_server/taskmanager/try_task_closes_problem.json
@@ -0,0 +1,97 @@
+[
+	{
+		"test_case": "successfully close the problem",
+		"tested_function": "try_task_closes_problem",
+		"in": {
+			"names": ["taskid"],
+			"values": [1]
+		},
+		"out": {
+			"names": ["return"],
+			"values": [0]
+		},
+		"db_data": {
+			"task_close_problem_events": {
+				"fields": [
+					"userid", "eventid", "objectid"
+				],
+				"rows": [
+					[1, 1, 1]
+				]
+			},
+			"problem": {
+				"fields": [
+				],
+				"rows" : [
+					[]
+				]
+			}
+		},
+		"functions": {
+			"DCconfig_lock_triggers_by_triggerids": {
+				"out": {
+					"params": ["triggerids"],
+					"values": [1]
+				}
+			}
+		}
+	},
+	{
+		"test_case": "cannot find a task in the db",
+		"tested_function": "try_task_closes_problem",
+		"in": {
+			"names": ["taskid"],
+			"values": [1]
+		},
+		"out": {
+			"names": ["return"],
+			"values": [-1]
+		},
+		"db_data": {
+			"task_close_problem_events": {
+				"fields" : [
+				],
+				"rows" : [
+					[]
+				]
+			}
+		}
+	},
+        {
+		"test_case": "fail close the problem if source trigger was not locked",
+		"tested_function": "try_task_closes_problem",
+		"in": {
+			"names": ["taskid"],
+			"values": [1]
+		},
+		"out": {
+			"names": ["return"],
+			"values": [-1]
+		},
+		"db_data": {
+			"task_close_problem_events": {
+				"fields": [
+					"userid", "eventid", "objectid"
+				],
+				"rows": [
+					[1, 1, 1]
+				]
+			},
+			"problem": {
+				"fields": [
+				],
+				"rows": [
+					[]
+				]
+			}
+		},
+		"functions": {
+			"DCconfig_lock_triggers_by_triggerids": {
+				"out": {
+					"params": [],
+					"values": []
+				}
+			}
+		}
+	}
+]
-- 
cgit v1.2.3