.......... [DEV-2062] removed duplicates from vc tests, fixed some warnings

4 files changed, 46 insertions, 51 deletions

diff --git a/tests/libs/zbxdbcache/zbx_vc_common.c b/tests/libs/zbxdbcache/zbx_vc_common.c
index 74de4a03cfc..bbb78c49c1c 100644
--- a/tests/libs/zbxdbcache/zbx_vc_common.c
+++ b/tests/libs/zbxdbcache/zbx_vc_common.c
@@ -29,18 +29,18 @@
 
 extern zbx_uint64_t	CONFIG_VALUE_CACHE_SIZE;
 
-void	zbx_vc_common_test_func(void **state,
-				void (*zbx_vc_test_add_values_setup)(zbx_mock_handle_t *handle,
-						zbx_vector_ptr_t *history, int *err, const char **data, int *ret_flush),
-				void (*zbx_vc_test_get_value_setup)(zbx_mock_handle_t *handle, zbx_uint64_t *itemid,
-						unsigned char *value_type, zbx_timespec_t *ts, int *err,
-						zbx_vector_history_record_t *expected,
-						zbx_vector_history_record_t *returned),
-				void (*zbx_vc_test_check_result)(zbx_uint64_t *cache_hits, zbx_uint64_t *cache_misses),
-				void (*zbx_vc_test_get_values_setup)(zbx_mock_handle_t *handle, zbx_uint64_t *itemid,
-						unsigned char *value_type, zbx_timespec_t *ts, int *err,
-						zbx_vector_history_record_t *expected,
-						zbx_vector_history_record_t *returned, int *seconds, int *count))
+void	zbx_vc_common_test_func(
+		void **state,
+		void (*zbx_vc_test_add_values_setup)(zbx_mock_handle_t *handle, zbx_vector_ptr_t *history, int *err,
+				const char **data, int *ret_flush),
+		void (*zbx_vc_test_get_value_setup)(zbx_mock_handle_t *handle, zbx_uint64_t *itemid,
+				unsigned char *value_type, zbx_timespec_t *ts, int *err,
+				zbx_vector_history_record_t *expected, zbx_vector_history_record_t *returned),
+		void (*zbx_vc_test_check_result)(zbx_uint64_t *cache_hits, zbx_uint64_t *cache_misses),
+		void (*zbx_vc_test_get_values_setup)(zbx_mock_handle_t *handle, zbx_uint64_t *itemid,
+				unsigned char *value_type, zbx_timespec_t *ts, int *err,
+				zbx_vector_history_record_t *expected, zbx_vector_history_record_t *returned,
+				int *seconds, int *count))
 {
 	int				err, seconds, count, item_status, item_active_range, item_db_cached_from,
 					item_values_total, cache_mode, ret_flush;
@@ -171,5 +171,17 @@ void	zbx_vc_common_test_func(void **state,
 
 	zbx_vc_reset();
 	zbx_vc_destroy();
+}
+
+void	zbx_vc_test_check_result(zbx_uint64_t *cache_hits, zbx_uint64_t *cache_misses)
+{
+	zbx_uint64_t	expected_hits, expected_misses;
+
+	if (FAIL == is_uint64(zbx_mock_get_parameter_string("out.cache.hits"), &expected_hits))
+		fail_msg("Invalid out.cache.hits value");
+	zbx_mock_assert_uint64_eq("cache.hits", expected_hits, *cache_hits);
 
+	if (FAIL == is_uint64(zbx_mock_get_parameter_string("out.cache.misses"), &expected_misses))
+		fail_msg("Invalid out.cache.misses value");
+	zbx_mock_assert_uint64_eq("cache.misses", expected_misses, *cache_misses);
 }
diff --git a/tests/libs/zbxdbcache/zbx_vc_common.h b/tests/libs/zbxdbcache/zbx_vc_common.h
index 21b054b4863..3713e968d94 100644
--- a/tests/libs/zbxdbcache/zbx_vc_common.h
+++ b/tests/libs/zbxdbcache/zbx_vc_common.h
@@ -20,16 +20,26 @@
 #ifndef VC_COMMON_H
 #define VC_COMMON_H
 
-void	zbx_vc_common_test_func(void **state,
-				void (*zbx_vc_test_add_values_setup)(zbx_mock_handle_t *handle,
-						zbx_vector_ptr_t *history, int *err, const char **data, int *ret_flush),
-				void (*zbx_vc_test_get_value_setup)(zbx_mock_handle_t *handle, zbx_uint64_t *itemid,
-						unsigned char *value_type, zbx_timespec_t *ts, int *err,
-						zbx_vector_history_record_t *expected,
-						zbx_vector_history_record_t *returned),
-				void (*zbx_vc_test_check_result)(zbx_uint64_t *cache_hits, zbx_uint64_t *cache_misses),
-				void (*zbx_vc_test_get_values_setup)(zbx_mock_handle_t *handle, zbx_uint64_t *itemid,
-						unsigned char *value_type, zbx_timespec_t *ts, int *err,
-						zbx_vector_history_record_t *expected,
-						zbx_vector_history_record_t *returned, int *seconds, int *count));
+void	zbx_vc_test_add_values_setup(zbx_mock_handle_t *handle, zbx_vector_ptr_t *history, int *err, const char **data,
+		int *ret_flush);
+void	zbx_vc_test_get_value_setup(zbx_mock_handle_t *handle, zbx_uint64_t *itemid, unsigned char *value_type,
+		zbx_timespec_t *ts, int *err, zbx_vector_history_record_t *expected,
+		zbx_vector_history_record_t *returned);
+void	zbx_vc_test_check_result(zbx_uint64_t *cache_hits, zbx_uint64_t *cache_misses);
+void	zbx_vc_test_get_values_setup(zbx_mock_handle_t *handle, zbx_uint64_t *itemid, unsigned char *value_type,
+		zbx_timespec_t *ts, int *err, zbx_vector_history_record_t *expected,
+				zbx_vector_history_record_t *returned, int *seconds, int *count);
+
+void	zbx_vc_common_test_func(
+		void **state,
+		void (*zbx_vc_test_add_values_setup)(zbx_mock_handle_t *handle, zbx_vector_ptr_t *history, int *err,
+				const char **data, int *ret_flush),
+		void (*zbx_vc_test_get_value_setup)(zbx_mock_handle_t *handle, zbx_uint64_t *itemid,
+				unsigned char *value_type, zbx_timespec_t *ts, int *err,
+				zbx_vector_history_record_t *expected, zbx_vector_history_record_t *returned),
+		void (*zbx_vc_test_check_result)(zbx_uint64_t *cache_hits, zbx_uint64_t *cache_misses),
+		void (*zbx_vc_test_get_values_setup)(zbx_mock_handle_t *handle, zbx_uint64_t *itemid,
+				unsigned char *value_type, zbx_timespec_t *ts, int *err,
+				zbx_vector_history_record_t *expected, zbx_vector_history_record_t *returned,
+				int *seconds, int *count));
 #endif
diff --git a/tests/libs/zbxdbcache/zbx_vc_get_value.c b/tests/libs/zbxdbcache/zbx_vc_get_value.c
index 878dadf00cb..a66ecf39cc1 100644
--- a/tests/libs/zbxdbcache/zbx_vc_get_value.c
+++ b/tests/libs/zbxdbcache/zbx_vc_get_value.c
@@ -62,20 +62,6 @@ void	zbx_vc_test_get_value_setup(zbx_mock_handle_t *handle, zbx_uint64_t *itemid
 	zbx_history_record_vector_clean(expected, *value_type);
 }
 
-
-void	zbx_vc_test_check_result(zbx_uint64_t *cache_hits, zbx_uint64_t *cache_misses)
-{
-	zbx_uint64_t	expected_hits, expected_misses;
-
-	if (FAIL == is_uint64(zbx_mock_get_parameter_string("out.cache.hits"), &expected_hits))
-		fail_msg("Invalid out.cache.hits value");
-	zbx_mock_assert_uint64_eq("cache.hits", expected_hits, *cache_hits);
-
-	if (FAIL == is_uint64(zbx_mock_get_parameter_string("out.cache.misses"), &expected_misses))
-		fail_msg("Invalid out.cache.misses value");
-	zbx_mock_assert_uint64_eq("cache.misses", expected_misses, *cache_misses);
-}
-
 void	zbx_mock_test_entry(void **state)
 {
 	zbx_vc_common_test_func(state, NULL, zbx_vc_test_get_value_setup, zbx_vc_test_check_result, NULL);
diff --git a/tests/libs/zbxdbcache/zbx_vc_get_values.c b/tests/libs/zbxdbcache/zbx_vc_get_values.c
index dbb93588a6d..c1304dfdb1a 100644
--- a/tests/libs/zbxdbcache/zbx_vc_get_values.c
+++ b/tests/libs/zbxdbcache/zbx_vc_get_values.c
@@ -55,19 +55,6 @@ void	zbx_vc_test_get_values_setup(zbx_mock_handle_t *handle, zbx_uint64_t *itemi
 	zbx_history_record_vector_clean(expected, *value_type);
 }
 
-void	zbx_vc_test_check_result(zbx_uint64_t *cache_hits, zbx_uint64_t *cache_misses)
-{
-	zbx_uint64_t	expected_hits, expected_misses;
-
-	if (FAIL == is_uint64(zbx_mock_get_parameter_string("out.cache.hits"), &expected_hits))
-		fail_msg("Invalid out.cache.hits value");
-	zbx_mock_assert_uint64_eq("cache.hits", expected_hits, *cache_hits);
-
-	if (FAIL == is_uint64(zbx_mock_get_parameter_string("out.cache.misses"), &expected_misses))
-		fail_msg("Invalid out.cache.misses value");
-	zbx_mock_assert_uint64_eq("cache.misses", expected_misses, *cache_misses);
-}
-
 void	zbx_mock_test_entry(void **state)
 {
 	zbx_vc_common_test_func(state, NULL, NULL, zbx_vc_test_check_result, zbx_vc_test_get_values_setup);