diff options
author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-02-18 12:17:37 +0300 |
---|---|---|
committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-02-18 12:17:37 +0300 |
commit | e11dcb0b34424ccb47efbf887997e00d2d5f726e (patch) | |
tree | 9cfcd56c55b2b6c99ed0c7af6e9de6be39b7bf14 /tests | |
parent | b249c32c7363be137aad612c2c46a4d0fb4bec4b (diff) | |
parent | c765215fafd337a6870d60ddd799c962884d7fe1 (diff) |
.......... [DEV-2074] updated to the latest master
Diffstat (limited to 'tests')
-rw-r--r-- | tests/libs/zbxdbcache/dc_check_maintenance_period.c | 1 | ||||
-rw-r--r-- | tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c | 2 | ||||
-rw-r--r-- | tests/libs/zbxdbcache/dc_item_poller_type_update.c | 1 | ||||
-rw-r--r-- | tests/libs/zbxdbcache/dc_maintenance_match_tags.c | 2 | ||||
-rw-r--r-- | tests/libs/zbxdbcache/zbx_vc_common.c | 6 | ||||
-rw-r--r-- | tests/libs/zbxdbcache/zbx_vc_common.h | 4 | ||||
-rw-r--r-- | tests/mocks/configcache/configcache.c | 22 | ||||
-rw-r--r-- | tests/mocks/configcache/configcache.h | 16 | ||||
-rw-r--r-- | tests/mocks/configcache/configcache_mock.h | 12 | ||||
-rw-r--r-- | tests/mocks/configcache/hosts.c | 3 | ||||
-rw-r--r-- | tests/mocks/configcache/usermacros.c | 10 |
11 files changed, 19 insertions, 60 deletions
diff --git a/tests/libs/zbxdbcache/dc_check_maintenance_period.c b/tests/libs/zbxdbcache/dc_check_maintenance_period.c index a942ff7577f..cc49551eaf4 100644 --- a/tests/libs/zbxdbcache/dc_check_maintenance_period.c +++ b/tests/libs/zbxdbcache/dc_check_maintenance_period.c @@ -28,7 +28,6 @@ #include "dbcache.h" #include "log.h" -#define ZBX_DBCONFIG_IMPL #include "dbconfig.h" #include "dbconfig_maintenance_test.h" diff --git a/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c b/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c index be351068c26..75048dc4cb2 100644 --- a/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c +++ b/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c @@ -27,8 +27,6 @@ #include "zbxalgo.h" #include "dbcache.h" #include "mutexs.h" - -#define ZBX_DBCONFIG_IMPL #include "dbconfig.h" #include "configcache_mock.h" diff --git a/tests/libs/zbxdbcache/dc_item_poller_type_update.c b/tests/libs/zbxdbcache/dc_item_poller_type_update.c index 656f1750f50..674c1f2d59a 100644 --- a/tests/libs/zbxdbcache/dc_item_poller_type_update.c +++ b/tests/libs/zbxdbcache/dc_item_poller_type_update.c @@ -32,7 +32,6 @@ #include "common.h" #include "mutexs.h" -#define ZBX_DBCONFIG_IMPL #include "dbcache.h" #include "dbconfig.h" #include "dc_item_poller_type_update_test.h" diff --git a/tests/libs/zbxdbcache/dc_maintenance_match_tags.c b/tests/libs/zbxdbcache/dc_maintenance_match_tags.c index f4faf31a7cd..81422212403 100644 --- a/tests/libs/zbxdbcache/dc_maintenance_match_tags.c +++ b/tests/libs/zbxdbcache/dc_maintenance_match_tags.c @@ -26,8 +26,6 @@ #include "mutexs.h" #include "zbxalgo.h" #include "dbcache.h" - -#define ZBX_DBCONFIG_IMPL #include "dbconfig.h" #include "dbconfig_maintenance_test.h" diff --git a/tests/libs/zbxdbcache/zbx_vc_common.c b/tests/libs/zbxdbcache/zbx_vc_common.c index 2486c4a43e9..1ba205a06ed 100644 --- a/tests/libs/zbxdbcache/zbx_vc_common.c +++ b/tests/libs/zbxdbcache/zbx_vc_common.c @@ -17,18 +17,18 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "zbx_vc_common.h" + #include "zbxmocktest.h" -#include "zbxmockdata.h" #include "zbxmockassert.h" #include "zbxmockutil.h" #include "common.h" +#include "mutexs.h" #include "valuecache.h" #include "valuecache_test.h" #include "mocks/valuecache/valuecache_mock.h" -#include "zbx_vc_common.h" - extern zbx_uint64_t CONFIG_VALUE_CACHE_SIZE; static void zbx_vc_test_check_result(zbx_uint64_t cache_hits, zbx_uint64_t cache_misses) diff --git a/tests/libs/zbxdbcache/zbx_vc_common.h b/tests/libs/zbxdbcache/zbx_vc_common.h index 796b72d8a02..e7ef5d9dd02 100644 --- a/tests/libs/zbxdbcache/zbx_vc_common.h +++ b/tests/libs/zbxdbcache/zbx_vc_common.h @@ -20,6 +20,10 @@ #ifndef ZBX_VC_COMMON_H #define ZBX_VC_COMMON_H +#include "zbxalgo.h" +#include "zbxhistory.h" +#include "zbxmockdata.h" + typedef void (*zbx_vc_test_add_values_setup_cb)(zbx_mock_handle_t *handle, zbx_vector_ptr_t *history, int *err, const char **data, int *ret_flush); typedef void (*zbx_vc_test_get_value_setup_cb)(zbx_mock_handle_t *handle, zbx_uint64_t *itemid, diff --git a/tests/mocks/configcache/configcache.c b/tests/mocks/configcache/configcache.c index 4319cca2f23..eb9566bf105 100644 --- a/tests/mocks/configcache/configcache.c +++ b/tests/mocks/configcache/configcache.c @@ -18,20 +18,7 @@ **/ #include "configcache.h" - -#include "zbxmocktest.h" -#include "zbxmockdata.h" -#include "zbxmockassert.h" -#include "zbxmockutil.h" - -#include "zbxserver.h" -#include "common.h" -#include "zbxalgo.h" -#include "dbcache.h" -#include "mutexs.h" - -#define ZBX_DBCONFIG_IMPL -#include "dbconfig.h" +#include "configcache_mock.h" zbx_mock_config_t mock_config; @@ -45,6 +32,13 @@ void *__wrap_zbx_hashset_search(zbx_hashset_t *hs, const void *data) { int i; + if (&mock_config.dc.items == hs) + { + static ZBX_DC_ITEM item = {.hostid = 1}; + + return &item; + } + if (0 != (mock_config.initialized & ZBX_MOCK_CONFIG_USERMACROS)) { if (hs == &mock_config.dc.hmacros_hm) diff --git a/tests/mocks/configcache/configcache.h b/tests/mocks/configcache/configcache.h index 944e98730a0..736a3b3e2b6 100644 --- a/tests/mocks/configcache/configcache.h +++ b/tests/mocks/configcache/configcache.h @@ -17,25 +17,13 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "zbxmocktest.h" -#include "zbxmockdata.h" -#include "zbxmockassert.h" -#include "zbxmockutil.h" +#ifndef ZABBIX_CONFIGCACHE_H +#define ZABBIX_CONFIGCACHE_H -#include "zbxserver.h" #include "common.h" #include "zbxalgo.h" -#include "dbcache.h" -#include "mutexs.h" - -#define ZBX_DBCONFIG_IMPL #include "dbconfig.h" -#include "configcache_mock.h" - -#ifndef ZABBIX_CONFIGCACHE_H -#define ZABBIX_CONFIGCACHE_H - typedef struct { ZBX_DC_CONFIG dc; diff --git a/tests/mocks/configcache/configcache_mock.h b/tests/mocks/configcache/configcache_mock.h index 4a11e1f2b81..603b09cc0ac 100644 --- a/tests/mocks/configcache/configcache_mock.h +++ b/tests/mocks/configcache/configcache_mock.h @@ -17,17 +17,6 @@ ** 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 "zbxserver.h" -#include "common.h" -#include "zbxalgo.h" -#include "dbcache.h" -#include "mutexs.h" - #ifndef ZABBIX_CONFIGCACHE_MOCK_H #define ZABBIX_CONFIGCACHE_MOCK_H @@ -37,5 +26,4 @@ void mock_config_free(void); void mock_config_load_user_macros(const char *path); void mock_config_load_hosts(const char *path); - #endif diff --git a/tests/mocks/configcache/hosts.c b/tests/mocks/configcache/hosts.c index ea67b094aa2..e99604ec048 100644 --- a/tests/mocks/configcache/hosts.c +++ b/tests/mocks/configcache/hosts.c @@ -27,10 +27,9 @@ #include "zbxalgo.h" #include "dbcache.h" #include "mutexs.h" -#define ZBX_DBCONFIG_IMPL #include "dbconfig.h" - #include "configcache.h" +#include "configcache_mock.h" extern zbx_mock_config_t mock_config; diff --git a/tests/mocks/configcache/usermacros.c b/tests/mocks/configcache/usermacros.c index fb80e499d58..44b8885f726 100644 --- a/tests/mocks/configcache/usermacros.c +++ b/tests/mocks/configcache/usermacros.c @@ -19,18 +19,10 @@ #include "zbxmocktest.h" #include "zbxmockdata.h" -#include "zbxmockassert.h" #include "zbxmockutil.h" - -#include "zbxserver.h" -#include "common.h" -#include "zbxalgo.h" -#include "dbcache.h" -#include "mutexs.h" -#define ZBX_DBCONFIG_IMPL #include "dbconfig.h" - #include "configcache.h" +#include "configcache_mock.h" extern zbx_mock_config_t mock_config; |