........S. [ZBXNEXT-114] fixed according tochanges in spec

3 files changed, 31 insertions, 35 deletions

diff --git a/tests/libs/zbxserver/Makefile.am b/tests/libs/zbxserver/Makefile.am
index 08f2ebef5c4..c4ab93af98d 100755
--- a/tests/libs/zbxserver/Makefile.am
+++ b/tests/libs/zbxserver/Makefile.am
@@ -144,10 +144,7 @@ valuemaps_SOURCES = \
 	valuemaps.c \
 	$(COMMON_SRC_FILES)
 
-valuemaps_LDADD = \
-	$(top_srcdir)/tests/mocks/valuecache/libvaluecachemock.a
-
-valuemaps_LDADD += $(COMMON_LIB_FILES)
+valuemaps_LDADD = $(COMMON_LIB_FILES)
 
 valuemaps_LDADD += @SERVER_LIBS@
 
diff --git a/tests/libs/zbxserver/valuemaps.c b/tests/libs/zbxserver/valuemaps.c
index a1f4d34cb62..3bf4de2383a 100644
--- a/tests/libs/zbxserver/valuemaps.c
+++ b/tests/libs/zbxserver/valuemaps.c
@@ -24,7 +24,6 @@
 #include "zbxmockassert.h"
 #include "zbxmockutil.h"
 
-#include "valuecache.h"
 #include "zbxserver.h"
 #include "log.h"
 #include "../zbxalgo/vectorimpl.h"
diff --git a/tests/libs/zbxserver/valuemaps.yaml b/tests/libs/zbxserver/valuemaps.yaml
index 971f3d25d26..b177b9b0507 100644
--- a/tests/libs/zbxserver/valuemaps.yaml
+++ b/tests/libs/zbxserver/valuemaps.yaml
@@ -6,11 +6,11 @@ in:
   - type: 0
     value: 0
     newvalue: "Value 0"
-  - type: 1
+  - type: 4
     value: "^1$"
     newvalue: "Regex 1"
   - type: 2
-    value: "<3"
+    value: "3"
     newvalue: "Value < 3"
 out:
   return: SUCCEED
@@ -23,11 +23,11 @@ in:
   - type: 0
     value: 0
     newvalue: "Value 0"
-  - type: 1
+  - type: 4
     value: "^1$"
     newvalue: "Regex 1"
   - type: 2
-    value: "<3"
+    value: "3"
     newvalue: "Value < 3"
 out:
   return: SUCCEED
@@ -40,11 +40,11 @@ in:
   - type: 0
     value: 0
     newvalue: "Value 0"
-  - type: 1
+  - type: 4
     value: "^1$"
     newvalue: "Regex 1"
   - type: 2
-    value: "<3"
+    value: "3"
     newvalue: "Value < 3"
 out:
   return: SUCCEED
@@ -57,14 +57,14 @@ in:
   - type: 0
     value: 0
     newvalue: "Value 0"
-  - type: 1
+  - type: 4
     value: "^1$"
     newvalue: "Regex 1"
   - type: 2
-    value: "<3"
+    value: "3"
     newvalue: "Value < 3"
-  - type: 2
-    value: 5:7
+  - type: 3
+    value: "5:7"
     newvalue: "Value 5-7"
 out:
   return: SUCCEED
@@ -77,17 +77,17 @@ in:
   - type: 0
     value: 0
     newvalue: "Value 0"
-  - type: 1
+  - type: 4
     value: "^1$"
     newvalue: "Regex 1"
   - type: 2
-    value: <3
+    value: 3
     newvalue: "Value < 3"
-  - type: 2
-    value: 5:7
+  - type: 3
+    value: "5:7"
     newvalue: "Value 5-7"
-  - type: 2
-    value: "> 10"
+  - type: 1
+    value: 10
     newvalue: "Value > 10"
 out:
   return: SUCCEED
@@ -100,20 +100,20 @@ in:
   - type: 0
     value: 0
     newvalue: "Value 0"
-  - type: 1
+  - type: 4
     value: "^1$"
     newvalue: "Regex 1"
   - type: 2
-    value: <3
+    value: 3
     newvalue: "Value < 3"
-  - type: 2
-    value: 5:7
+  - type: 3
+    value: "5:7"
     newvalue: "Value 5-7"
-  - type: 2
-    value: "> 10"
+  - type: 1
+    value: 10
     newvalue: "Value > 10"
-  - type: 2
-    value: "*"
+  - type: 5
+    value: ""
     newvalue: "Default"
 out:
   return: SUCCEED
@@ -126,17 +126,17 @@ in:
   - type: 0
     value: 0
     newvalue: "Value 0"
-  - type: 1
+  - type: 4
     value: "^1$"
     newvalue: "Regex 1"
   - type: 2
-    value: <3
+    value: 3
     newvalue: "Value < 3"
-  - type: 2
-    value: 5:7
+  - type: 3
+    value: "5:7"
     newvalue: "Value 5-7"
-  - type: 2
-    value: "> 10"
+  - type: 1
+    value: 10
     newvalue: "Value > 10"
 out:
   return: FAIL