.......... [DEV-874] merged trunk into dev branch

5 files changed, 1519 insertions, 2527 deletions

diff --git a/tests/libs/zbxdbcache/Makefile.am b/tests/libs/zbxdbcache/Makefile.am
index 5e3caf1f506..8d9e36d4f0b 100644
--- a/tests/libs/zbxdbcache/Makefile.am
+++ b/tests/libs/zbxdbcache/Makefile.am
@@ -1,9 +1,11 @@
 if SERVER
-SERVER_tests = zbx_vc_get_values \
-			zbx_vc_add_values \
-			zbx_vc_get_value \
-			dc_maintenance_match_tags \
-			dc_item_poller_type_update
+SERVER_tests = \
+	zbx_vc_get_values \
+	zbx_vc_add_values \
+	zbx_vc_get_value \
+	dc_maintenance_match_tags \
+	is_item_processed_by_server \
+	dc_item_poller_type_update
 endif
 #dc_item_poller_type_update
 
@@ -26,14 +28,36 @@ VALUECACHE_LIBS = \
 	$(top_srcdir)/src/libs/zbxmemory/libzbxmemory.a \
 	$(top_srcdir)/tests/libzbxmockdata.a
 
-zbx_vc_get_values_SOURCES = \
-	zbx_vc_get_values.c \
-	valuecache_mock.c \
-	@top_srcdir@/src/libs/zbxdbcache/valuecache.c \
-	@top_srcdir@/src/libs/zbxhistory/history.c \
-	../../zbxmocktest.h
+CACHE_LIBS = \
+	$(top_srcdir)/tests/libzbxmocktest.a \
+	$(top_srcdir)/tests/libzbxmockdata.a \
+	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/zabbix_server/libzbxserver.a \
+	$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
+	$(top_srcdir)/src/libs/zbxhistory/libzbxhistory.a \
+	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
+	$(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \
+	$(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \
+	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
+	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
+	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
+	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
+	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
+	$(top_srcdir)/src/libs/zbxexec/libzbxexec.a \
+	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
+	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
+	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
+	$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
+	$(top_srcdir)/src/libs/zbxmemory/libzbxmemory.a \
+	$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
+	$(top_srcdir)/src/libs/zbxdb/libzbxdb.a \
+	$(top_srcdir)/tests/libzbxmocktest.a \
+	$(top_srcdir)/tests/libzbxmockdata.a
 
-zbx_vc_get_values_WRAP_FUNCS = \
+COMMON_WRAP_FUNCS = \
 	-Wl,--wrap=zbx_mutex_create \
 	-Wl,--wrap=zbx_mutex_destroy \
 	-Wl,--wrap=zbx_mem_create \
@@ -46,11 +70,18 @@ zbx_vc_get_values_WRAP_FUNCS = \
 	-Wl,--wrap=zbx_history_elastic_init \
 	-Wl,--wrap=time
 
+zbx_vc_get_values_SOURCES = \
+	zbx_vc_get_values.c \
+	valuecache_mock.c \
+	@top_srcdir@/src/libs/zbxdbcache/valuecache.c \
+	@top_srcdir@/src/libs/zbxhistory/history.c \
+	../../zbxmocktest.h
+
 zbx_vc_get_values_LDADD = $(VALUECACHE_LIBS) @SERVER_LIBS@
 zbx_vc_get_values_LDFLAGS = @SERVER_LDFLAGS@
 
 zbx_vc_get_values_CFLAGS = \
-	 $(zbx_vc_get_values_WRAP_FUNCS) \
+	$(COMMON_WRAP_FUNCS) \
 	-I@top_srcdir@/src/libs/zbxalgo \
 	-I@top_srcdir@/src/libs/zbxdbcache \
 	-I@top_srcdir@/src/libs/zbxhistory \
@@ -63,24 +94,11 @@ zbx_vc_add_values_SOURCES = \
 	@top_srcdir@/src/libs/zbxhistory/history.c \
 	../../zbxmocktest.h
 
-zbx_vc_add_values_WRAP_FUNCS = \
-	-Wl,--wrap=zbx_mutex_create \
-	-Wl,--wrap=zbx_mutex_destroy \
-	-Wl,--wrap=zbx_mem_create \
-	-Wl,--wrap=__zbx_mem_malloc \
-	-Wl,--wrap=__zbx_mem_realloc \
-	-Wl,--wrap=__zbx_mem_free \
-	-Wl,--wrap=zbx_history_get_values \
-	-Wl,--wrap=zbx_history_add_values \
-	-Wl,--wrap=zbx_history_sql_init \
-	-Wl,--wrap=zbx_history_elastic_init \
-	-Wl,--wrap=time
-
 zbx_vc_add_values_LDADD = $(VALUECACHE_LIBS) @SERVER_LIBS@
 zbx_vc_add_values_LDFLAGS = @SERVER_LDFLAGS@
 
 zbx_vc_add_values_CFLAGS = \
-	 $(zbx_vc_add_values_WRAP_FUNCS) \
+	 $(COMMON_WRAP_FUNCS) \
 	-I@top_srcdir@/src/libs/zbxalgo \
 	-I@top_srcdir@/src/libs/zbxdbcache \
 	-I@top_srcdir@/src/libs/zbxhistory \
@@ -93,103 +111,31 @@ zbx_vc_get_value_SOURCES = \
 	@top_srcdir@/src/libs/zbxhistory/history.c \
 	../../zbxmocktest.h
 
-zbx_vc_get_value_WRAP_FUNCS = \
-	-Wl,--wrap=zbx_mutex_create \
-	-Wl,--wrap=zbx_mutex_destroy \
-	-Wl,--wrap=zbx_mem_create \
-	-Wl,--wrap=__zbx_mem_malloc \
-	-Wl,--wrap=__zbx_mem_realloc \
-	-Wl,--wrap=__zbx_mem_free \
-	-Wl,--wrap=zbx_history_get_values \
-	-Wl,--wrap=zbx_history_add_values \
-	-Wl,--wrap=zbx_history_sql_init \
-	-Wl,--wrap=zbx_history_elastic_init \
-	-Wl,--wrap=time
-
 zbx_vc_get_value_LDADD = $(VALUECACHE_LIBS) @SERVER_LIBS@
 zbx_vc_get_value_LDFLAGS = @SERVER_LDFLAGS@
 
 zbx_vc_get_value_CFLAGS = \
-	 $(zbx_vc_get_value_WRAP_FUNCS) \
+	 $(COMMON_WRAP_FUNCS) \
 	-I@top_srcdir@/src/libs/zbxalgo \
 	-I@top_srcdir@/src/libs/zbxdbcache \
 	-I@top_srcdir@/src/libs/zbxhistory \
 	-I@top_srcdir@/tests
-	
-dc_maintenance_match_tags_SOURCES = \
-	dc_maintenance_match_tags.c
 
 dc_maintenance_match_tags_CFLAGS = \
 	-I@top_srcdir@/src/libs/zbxdbcache \
 	-I@top_srcdir@/tests
-	
-dc_maintenance_match_tags_LDADD = \
-	$(top_srcdir)/tests/libzbxmocktest.a \
-	$(top_srcdir)/tests/libzbxmockdata.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
-	$(top_srcdir)/src/zabbix_server/libzbxserver.a \
-	$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
-	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
-	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
-	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
-	$(top_srcdir)/src/libs/zbxhistory/libzbxhistory.a \
-	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
-	$(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \
-	$(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \
-	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
-	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
-	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
-	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
-	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
-	$(top_srcdir)/src/libs/zbxexec/libzbxexec.a \
-	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
-	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
-	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
-	$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
-	$(top_srcdir)/src/libs/zbxmemory/libzbxmemory.a \
-	$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
-	$(top_srcdir)/src/libs/zbxdb/libzbxdb.a \
-	$(top_srcdir)/tests/libzbxmocktest.a \
-	$(top_srcdir)/tests/libzbxmockdata.a \
-	@SERVER_LIBS@	
 
+dc_maintenance_match_tags_SOURCES = dc_maintenance_match_tags.c
+dc_maintenance_match_tags_LDADD = $(CACHE_LIBS) @SERVER_LIBS@
 dc_maintenance_match_tags_LDFLAGS = @SERVER_LDFLAGS@
 
-dc_item_poller_type_update_SOURCES = \
-	dc_item_poller_type_update.c
-
-dc_item_poller_type_update_CFLAGS = \
-	-I@top_srcdir@/src/libs/zbxdbcache \
-	-I@top_srcdir@/tests
-
-dc_item_poller_type_update_LDADD = \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
-	$(top_srcdir)/src/zabbix_server/libzbxserver.a \
-	$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
-	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
-	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
-	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
-	$(top_srcdir)/src/libs/zbxhistory/libzbxhistory.a \
-	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
-	$(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \
-	$(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \
-	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
-	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
-	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
-	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
-	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
-	$(top_srcdir)/src/libs/zbxexec/libzbxexec.a \
-	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
-	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
-	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
-	$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
-	$(top_srcdir)/src/libs/zbxmemory/libzbxmemory.a \
-	$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
-	$(top_srcdir)/src/libs/zbxdb/libzbxdb.a \
-	$(top_srcdir)/tests/libzbxmocktest.a \
-	$(top_srcdir)/tests/libzbxmockdata.a \
-	@SERVER_LIBS@
+is_item_processed_by_server_SOURCES = is_item_processed_by_server.c
+is_item_processed_by_server_LDADD = $(CACHE_LIBS) @SERVER_LIBS@
+is_item_processed_by_server_LDFLAGS = @SERVER_LDFLAGS@
+is_item_processed_by_server_CFLAGS = -I@top_srcdir@/tests
 
+dc_item_poller_type_update_SOURCES = dc_item_poller_type_update.c
+dc_item_poller_type_update_LDADD = $(CACHE_LIBS) @SERVER_LIBS@
 dc_item_poller_type_update_LDFLAGS = @SERVER_LDFLAGS@
-
+dc_item_poller_type_update_CFLAGS = -I@top_srcdir@/tests -I@top_srcdir@/src/libs/zbxdbcache
 endif
diff --git a/tests/libs/zbxdbcache/is_item_processed_by_server.c b/tests/libs/zbxdbcache/is_item_processed_by_server.c
new file mode 100644
index 00000000000..0326cb4212a
--- /dev/null
+++ b/tests/libs/zbxdbcache/is_item_processed_by_server.c
@@ -0,0 +1,49 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2019 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+#include "zbxmocktest.h"
+#include "zbxmockdata.h"
+#include "zbxmockassert.h"
+#include "zbxmockutil.h"
+
+#include "common.h"
+#include "dbcache.h"
+
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_mock_test_entry                                              *
+ *                                                                            *
+ ******************************************************************************/
+void	zbx_mock_test_entry(void **state)
+{
+	int		type, expected_result;
+	const char	*key, *data;
+
+	ZBX_UNUSED(state);
+
+	key = zbx_mock_get_parameter_string("in.key");
+	data = zbx_mock_get_parameter_string("in.type");
+	if (FAIL == (type = zbx_mock_str_to_item_type(data)))
+		type = atoi(data);
+
+	expected_result = zbx_mock_str_to_return_code(zbx_mock_get_parameter_string("out.return"));
+
+	zbx_mock_assert_result_eq("is_item_processed_by_server() return code", expected_result,
+			is_item_processed_by_server((unsigned char)type, key));
+}
diff --git a/tests/libs/zbxdbcache/is_item_processed_by_server.yaml b/tests/libs/zbxdbcache/is_item_processed_by_server.yaml
new file mode 100644
index 00000000000..030230dcba5
--- /dev/null
+++ b/tests/libs/zbxdbcache/is_item_processed_by_server.yaml
@@ -0,0 +1,358 @@
+---
+test case: invalid item key type (1)
+in:
+  type: 'ITEM_TYPE_ZABBIX'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (2)
+in:
+  type: 'ITEM_TYPE_ZABBIX'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (3)
+in:
+  type: 'ITEM_TYPE_SNMPv1'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (4)
+in:
+  type: 'ITEM_TYPE_SNMPv1'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (5)
+in:
+  type: 'ITEM_TYPE_TRAPPER'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (6)
+in:
+  type: 'ITEM_TYPE_TRAPPER'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (7)
+in:
+  type: 'ITEM_TYPE_SIMPLE'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (8)
+in:
+  type: 'ITEM_TYPE_SIMPLE'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (9)
+in:
+  type: 'ITEM_TYPE_SNMPv2c'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (10)
+in:
+  type: 'ITEM_TYPE_SNMPv2c'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (11)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: valid item key type (12)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'SUCCEED'
+---
+test case: invalid item key syntax (13)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix1[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key syntax (14)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbi1[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key syntax (15)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix[host,discovery,items]'
+out:
+  return: 'FAIL'
+---
+test case: valid item key syntax (16)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix[host,,items_unsupported]'
+out:
+  return: 'SUCCEED'
+---
+test case: invalid item key syntax (17)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix[host,discovery,items_unsupported]'
+out:
+  return: 'FAIL'
+---
+test case: valid item key syntax (18)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix[host,discovery,interfaces]'
+out:
+  return: 'SUCCEED'
+---
+test case: invalid item key syntax (19)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix[host,,interfaces]'
+out:
+  return: 'FAIL'
+---
+test case: valid item key syntax (20)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix[host,,maintenance]'
+out:
+  return: 'SUCCEED'
+---
+test case: invalid item key syntax (21)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix[host,discovery,,maintenance]'
+out:
+  return: 'FAIL'
+---
+test case: valid item key syntax (22)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix[proxy,proxy1,lastaccess]'
+out:
+  return: 'SUCCEED'
+---
+test case: valid item key syntax (23)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix[proxy,,lastaccess]'
+out:
+  return: 'SUCCEED'
+---
+test case: invalid item key syntax (24)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix1[proxy,,lastaccess]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key syntax (25)
+in:
+  type: 'ITEM_TYPE_INTERNAL'
+  key: 'zabbix[proxy,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (26)
+in:
+  type: 'ITEM_TYPE_SNMPv3'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (27)
+in:
+  type: 'ITEM_TYPE_SNMPv3'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (27)
+in:
+  type: 'ITEM_TYPE_ZABBIX_ACTIVE'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (29)
+in:
+  type: 'ITEM_TYPE_ZABBIX_ACTIVE'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: valid item key type (30)
+in:
+  type: 'ITEM_TYPE_AGGREGATE'
+  key: 'key1[]'
+out:
+  return: 'SUCCEED'
+---
+test case: valid item key type (31)
+in:
+  type: 'ITEM_TYPE_AGGREGATE'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'SUCCEED'
+---
+test case: invalid item key type (32)
+in:
+  type: 'ITEM_TYPE_HTTPTEST'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (33)
+in:
+  type: 'ITEM_TYPE_HTTPTEST'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (34)
+in:
+  type: 'ITEM_TYPE_EXTERNAL'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (35)
+in:
+  type: 'ITEM_TYPE_EXTERNAL'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (36)
+in:
+  type: 'ITEM_TYPE_DB_MONITOR'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (37)
+in:
+  type: 'ITEM_TYPE_DB_MONITOR'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (38)
+in:
+  type: 'ITEM_TYPE_IPMI'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (39)
+in:
+  type: 'ITEM_TYPE_IPMI'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (40)
+in:
+  type: 'ITEM_TYPE_SSH'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (41)
+in:
+  type: 'ITEM_TYPE_SSH'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (42)
+in:
+  type: 'ITEM_TYPE_TELNET'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (43)
+in:
+  type: 'ITEM_TYPE_TELNET'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: valid item key type (44)
+in:
+  type: 'ITEM_TYPE_CALCULATED'
+  key: 'key1[]'
+out:
+  return: 'SUCCEED'
+---
+test case: valid item key type (45)
+in:
+  type: 'ITEM_TYPE_CALCULATED'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'SUCCEED'
+---
+test case: invalid item key type (46)
+in:
+  type: 'ITEM_TYPE_JMX'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (47)
+in:
+  type: 'ITEM_TYPE_JMX'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (48)
+in:
+  type: 'ITEM_TYPE_SNMPTRAP'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: invalid item key type (49)
+in:
+  type: 'ITEM_TYPE_SNMPTRAP'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+---
+test case: non-existing item type (50)
+in:
+  type: '255'
+  key: 'key1[]'
+out:
+  return: 'FAIL'
+---
+test case: non-existing item type (51)
+in:
+  type: '255'
+  key: 'zabbix[host,,items]'
+out:
+  return: 'FAIL'
+...
diff --git a/tests/libs/zbxdbcache/zbx_vc_get_values.inc.yaml b/tests/libs/zbxdbcache/zbx_vc_get_values.inc.yaml
new file mode 100644
index 00000000000..e88c8a417f2
--- /dev/null
+++ b/tests/libs/zbxdbcache/zbx_vc_get_values.inc.yaml
@@ -0,0 +1,35 @@
+---
+itemid: 1
+value type: ITEM_VALUE_TYPE_STR
+data:
+- value: value 1.2
+  ts: 2017-01-10 10:00:01.200000000 +00:00
+- value: value 1.5
+  ts: 2017-01-10 10:00:01.500000000 +00:00
+- value: value 1.7
+  ts: 2017-01-10 10:00:01.700000000 +00:00
+- value: value 2.2
+  ts: 2017-01-10 10:00:02.200000000 +00:00
+- value: value 2.5
+  ts: 2017-01-10 10:00:02.500000000 +00:00
+- value: value 2.7
+  ts: 2017-01-10 10:00:02.700000000 +00:00
+- value: value 3.2
+  ts: 2017-01-10 10:00:03.200000000 +00:00
+- value: value 3.5
+  ts: 2017-01-10 10:00:03.500000000 +00:00
+- value: value 3.7
+  ts: 2017-01-10 10:00:03.700000000 +00:00
+- value: value 4.2
+  ts: 2017-01-10 10:00:04.200000000 +00:00
+- value: value 4.5
+  ts: 2017-01-10 10:00:04.500000000 +00:00
+- value: value 4.7
+  ts: 2017-01-10 10:00:04.700000000 +00:00
+- value: value 5.2
+  ts: 2017-01-10 10:00:05.200000000 +00:00
+- value: value 5.5
+  ts: 2017-01-10 10:00:05.500000000 +00:00
+- value: value 5.7
+  ts: 2017-01-10 10:00:05.700000000 +00:00
+...
diff --git a/tests/libs/zbxdbcache/zbx_vc_get_values.yaml b/tests/libs/zbxdbcache/zbx_vc_get_values.yaml
index fc2a57459bb..9def6a4b7e1 100644
--- a/tests/libs/zbxdbcache/zbx_vc_get_values.yaml
+++ b/tests/libs/zbxdbcache/zbx_vc_get_values.yaml
@@ -289,56 +289,9 @@ out:
 # TC5
 # Test that the data from current time to the requested interval is properly cached.
 test case: Get values in interval before data values leaving unread values in the middle
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -355,29 +308,47 @@ in:
     end: 2017-01-10 10:00:02.999999999 +00:00
 out:
   values:
-  - *row27
-  - *row25
-  - *row22
+  - value: value 2.7
+    ts: 2017-01-10 10:00:02.700000000 +00:00
+  - value: value 2.5
+    ts: 2017-01-10 10:00:02.500000000 +00:00
+  - value: value 2.2
+    ts: 2017-01-10 10:00:02.200000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row12
-      - *row15
-      - *row17
-      - *row22
-      - *row25
-      - *row27
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 1.2
+        ts: 2017-01-10 10:00:01.200000000 +00:00
+      - value: value 1.5
+        ts: 2017-01-10 10:00:01.500000000 +00:00
+      - value: value 1.7
+        ts: 2017-01-10 10:00:01.700000000 +00:00
+      - value: value 2.2
+        ts: 2017-01-10 10:00:02.200000000 +00:00
+      - value: value 2.5
+        ts: 2017-01-10 10:00:02.500000000 +00:00
+      - value: value 2.7
+        ts: 2017-01-10 10:00:02.700000000 +00:00
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status:
       active_range: 600
       values_total: 15
@@ -389,56 +360,9 @@ out:
 # TC6
 # Test that cached data is returned from cache without database access.
 test case: Get interval of already already data values
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -455,29 +379,47 @@ in:
     end: 2017-01-10 10:00:05.999999999 +00:00
 out:
   values:
-    - *row57
-    - *row55
-    - *row52
+  - value: value 5.7
+    ts: 2017-01-10 10:00:05.700000000 +00:00
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
+  - value: value 5.2
+    ts: 2017-01-10 10:00:05.200000000 +00:00
   cache:
     items:
       - itemid: 1
         value type: ITEM_VALUE_TYPE_STR
         data:
-          - *row12
-          - *row15
-          - *row17
-          - *row22
-          - *row25
-          - *row27
-          - *row32
-          - *row35
-          - *row37
-          - *row42
-          - *row45
-          - *row47
-          - *row52
-          - *row55
-          - *row57
+        - value: value 1.2
+          ts: 2017-01-10 10:00:01.200000000 +00:00
+        - value: value 1.5
+          ts: 2017-01-10 10:00:01.500000000 +00:00
+        - value: value 1.7
+          ts: 2017-01-10 10:00:01.700000000 +00:00
+        - value: value 2.2
+          ts: 2017-01-10 10:00:02.200000000 +00:00
+        - value: value 2.5
+          ts: 2017-01-10 10:00:02.500000000 +00:00
+        - value: value 2.7
+          ts: 2017-01-10 10:00:02.700000000 +00:00
+        - value: value 3.2
+          ts: 2017-01-10 10:00:03.200000000 +00:00
+        - value: value 3.5
+          ts: 2017-01-10 10:00:03.500000000 +00:00
+        - value: value 3.7
+          ts: 2017-01-10 10:00:03.700000000 +00:00
+        - value: value 4.2
+          ts: 2017-01-10 10:00:04.200000000 +00:00
+        - value: value 4.5
+          ts: 2017-01-10 10:00:04.500000000 +00:00
+        - value: value 4.7
+          ts: 2017-01-10 10:00:04.700000000 +00:00
+        - value: value 5.2
+          ts: 2017-01-10 10:00:05.200000000 +00:00
+        - value: value 5.5
+          ts: 2017-01-10 10:00:05.500000000 +00:00
+        - value: value 5.7
+          ts: 2017-01-10 10:00:05.700000000 +00:00
         status:
         active_range: 600
         values_total: 15
@@ -489,56 +431,9 @@ out:
 # TC7
 # Test that missing data in cache is properly added if requested interval is larger than cached data.
 test case: Get interval of already cached values ending with the last data value
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -555,32 +450,53 @@ in:
     end: 2017-01-10 10:00:03.999999999 +00:00
 out:
   values:
-    - *row37
-    - *row35
-    - *row32
-    - *row27
-    - *row25
-    - *row22
+  - value: value 3.7
+    ts: 2017-01-10 10:00:03.700000000 +00:00
+  - value: value 3.5
+    ts: 2017-01-10 10:00:03.500000000 +00:00
+  - value: value 3.2
+    ts: 2017-01-10 10:00:03.200000000 +00:00
+  - value: value 2.7
+    ts: 2017-01-10 10:00:02.700000000 +00:00
+  - value: value 2.5
+    ts: 2017-01-10 10:00:02.500000000 +00:00
+  - value: value 2.2
+    ts: 2017-01-10 10:00:02.200000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-        - *row12
-        - *row15
-        - *row17
-        - *row22
-        - *row25
-        - *row27
-        - *row32
-        - *row35
-        - *row37
-        - *row42
-        - *row45
-        - *row47
-        - *row52
-        - *row55
-        - *row57
+      - value: value 1.2
+        ts: 2017-01-10 10:00:01.200000000 +00:00
+      - value: value 1.5
+        ts: 2017-01-10 10:00:01.500000000 +00:00
+      - value: value 1.7
+        ts: 2017-01-10 10:00:01.700000000 +00:00
+      - value: value 2.2
+        ts: 2017-01-10 10:00:02.200000000 +00:00
+      - value: value 2.5
+        ts: 2017-01-10 10:00:02.500000000 +00:00
+      - value: value 2.7
+        ts: 2017-01-10 10:00:02.700000000 +00:00
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status:
       active_range: 600
       values_total: 15
@@ -592,56 +508,9 @@ out:
 # TC8
 # Test that db_cached_from is set according to the requested time interval.
 test case: Get interval of values larger than database history and caching last values
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -658,29 +527,47 @@ in:
     end: 2017-01-10 10:00:01.999999999 +00:00
 out:
   values:
-  - *row17
-  - *row15
-  - *row12
+  - value: value 1.7
+    ts: 2017-01-10 10:00:01.700000000 +00:00
+  - value: value 1.5
+    ts: 2017-01-10 10:00:01.500000000 +00:00
+  - value: value 1.2
+    ts: 2017-01-10 10:00:01.200000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row12
-      - *row15
-      - *row17
-      - *row22
-      - *row25
-      - *row27
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 1.2
+        ts: 2017-01-10 10:00:01.200000000 +00:00
+      - value: value 1.5
+        ts: 2017-01-10 10:00:01.500000000 +00:00
+      - value: value 1.7
+        ts: 2017-01-10 10:00:01.700000000 +00:00
+      - value: value 2.2
+        ts: 2017-01-10 10:00:02.200000000 +00:00
+      - value: value 2.5
+        ts: 2017-01-10 10:00:02.500000000 +00:00
+      - value: value 2.7
+        ts: 2017-01-10 10:00:02.700000000 +00:00
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status:
       active_range: 610
       values_total: 15
@@ -692,56 +579,9 @@ out:
 # TC9
 # Test that database is not accessed if the request data is within db_cached_from limits 
 test case: Get interval of already cached data values larger than database history
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -758,29 +598,47 @@ in:
     end: 2017-01-10 10:00:01.999999999 +00:00
 out:
   values:
-  - *row17
-  - *row15
-  - *row12
+  - value: value 1.7
+    ts: 2017-01-10 10:00:01.700000000 +00:00
+  - value: value 1.5
+    ts: 2017-01-10 10:00:01.500000000 +00:00
+  - value: value 1.2
+    ts: 2017-01-10 10:00:01.200000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row12
-      - *row15
-      - *row17
-      - *row22
-      - *row25
-      - *row27
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 1.2
+        ts: 2017-01-10 10:00:01.200000000 +00:00
+      - value: value 1.5
+        ts: 2017-01-10 10:00:01.500000000 +00:00
+      - value: value 1.7
+        ts: 2017-01-10 10:00:01.700000000 +00:00
+      - value: value 2.2
+        ts: 2017-01-10 10:00:02.200000000 +00:00
+      - value: value 2.5
+        ts: 2017-01-10 10:00:02.500000000 +00:00
+      - value: value 2.7
+        ts: 2017-01-10 10:00:02.700000000 +00:00
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status:
       active_range: 610
       values_total: 15
@@ -792,56 +650,9 @@ out:
 # TC10
 # Test that data is cached and value returned
 test case: Get one value in the middle of uncached data
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -851,18 +662,25 @@ in:
     end: 2017-01-10 10:00:04.999999999 +00:00
 out:
   values:
-  - *row47
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status:
       active_range: 597
       values_total: 6
@@ -874,56 +692,9 @@ out:
 # TC11
 # Test that value returned by using already cached data
 test case: Get one value in the middle of cached data
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -940,18 +711,25 @@ in:
     end: 2017-01-10 10:00:04.999999999 +00:00
 out:
   values:
-  - *row47
+  - value: value 4.7
+    ts: 2017-01-10 10:00:04.700000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status:
       active_range: 597
       values_total: 6
@@ -963,56 +741,9 @@ out:
 # TC12
 # Test that value returned by using already cached data
 test case: Get two values in the middle of cached data
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -1029,19 +760,27 @@ in:
     end: 2017-01-10 10:00:04.999999999 +00:00
 out:
   values:
-  - *row47
-  - *row45
+  - value: value 4.7
+    ts: 2017-01-10 10:00:04.700000000 +00:00
+  - value: value 4.5
+    ts: 2017-01-10 10:00:04.500000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status:
       active_range: 597
       values_total: 6
@@ -1053,56 +792,9 @@ out:
 # TC13
 # Test that all values are cached and the 'cached all' flag set
 test case: Get 4 values when only 3 values exists in database history and are not cached
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -1119,29 +811,47 @@ in:
     end: 2017-01-10 10:00:01.999999999 +00:00
 out:
   values:
-  - *row17
-  - *row15
-  - *row12
+  - value: value 1.7
+    ts: 2017-01-10 10:00:01.700000000 +00:00
+  - value: value 1.5
+    ts: 2017-01-10 10:00:01.500000000 +00:00
+  - value: value 1.2
+    ts: 2017-01-10 10:00:01.200000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row12
-      - *row15
-      - *row17
-      - *row22
-      - *row25
-      - *row27
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 1.2
+        ts: 2017-01-10 10:00:01.200000000 +00:00
+      - value: value 1.5
+        ts: 2017-01-10 10:00:01.500000000 +00:00
+      - value: value 1.7
+        ts: 2017-01-10 10:00:01.700000000 +00:00
+      - value: value 2.2
+        ts: 2017-01-10 10:00:02.200000000 +00:00
+      - value: value 2.5
+        ts: 2017-01-10 10:00:02.500000000 +00:00
+      - value: value 2.7
+        ts: 2017-01-10 10:00:02.700000000 +00:00
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status: ZBX_ITEM_STATUS_CACHED_ALL
       active_range: 0
       values_total: 15
@@ -1153,56 +863,9 @@ out:
 # TC14
 # Test that values are returned from cache
 test case: Get 4 values when only 3 values exists in database history and are cached
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -1219,29 +882,47 @@ in:
     end: 2017-01-10 10:00:01.999999999 +00:00
 out:
   values:
-  - *row17
-  - *row15
-  - *row12
+  - value: value 1.7
+    ts: 2017-01-10 10:00:01.700000000 +00:00
+  - value: value 1.5
+    ts: 2017-01-10 10:00:01.500000000 +00:00
+  - value: value 1.2
+    ts: 2017-01-10 10:00:01.200000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row12
-      - *row15
-      - *row17
-      - *row22
-      - *row25
-      - *row27
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 1.2
+        ts: 2017-01-10 10:00:01.200000000 +00:00
+      - value: value 1.5
+        ts: 2017-01-10 10:00:01.500000000 +00:00
+      - value: value 1.7
+        ts: 2017-01-10 10:00:01.700000000 +00:00
+      - value: value 2.2
+        ts: 2017-01-10 10:00:02.200000000 +00:00
+      - value: value 2.5
+        ts: 2017-01-10 10:00:02.500000000 +00:00
+      - value: value 2.7
+        ts: 2017-01-10 10:00:02.700000000 +00:00
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status: ZBX_ITEM_STATUS_CACHED_ALL
       active_range: 0
       values_total: 15
@@ -1254,56 +935,9 @@ out:
 # Test that no values are returned, 'cached all' flag is not set 
 # and db_cached_from is set to cover the request range 
 test case: Get one value from empty history interval
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -1329,56 +963,9 @@ out:
 # TC16
 # Test that the requested interval is cached and returned, 'cached all' flag is not set
 test case: Get 100 values from 1 second interval with 3 history values
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -1388,20 +975,29 @@ in:
     end: 2017-01-10 10:00:05.999999999 +00:00
 out:
   values: 
-  - *row57
-  - *row55
-  - *row52
+  - value: value 5.7
+    ts: 2017-01-10 10:00:05.700000000 +00:00
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
+  - value: value 5.2
+    ts: 2017-01-10 10:00:05.200000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data: 
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status: 
       active_range: 596
       values_total: 6
@@ -1413,56 +1009,9 @@ out:
 # TC17
 # Test that values are returned from cached data and item properties are not changed
 test case: Get 2 values from already cached 1 second interval with 3 history values
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -1479,19 +1028,27 @@ in:
     end: 2017-01-10 10:00:05.999999999 +00:00
 out:
   values: 
-  - *row57
-  - *row55
+  - value: value 5.7
+    ts: 2017-01-10 10:00:05.700000000 +00:00
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data: 
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status: 
       active_range: 597
       values_total: 6
@@ -1503,56 +1060,9 @@ out:
 # TC18
 # Test that values are returned from cached data and item properties are not changed
 test case: Get 3 values from already cached 1 second interval with 3 history values
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -1569,20 +1079,29 @@ in:
     end: 2017-01-10 10:00:05.999999999 +00:00
 out:
   values: 
-  - *row57
-  - *row55
-  - *row52
+  - value: value 5.7
+    ts: 2017-01-10 10:00:05.700000000 +00:00
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
+  - value: value 5.2
+    ts: 2017-01-10 10:00:05.200000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data: 
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status: 
       active_range: 597
       values_total: 6
@@ -1594,56 +1113,9 @@ out:
 # TC19
 # Test that values are returned from cached data and item properties are not changed
 test case: Get 4 values from already data 1 second interval with 3 history values
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -1660,20 +1132,29 @@ in:
     end: 2017-01-10 10:00:05.999999999 +00:00
 out:
   values: 
-  - *row57
-  - *row55
-  - *row52
+  - value: value 5.7
+    ts: 2017-01-10 10:00:05.700000000 +00:00
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
+  - value: value 5.2
+    ts: 2017-01-10 10:00:05.200000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status: 
       active_range: 597
       values_total: 6
@@ -1685,56 +1166,9 @@ out:
 # TC20
 # Test that all required data is cached without leaving any gaps in history to current time.
 test case: Get 1 value from 1 second interval with 3 history values past cached data
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -1751,21 +1185,31 @@ in:
     end: 2017-01-10 10:00:03.999999999 +00:00
 out:
   values:
-  - *row37
+  - value: value 3.7
+    ts: 2017-01-10 10:00:03.700000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status: 
       active_range: 598
       values_total: 9
@@ -1777,56 +1221,9 @@ out:
 # TC21
 # Test that the missing data is cached
 test case: Get 4 values from partially cached 2 second interval with 6 history values
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -1843,27 +1240,43 @@ in:
     end: 2017-01-10 10:00:03.999999999 +00:00
 out:
   values:
-  - *row37
-  - *row35
-  - *row32
-  - *row27
+  - value: value 3.7
+    ts: 2017-01-10 10:00:03.700000000 +00:00
+  - value: value 3.5
+    ts: 2017-01-10 10:00:03.500000000 +00:00
+  - value: value 3.2
+    ts: 2017-01-10 10:00:03.200000000 +00:00
+  - value: value 2.7
+    ts: 2017-01-10 10:00:02.700000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row22
-      - *row25
-      - *row27
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 2.2
+        ts: 2017-01-10 10:00:02.200000000 +00:00
+      - value: value 2.5
+        ts: 2017-01-10 10:00:02.500000000 +00:00
+      - value: value 2.7
+        ts: 2017-01-10 10:00:02.700000000 +00:00
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status:
       active_range: 599
       values_total: 12
@@ -1875,56 +1288,9 @@ out:
 # TC22
 # Test that 'cached all' flag is set.
 test case: Get all history values by count when they were already cached by time based request
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -1941,41 +1307,71 @@ in:
     end: 2017-01-10 10:00:05.999999999 +00:00
 out:
   values:
-  - *row57
-  - *row55
-  - *row52
-  - *row47
-  - *row45
-  - *row42
-  - *row37
-  - *row35
-  - *row32
-  - *row27
-  - *row25
-  - *row22
-  - *row17
-  - *row15
-  - *row12
+  - value: value 5.7
+    ts: 2017-01-10 10:00:05.700000000 +00:00
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
+  - value: value 5.2
+    ts: 2017-01-10 10:00:05.200000000 +00:00
+  - value: value 4.7
+    ts: 2017-01-10 10:00:04.700000000 +00:00
+  - value: value 4.5
+    ts: 2017-01-10 10:00:04.500000000 +00:00
+  - value: value 4.2
+    ts: 2017-01-10 10:00:04.200000000 +00:00
+  - value: value 3.7
+    ts: 2017-01-10 10:00:03.700000000 +00:00
+  - value: value 3.5
+    ts: 2017-01-10 10:00:03.500000000 +00:00
+  - value: value 3.2
+    ts: 2017-01-10 10:00:03.200000000 +00:00
+  - value: value 2.7
+    ts: 2017-01-10 10:00:02.700000000 +00:00
+  - value: value 2.5
+    ts: 2017-01-10 10:00:02.500000000 +00:00
+  - value: value 2.2
+    ts: 2017-01-10 10:00:02.200000000 +00:00
+  - value: value 1.7
+    ts: 2017-01-10 10:00:01.700000000 +00:00
+  - value: value 1.5
+    ts: 2017-01-10 10:00:01.500000000 +00:00
+  - value: value 1.2
+    ts: 2017-01-10 10:00:01.200000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row12
-      - *row15
-      - *row17
-      - *row22
-      - *row25
-      - *row27
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 1.2
+        ts: 2017-01-10 10:00:01.200000000 +00:00
+      - value: value 1.5
+        ts: 2017-01-10 10:00:01.500000000 +00:00
+      - value: value 1.7
+        ts: 2017-01-10 10:00:01.700000000 +00:00
+      - value: value 2.2
+        ts: 2017-01-10 10:00:02.200000000 +00:00
+      - value: value 2.5
+        ts: 2017-01-10 10:00:02.500000000 +00:00
+      - value: value 2.7
+        ts: 2017-01-10 10:00:02.700000000 +00:00
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status: ZBX_ITEM_STATUS_CACHED_ALL
       active_range: 0
       values_total: 15
@@ -1987,56 +1383,9 @@ out:
 # TC23
 # Test that data is returned and 'cached all' flag is not changed.
 test case: Get all data values from interval when they were already cached by count
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -2053,41 +1402,71 @@ in:
     end: 2017-01-10 10:00:05.999999999 +00:00
 out:
   values:
-  - *row57
-  - *row55
-  - *row52
-  - *row47
-  - *row45
-  - *row42
-  - *row37
-  - *row35
-  - *row32
-  - *row27
-  - *row25
-  - *row22
-  - *row17
-  - *row15
-  - *row12
+  - value: value 5.7
+    ts: 2017-01-10 10:00:05.700000000 +00:00
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
+  - value: value 5.2
+    ts: 2017-01-10 10:00:05.200000000 +00:00
+  - value: value 4.7
+    ts: 2017-01-10 10:00:04.700000000 +00:00
+  - value: value 4.5
+    ts: 2017-01-10 10:00:04.500000000 +00:00
+  - value: value 4.2
+    ts: 2017-01-10 10:00:04.200000000 +00:00
+  - value: value 3.7
+    ts: 2017-01-10 10:00:03.700000000 +00:00
+  - value: value 3.5
+    ts: 2017-01-10 10:00:03.500000000 +00:00
+  - value: value 3.2
+    ts: 2017-01-10 10:00:03.200000000 +00:00
+  - value: value 2.7
+    ts: 2017-01-10 10:00:02.700000000 +00:00
+  - value: value 2.5
+    ts: 2017-01-10 10:00:02.500000000 +00:00
+  - value: value 2.2
+    ts: 2017-01-10 10:00:02.200000000 +00:00
+  - value: value 1.7
+    ts: 2017-01-10 10:00:01.700000000 +00:00
+  - value: value 1.5
+    ts: 2017-01-10 10:00:01.500000000 +00:00
+  - value: value 1.2
+    ts: 2017-01-10 10:00:01.200000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row12
-      - *row15
-      - *row17
-      - *row22
-      - *row25
-      - *row27
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 1.2
+        ts: 2017-01-10 10:00:01.200000000 +00:00
+      - value: value 1.5
+        ts: 2017-01-10 10:00:01.500000000 +00:00
+      - value: value 1.7
+        ts: 2017-01-10 10:00:01.700000000 +00:00
+      - value: value 2.2
+        ts: 2017-01-10 10:00:02.200000000 +00:00
+      - value: value 2.5
+        ts: 2017-01-10 10:00:02.500000000 +00:00
+      - value: value 2.7
+        ts: 2017-01-10 10:00:02.700000000 +00:00
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status: ZBX_ITEM_STATUS_CACHED_ALL
       active_range: 0
       values_total: 15
@@ -2190,56 +1569,9 @@ out:
 # when requesting other value type than data the item is marked for removal
 # and values are retrieved directly from database
 test case: Get interval of values when item value type has been changed
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -2256,9 +1588,12 @@ in:
     end: 2017-01-10 10:00:05.999999999 +00:00
 out:
   values:
-  - *row57
-  - *row55
-  - *row52
+  - value: value 5.7
+    ts: 2017-01-10 10:00:05.700000000 +00:00
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
+  - value: value 5.2
+    ts: 2017-01-10 10:00:05.200000000 +00:00
   cache:
     items: []
     mode: ZBX_VC_MODE_NORMAL
@@ -2269,56 +1604,9 @@ out:
 # when requesting other value type than data the item is marked for removal
 # and values are retrieved directly from database
 test case: Get number of values when item value type has been changed
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -2335,8 +1623,10 @@ in:
     end: 2017-01-10 10:00:05.999999999 +00:00
 out:
   values:
-  - *row57
-  - *row55
+  - value: value 5.7
+    ts: 2017-01-10 10:00:05.700000000 +00:00
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
   cache:
     items: []
     mode: ZBX_VC_MODE_NORMAL
@@ -2346,56 +1636,9 @@ out:
 # TC29
 # Test that values are returned, but item is not cached.
 test case: Get number of uncached item values when cache working in low memory mode
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     cache mode: ZBX_VC_MODE_LOWMEM
     time: 2017-01-10 10:10:00.000000000 +00:00
@@ -2406,8 +1649,10 @@ in:
     end: 2017-01-10 10:00:05.999999999 +00:00
 out:
   values:
-  - *row57
-  - *row55
+  - value: value 5.7
+    ts: 2017-01-10 10:00:05.700000000 +00:00
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
   cache:
     items:
     - itemid: 1
@@ -2418,56 +1663,9 @@ out:
 # TC30
 # Test that values are returned, but item is not cached.
 test case: Get interval of uncached item values when cache working in low memory mode
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     cache mode: ZBX_VC_MODE_LOWMEM
     time: 2017-01-10 10:10:00.000000000 +00:00
@@ -2478,9 +1676,12 @@ in:
     end: 2017-01-10 10:00:05.999999999 +00:00
 out:
   values:
-  - *row57
-  - *row55
-  - *row52
+  - value: value 5.7
+    ts: 2017-01-10 10:00:05.700000000 +00:00
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
+  - value: value 5.2
+    ts: 2017-01-10 10:00:05.200000000 +00:00
   cache:
     items:
     - itemid: 1
@@ -2491,56 +1692,9 @@ out:
 # TC31
 # Test that values are returned, but item is not cached.
 test case: Get number of uncached item values from interval when cache working in low memory mode
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     cache mode: ZBX_VC_MODE_LOWMEM
     time: 2017-01-10 10:10:00.000000000 +00:00
@@ -2551,9 +1705,12 @@ in:
     end: 2017-01-10 10:00:05.999999999 +00:00
 out:
   values:
-  - *row57
-  - *row55
-  - *row52
+  - value: value 5.7
+    ts: 2017-01-10 10:00:05.700000000 +00:00
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
+  - value: value 5.2
+    ts: 2017-01-10 10:00:05.200000000 +00:00
   cache:
     items:
     - itemid: 1
@@ -2564,56 +1721,9 @@ out:
 # TC32
 # Test that items in cache are continued to be cached in low memory mode.
 test case: Get number of data item values when cache working in low memory mode
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -2631,22 +1741,33 @@ in:
     end: 2017-01-10 10:00:03.999999999 +00:00
 out:
   values:
-    - *row37
-    - *row35
+  - value: value 3.7
+    ts: 2017-01-10 10:00:03.700000000 +00:00
+  - value: value 3.5
+    ts: 2017-01-10 10:00:03.500000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status:
       active_range: 598
       values_total: 9
@@ -2658,56 +1779,9 @@ out:
 # TC33
 # Test that items in cache are continued to be cached in low memory mode.
 test case: Get interval of data item values when cache working in low memory mode
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -2725,26 +1799,41 @@ in:
     end: 2017-01-10 10:00:03.999999999 +00:00
 out:
   values:
-  - *row37
-  - *row35
-  - *row32
+  - value: value 3.7
+    ts: 2017-01-10 10:00:03.700000000 +00:00
+  - value: value 3.5
+    ts: 2017-01-10 10:00:03.500000000 +00:00
+  - value: value 3.2
+    ts: 2017-01-10 10:00:03.200000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row22
-      - *row25
-      - *row27
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 2.2
+        ts: 2017-01-10 10:00:02.200000000 +00:00
+      - value: value 2.5
+        ts: 2017-01-10 10:00:02.500000000 +00:00
+      - value: value 2.7
+        ts: 2017-01-10 10:00:02.700000000 +00:00
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status: 
       active_range: 599
       values_total: 12
@@ -2756,56 +1845,9 @@ out:
 # TC34
 # Test that items in cache are continued to be cached in low memory mode.
 test case: Get number of data item values from interval when cache working in low memory mode
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -2823,27 +1865,43 @@ in:
     end: 2017-01-10 10:00:03.999999999 +00:00
 out:
   values:
-  - *row37
-  - *row35
-  - *row32
-  - *row27
+  - value: value 3.7
+    ts: 2017-01-10 10:00:03.700000000 +00:00
+  - value: value 3.5
+    ts: 2017-01-10 10:00:03.500000000 +00:00
+  - value: value 3.2
+    ts: 2017-01-10 10:00:03.200000000 +00:00
+  - value: value 2.7
+    ts: 2017-01-10 10:00:02.700000000 +00:00
   cache:
     items:
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data:
-      - *row22
-      - *row25
-      - *row27
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 2.2
+        ts: 2017-01-10 10:00:02.200000000 +00:00
+      - value: value 2.5
+        ts: 2017-01-10 10:00:02.500000000 +00:00
+      - value: value 2.7
+        ts: 2017-01-10 10:00:02.700000000 +00:00
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status:
       active_range: 599
       values_total: 12
@@ -2855,89 +1913,38 @@ out:
 # TC35
 # Test that old item is dropped to free space and cache put in low memory mode.
 test case: Get values with not enough space in cache
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: 
+  - *include
   - itemid: 2
     value type: ITEM_VALUE_TYPE_LOG
     data:
-    - &row1
-      value: value 1
+    - value: value 1
       source: log source 1
       logeventid: 1000001
       severity: 1
       timestamp: 1001 
       ts: 2017-01-10 10:00:01.000000000 +00:00
-    - &row2
-      value: value 2
+    - value: value 2
       source: log source 2
       logeventid: 1000002
       severity: 2
       timestamp: 1002 
       ts: 2017-01-10 10:00:02.000000000 +00:00
-    - &row3
-      value: value 3
+    - value: value 3
       source: log source 3
       logeventid: 1000003
       severity: 3
       timestamp: 1003 
       ts: 2017-01-10 10:00:03.000000000 +00:00
-    - &row4
-      value: value 4
+    - value: value 4
       source: log source 4
       logeventid: 1000004
       severity: 4
       timestamp: 1004 
       ts: 2017-01-10 10:00:04.000000000 +00:00
-    - &row5
-      value: value 5
+    - value: value 5
       source: log source 5
       logeventid: 1000005
       severity: 5
@@ -2960,29 +1967,47 @@ in:
     end: 2017-01-10 10:00:01.999999999 +00:00
 out:
   values:
-  - *row17
-  - *row15
-  - *row12
+  - value: value 1.7
+    ts: 2017-01-10 10:00:01.700000000 +00:00
+  - value: value 1.5
+    ts: 2017-01-10 10:00:01.500000000 +00:00
+  - value: value 1.2
+    ts: 2017-01-10 10:00:01.200000000 +00:00
   cache:
     items: 
     - itemid: 1
       value type: ITEM_VALUE_TYPE_STR
       data: 
-      - *row12
-      - *row15
-      - *row17
-      - *row22
-      - *row25
-      - *row27
-      - *row32
-      - *row35
-      - *row37
-      - *row42
-      - *row45
-      - *row47
-      - *row52
-      - *row55
-      - *row57
+      - value: value 1.2
+        ts: 2017-01-10 10:00:01.200000000 +00:00
+      - value: value 1.5
+        ts: 2017-01-10 10:00:01.500000000 +00:00
+      - value: value 1.7
+        ts: 2017-01-10 10:00:01.700000000 +00:00
+      - value: value 2.2
+        ts: 2017-01-10 10:00:02.200000000 +00:00
+      - value: value 2.5
+        ts: 2017-01-10 10:00:02.500000000 +00:00
+      - value: value 2.7
+        ts: 2017-01-10 10:00:02.700000000 +00:00
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
       status:
       active_range: 601
       values_total: 15
@@ -3135,56 +2160,9 @@ out:
 # TC37
 # Test that item's active range is not decreased during a day.
 test case: Active range tracking during day 
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -3206,21 +2184,36 @@ out:
       - itemid: 1
         value type: ITEM_VALUE_TYPE_STR
         data:
-          - *row12
-          - *row15
-          - *row17
-          - *row22
-          - *row25
-          - *row27
-          - *row32
-          - *row35
-          - *row37
-          - *row42
-          - *row45
-          - *row47
-          - *row52
-          - *row55
-          - *row57
+        - value: value 1.2
+          ts: 2017-01-10 10:00:01.200000000 +00:00
+        - value: value 1.5
+          ts: 2017-01-10 10:00:01.500000000 +00:00
+        - value: value 1.7
+          ts: 2017-01-10 10:00:01.700000000 +00:00
+        - value: value 2.2
+          ts: 2017-01-10 10:00:02.200000000 +00:00
+        - value: value 2.5
+          ts: 2017-01-10 10:00:02.500000000 +00:00
+        - value: value 2.7
+          ts: 2017-01-10 10:00:02.700000000 +00:00
+        - value: value 3.2
+          ts: 2017-01-10 10:00:03.200000000 +00:00
+        - value: value 3.5
+          ts: 2017-01-10 10:00:03.500000000 +00:00
+        - value: value 3.7
+          ts: 2017-01-10 10:00:03.700000000 +00:00
+        - value: value 4.2
+          ts: 2017-01-10 10:00:04.200000000 +00:00
+        - value: value 4.5
+          ts: 2017-01-10 10:00:04.500000000 +00:00
+        - value: value 4.7
+          ts: 2017-01-10 10:00:04.700000000 +00:00
+        - value: value 5.2
+          ts: 2017-01-10 10:00:05.200000000 +00:00
+        - value: value 5.5
+          ts: 2017-01-10 10:00:05.500000000 +00:00
+        - value: value 5.7
+          ts: 2017-01-10 10:00:05.700000000 +00:00
         status:
         active_range: 1200
         values_total: 15
@@ -3232,56 +2225,9 @@ out:
 # TC38
 # Test if the active range ir properly reduced to the daily range each day
 test case: Active range change in next few days
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -3309,21 +2255,36 @@ out:
       - itemid: 1
         value type: ITEM_VALUE_TYPE_STR
         data:
-          - *row12
-          - *row15
-          - *row17
-          - *row22
-          - *row25
-          - *row27
-          - *row32
-          - *row35
-          - *row37
-          - *row42
-          - *row45
-          - *row47
-          - *row52
-          - *row55
-          - *row57
+        - value: value 1.2
+          ts: 2017-01-10 10:00:01.200000000 +00:00
+        - value: value 1.5
+          ts: 2017-01-10 10:00:01.500000000 +00:00
+        - value: value 1.7
+          ts: 2017-01-10 10:00:01.700000000 +00:00
+        - value: value 2.2
+          ts: 2017-01-10 10:00:02.200000000 +00:00
+        - value: value 2.5
+          ts: 2017-01-10 10:00:02.500000000 +00:00
+        - value: value 2.7
+          ts: 2017-01-10 10:00:02.700000000 +00:00
+        - value: value 3.2
+          ts: 2017-01-10 10:00:03.200000000 +00:00
+        - value: value 3.5
+          ts: 2017-01-10 10:00:03.500000000 +00:00
+        - value: value 3.7
+          ts: 2017-01-10 10:00:03.700000000 +00:00
+        - value: value 4.2
+          ts: 2017-01-10 10:00:04.200000000 +00:00
+        - value: value 4.5
+          ts: 2017-01-10 10:00:04.500000000 +00:00
+        - value: value 4.7
+          ts: 2017-01-10 10:00:04.700000000 +00:00
+        - value: value 5.2
+          ts: 2017-01-10 10:00:05.200000000 +00:00
+        - value: value 5.5
+          ts: 2017-01-10 10:00:05.500000000 +00:00
+        - value: value 5.7
+          ts: 2017-01-10 10:00:05.700000000 +00:00
         status:
         active_range: 101
         values_total: 15
@@ -3335,56 +2296,9 @@ out:
 # TC39
 # Test that value cache attempts to switch back to normal mode after running a day in low memory mode.
 test case: Switch back to normal mode after working a day in low memory mode
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -3417,56 +2331,9 @@ out:
 # TC40
 # Test that all data from end timestamp second is cached and the required data is returned */ 
 test case: Get interval of values when using nanoseconds in end time 
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -3476,23 +2343,35 @@ in:
     end: 2017-01-10 10:00:04.500000000 +00:00
 out:
   values:
-  - *row45
-  - *row42 
-  - *row37
+  - value: value 4.5
+    ts: 2017-01-10 10:00:04.500000000 +00:00
+  - value: value 4.2
+    ts: 2017-01-10 10:00:04.200000000 +00:00
+  - value: value 3.7
+    ts: 2017-01-10 10:00:03.700000000 +00:00
   cache:
     items:
       - itemid: 1
         value type: ITEM_VALUE_TYPE_STR
         data:
-          - *row32
-          - *row35
-          - *row37
-          - *row42
-          - *row45
-          - *row47
-          - *row52
-          - *row55
-          - *row57
+        - value: value 3.2
+          ts: 2017-01-10 10:00:03.200000000 +00:00
+        - value: value 3.5
+          ts: 2017-01-10 10:00:03.500000000 +00:00
+        - value: value 3.7
+          ts: 2017-01-10 10:00:03.700000000 +00:00
+        - value: value 4.2
+          ts: 2017-01-10 10:00:04.200000000 +00:00
+        - value: value 4.5
+          ts: 2017-01-10 10:00:04.500000000 +00:00
+        - value: value 4.7
+          ts: 2017-01-10 10:00:04.700000000 +00:00
+        - value: value 5.2
+          ts: 2017-01-10 10:00:05.200000000 +00:00
+        - value: value 5.5
+          ts: 2017-01-10 10:00:05.500000000 +00:00
+        - value: value 5.7
+          ts: 2017-01-10 10:00:05.700000000 +00:00
         status:
         active_range: 598
         values_total: 9
@@ -3504,56 +2383,9 @@ out:
 # TC41
 # Test that all data from end timestamp second is cached and the required data is returned */ 
 test case: Get number of values when using nanoseconds in end time 
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -3563,80 +2395,41 @@ in:
     end: 2017-01-10 10:00:04.500000000 +00:00
 out:
   values:
-  - *row45
-  - *row42 
+  - value: value 4.5
+    ts: 2017-01-10 10:00:04.500000000 +00:00
+  - value: value 4.2
+    ts: 2017-01-10 10:00:04.200000000 +00:00
   cache:
     items:
-      - itemid: 1
-        value type: ITEM_VALUE_TYPE_STR
-        data:
-          - *row42
-          - *row45
-          - *row47
-          - *row52
-          - *row55
-          - *row57
-        status:
-        active_range: 597
-        values_total: 6
-        db_cached_from: 2017-01-10 10:00:04.000000000 +00:00
+    - itemid: 1
+      value type: ITEM_VALUE_TYPE_STR
+      data:
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
+      status:
+      active_range: 597
+      values_total: 6
+      db_cached_from: 2017-01-10 10:00:04.000000000 +00:00
     mode: ZBX_VC_MODE_NORMAL
     hits: 0
     misses: 2
 ---
 # TC42
 # Test that all data from end timestamp second is cached and the required data is returned */ 
-test case: Get number of values during interval when using nanoseconds in end time 
+test case: Get number of values during interval when using nanoseconds in end time
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -3646,23 +2439,31 @@ in:
     end: 2017-01-10 10:00:04.500000000 +00:00
 out:
   values:
-  - *row45
-  - *row42 
+  - value: value 4.5
+    ts: 2017-01-10 10:00:04.500000000 +00:00
+  - value: value 4.2
+    ts: 2017-01-10 10:00:04.200000000 +00:00
   cache:
     items:
-      - itemid: 1
-        value type: ITEM_VALUE_TYPE_STR
-        data:
-          - *row42
-          - *row45
-          - *row47
-          - *row52
-          - *row55
-          - *row57
-        status:
-        active_range: 597
-        values_total: 6
-        db_cached_from: 2017-01-10 10:00:04.000000000 +00:00
+    - itemid: 1
+      value type: ITEM_VALUE_TYPE_STR
+      data:
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
+      status:
+      active_range: 597
+      values_total: 6
+      db_cached_from: 2017-01-10 10:00:04.000000000 +00:00
     mode: ZBX_VC_MODE_NORMAL
     hits: 0
     misses: 2
@@ -3670,56 +2471,9 @@ out:
 # TC43
 # Test that all data from end timestamp second is cached and the required data is returned */ 
 test case: Get number of values during interval when using nanoseconds in end time and not enough data
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -3729,27 +2483,39 @@ in:
     end: 2017-01-10 10:00:04.500000000 +00:00
 out:
   values:
-  - *row45
-  - *row42 
-  - *row37 
+  - value: value 4.5
+    ts: 2017-01-10 10:00:04.500000000 +00:00
+  - value: value 4.2
+    ts: 2017-01-10 10:00:04.200000000 +00:00
+  - value: value 3.7
+    ts: 2017-01-10 10:00:03.700000000 +00:00
   cache:
     items:
-      - itemid: 1
-        value type: ITEM_VALUE_TYPE_STR
-        data:
-          - *row32
-          - *row35
-          - *row37
-          - *row42
-          - *row45
-          - *row47
-          - *row52
-          - *row55
-          - *row57
-        status:
-        active_range: 597
-        values_total: 9
-        db_cached_from: 2017-01-10 10:00:03.000000000 +00:00
+    - itemid: 1
+      value type: ITEM_VALUE_TYPE_STR
+      data:
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
+      status:
+      active_range: 597
+      values_total: 9
+      db_cached_from: 2017-01-10 10:00:03.000000000 +00:00
     mode: ZBX_VC_MODE_NORMAL
     hits: 0
     misses: 3
@@ -3757,56 +2523,9 @@ out:
 # TC44
 # Test that all data from end timestamp second is cached and the required data is returned */ 
 test case: Get 1 value during interval when using nanoseconds in end time 
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -3816,22 +2535,29 @@ in:
     end: 2017-01-10 10:00:04.500000000 +00:00
 out:
   values:
-  - *row45
+  - value: value 4.5
+    ts: 2017-01-10 10:00:04.500000000 +00:00
   cache:
     items:
-      - itemid: 1
-        value type: ITEM_VALUE_TYPE_STR
-        data:
-          - *row42
-          - *row45
-          - *row47
-          - *row52
-          - *row55
-          - *row57
-        status:
-        active_range: 597
-        values_total: 6
-        db_cached_from: 2017-01-10 10:00:04.000000000 +00:00
+    - itemid: 1
+      value type: ITEM_VALUE_TYPE_STR
+      data:
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
+      status:
+      active_range: 597
+      values_total: 6
+      db_cached_from: 2017-01-10 10:00:04.000000000 +00:00
     mode: ZBX_VC_MODE_NORMAL
     hits: 0
     misses: 1
@@ -3839,56 +2565,9 @@ out:
 # TC45
 # Test that values withing the interval end second but not matching nanoseconds are not returned */ 
 test case: Get 1 value during interval when using nanoseconds in end time (2) 
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -3898,25 +2577,35 @@ in:
     end: 2017-01-10 10:00:04.100000000 +00:00
 out:
   values:
-  - *row37
+  - value: value 3.7
+    ts: 2017-01-10 10:00:03.700000000 +00:00
   cache:
     items:
-      - itemid: 1
-        value type: ITEM_VALUE_TYPE_STR
-        data:
-          - *row32
-          - *row35
-          - *row37
-          - *row42
-          - *row45
-          - *row47
-          - *row52
-          - *row55
-          - *row57
-        status:
-        active_range: 598
-        values_total: 9
-        db_cached_from: 2017-01-10 10:00:03.000000000 +00:00
+    - itemid: 1
+      value type: ITEM_VALUE_TYPE_STR
+      data:
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
+      status:
+      active_range: 598
+      values_total: 9
+      db_cached_from: 2017-01-10 10:00:03.000000000 +00:00
     mode: ZBX_VC_MODE_NORMAL
     hits: 0
     misses: 1
@@ -3924,56 +2613,9 @@ out:
 # TC46
 # Test that values withing the interval end second but not matching nanoseconds are not returned */ 
 test case: Get 10 values during interval when using nanoseconds in end time 
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   precache:
   - time: 2017-01-10 10:10:00.000000000 +00:00
     itemid: 1
@@ -3990,27 +2632,39 @@ in:
     end: 2017-01-10 10:00:04.500000000 +00:00
 out:
   values:
-  - *row45
-  - *row42
-  - *row37
+  - value: value 4.5
+    ts: 2017-01-10 10:00:04.500000000 +00:00
+  - value: value 4.2
+    ts: 2017-01-10 10:00:04.200000000 +00:00
+  - value: value 3.7
+    ts: 2017-01-10 10:00:03.700000000 +00:00
   cache:
     items:
-      - itemid: 1
-        value type: ITEM_VALUE_TYPE_STR
-        data:
-          - *row32
-          - *row35
-          - *row37
-          - *row42
-          - *row45
-          - *row47
-          - *row52
-          - *row55
-          - *row57
-        status:
-        active_range: 598
-        values_total: 9
-        db_cached_from: 2017-01-10 10:00:03.000000000 +00:00
+    - itemid: 1
+      value type: ITEM_VALUE_TYPE_STR
+      data:
+      - value: value 3.2
+        ts: 2017-01-10 10:00:03.200000000 +00:00
+      - value: value 3.5
+        ts: 2017-01-10 10:00:03.500000000 +00:00
+      - value: value 3.7
+        ts: 2017-01-10 10:00:03.700000000 +00:00
+      - value: value 4.2
+        ts: 2017-01-10 10:00:04.200000000 +00:00
+      - value: value 4.5
+        ts: 2017-01-10 10:00:04.500000000 +00:00
+      - value: value 4.7
+        ts: 2017-01-10 10:00:04.700000000 +00:00
+      - value: value 5.2
+        ts: 2017-01-10 10:00:05.200000000 +00:00
+      - value: value 5.5
+        ts: 2017-01-10 10:00:05.500000000 +00:00
+      - value: value 5.7
+        ts: 2017-01-10 10:00:05.700000000 +00:00
+      status:
+      active_range: 598
+      values_total: 9
+      db_cached_from: 2017-01-10 10:00:03.000000000 +00:00
     mode: ZBX_VC_MODE_NORMAL
     hits: 3
     misses: 0
@@ -4023,17 +2677,13 @@ in:
   - itemid: 1
     value type: ITEM_VALUE_TYPE_STR
     data:
-    - &row52
-      value: value 5.2
+    - value: value 5.2
       ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row55
-      value: value 5.5
+    - value: value 5.5
       ts: 2017-01-10 10:00:06.500000000 +00:00
-    - &row57
-      value: value 5.7
+    - value: value 5.7
       ts: 2017-01-10 10:00:07.700000000 +00:00
-    - &row58
-      value: value 5.7
+    - value: value 5.7
       ts: 2017-01-10 10:00:08.800000000 +00:00
   test:
     cache mode: ZBX_VC_MODE_LOWMEM
@@ -4052,59 +2702,12 @@ out:
     hits: 0
     misses: 0
 ---
-# TC29
+# TC48
 # Test that value in a middle of second interval is returned.
 test case: Get 1 item value when cache working in low memory mode
+include: &include zbx_vc_get_values.inc.yaml
 in:
-  history:
-  - itemid: 1
-    value type: ITEM_VALUE_TYPE_STR
-    data:
-    - &row12
-      value: value 1.2
-      ts: 2017-01-10 10:00:01.200000000 +00:00
-    - &row15
-      value: value 1.5
-      ts: 2017-01-10 10:00:01.500000000 +00:00
-    - &row17
-      value: value 1.7
-      ts: 2017-01-10 10:00:01.700000000 +00:00
-    - &row22
-      value: value 2.2
-      ts: 2017-01-10 10:00:02.200000000 +00:00
-    - &row25
-      value: value 2.5
-      ts: 2017-01-10 10:00:02.500000000 +00:00
-    - &row27
-      value: value 2.7
-      ts: 2017-01-10 10:00:02.700000000 +00:00
-    - &row32
-      value: value 3.2
-      ts: 2017-01-10 10:00:03.200000000 +00:00
-    - &row35
-      value: value 3.5
-      ts: 2017-01-10 10:00:03.500000000 +00:00
-    - &row37
-      value: value 3.7
-      ts: 2017-01-10 10:00:03.700000000 +00:00
-    - &row42
-      value: value 4.2
-      ts: 2017-01-10 10:00:04.200000000 +00:00
-    - &row45
-      value: value 4.5
-      ts: 2017-01-10 10:00:04.500000000 +00:00
-    - &row47
-      value: value 4.7
-      ts: 2017-01-10 10:00:04.700000000 +00:00
-    - &row52
-      value: value 5.2
-      ts: 2017-01-10 10:00:05.200000000 +00:00
-    - &row55
-      value: value 5.5
-      ts: 2017-01-10 10:00:05.500000000 +00:00
-    - &row57
-      value: value 5.7
-      ts: 2017-01-10 10:00:05.700000000 +00:00
+  history: [*include]
   test:
     cache mode: ZBX_VC_MODE_LOWMEM
     time: 2017-01-10 10:10:00.000000000 +00:00
@@ -4115,7 +2718,8 @@ in:
     end: 2017-01-10 10:00:05.600000000 +00:00
 out:
   values:
-  - *row55
+  - value: value 5.5
+    ts: 2017-01-10 10:00:05.500000000 +00:00
   cache:
     items:
     - itemid: 1