.......... [DEV-2062] fixed PR comments

13 files changed, 12 insertions, 35 deletions

diff --git a/tests/libs/zbxcommon/zbx_common_trim_utf8.c b/tests/libs/zbxcommon/zbx_common_trim_utf8.c
index 5b36b2ed87b..5a04ddaf9ae 100644
--- a/tests/libs/zbxcommon/zbx_common_trim_utf8.c
+++ b/tests/libs/zbxcommon/zbx_common_trim_utf8.c
@@ -67,5 +67,4 @@ void	zbx_mock_test_entry_common_trim_utf8(void **state, int trim_utf8_func)
 
 	zbx_mock_assert_str_eq("trimmed value", expected, in);
 	zbx_free(in);
-
 }
diff --git a/tests/libs/zbxcommon/zbx_common_trim_utf8.h b/tests/libs/zbxcommon/zbx_common_trim_utf8.h
index d34bbf6ccdc..401264e2507 100644
--- a/tests/libs/zbxcommon/zbx_common_trim_utf8.h
+++ b/tests/libs/zbxcommon/zbx_common_trim_utf8.h
@@ -17,8 +17,8 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#ifndef ZABBIX_MOCK_COMMON_TRIM_UTF8_H
-#define ZABBIX_MOCK_COMMON_TRIM_UTF8_H
+#ifndef ZABBIX_COMMON_TRIM_UTF8_H
+#define ZABBIX_COMMON_TRIM_UTF8_H
 
 #define ZABBIX_MOCK_LTRIM_UTF8	0
 #define ZABBIX_MOCK_RTRIM_UTF8	1
diff --git a/tests/libs/zbxcommon/zbx_ltrim_utf8.c b/tests/libs/zbxcommon/zbx_ltrim_utf8.c
index 34f4542890d..ad2708c4f86 100644
--- a/tests/libs/zbxcommon/zbx_ltrim_utf8.c
+++ b/tests/libs/zbxcommon/zbx_ltrim_utf8.c
@@ -19,10 +19,6 @@
 
 #include "zbx_common_trim_utf8.h"
 #include "zbxmocktest.h"
-#include "zbxmockdata.h"
-#include "zbxmockutil.h"
-#include "zbxmockassert.h"
-
 #include "common.h"
 
 void	zbx_mock_test_entry(void **state)
diff --git a/tests/libs/zbxcommon/zbx_rtrim_utf8.c b/tests/libs/zbxcommon/zbx_rtrim_utf8.c
index 240cc612480..b7562376781 100644
--- a/tests/libs/zbxcommon/zbx_rtrim_utf8.c
+++ b/tests/libs/zbxcommon/zbx_rtrim_utf8.c
@@ -19,10 +19,6 @@
 
 #include "zbx_common_trim_utf8.h"
 #include "zbxmocktest.h"
-#include "zbxmockdata.h"
-#include "zbxmockutil.h"
-#include "zbxmockassert.h"
-
 #include "common.h"
 
 void	zbx_mock_test_entry(void **state)
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.c b/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.c
index 1007ef8bd12..7cef598b53d 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.c
+++ b/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.c
@@ -63,9 +63,9 @@ void	zbx_mock_test_entry_KERNEL_COMMON(void **state, int kernel_func)
 	init_request(&request);
 	init_result(&param_result);
 
-	if (kernel_func == ZABBIX_MOCK_KERNEL_MAXPROC)
+	if (ZABBIX_MOCK_KERNEL_MAXPROC == kernel_func)
 		actual_result = KERNEL_MAXPROC(&request, &param_result);
-	else if (kernel_func == ZABBIX_MOCK_KERNEL_MAXFILES)
+	else if (ZABBIX_MOCK_KERNEL_MAXFILES == kernel_func)
 		actual_result = KERNEL_MAXFILES(&request, &param_result);
 	else
 		fail_msg("Invalid kernel_func");
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.h b/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.h
index 576a2a8a509..f84a843f13c 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.h
+++ b/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.h
@@ -17,8 +17,8 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#ifndef ZABBIX_MOCK_KERNEL_COMMON_HELPER_H
-#define ZABBIX_MOCK_KERNEL_COMMON_HELPER_H
+#ifndef KERNEL_COMMON_H
+#define KERNEL_COMMON_H
 
 #define ZABBIX_MOCK_KERNEL_MAXPROC	0
 #define ZABBIX_MOCK_KERNEL_MAXFILES	1
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.c b/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.c
index 97f8bdac073..372e24782fd 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.c
+++ b/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.c
@@ -21,9 +21,6 @@
 #include "zbxmocktest.h"
 #include "zbxmockdata.h"
 
-#include "common.h"
-#include "sysinfo.h"
-
 void	zbx_mock_test_entry(void **state)
 {
 	zbx_mock_test_entry_KERNEL_COMMON(state, ZABBIX_MOCK_KERNEL_MAXFILES);
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.c b/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.c
index 11bb24026cf..3cb3f6a4f7f 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.c
+++ b/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.c
@@ -21,9 +21,6 @@
 #include "zbxmocktest.h"
 #include "zbxmockdata.h"
 
-#include "common.h"
-#include "sysinfo.h"
-
 void	zbx_mock_test_entry(void **state)
 {
 	zbx_mock_test_entry_KERNEL_COMMON(state, ZABBIX_MOCK_KERNEL_MAXPROC);
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.c b/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.c
index b8a493bd829..240dd97878b 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.c
+++ b/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.c
@@ -77,14 +77,15 @@ void	zbx_mock_test_entry_NET_IF_COMMON(void **state, int net_if_func)
 
 	init_request(&request);
 	init_result(&param_result);
+
 	if (SUCCEED != parse_item_key(init_param, &request))
 		fail_msg("Cannot parse item key: %s", init_param);
 
-	if (net_if_func == ZABBIX_MOCK_NET_IF_IN)
+	if (ZABBIX_MOCK_NET_IF_IN == net_if_func)
 		actual_result = NET_IF_IN(&request, &param_result);
-	else if (net_if_func == ZABBIX_MOCK_NET_IF_OUT)
+	else if (ZABBIX_MOCK_NET_IF_OUT == net_if_func)
 		actual_result = NET_IF_OUT(&request, &param_result);
-	else if (net_if_func == ZABBIX_MOCK_NET_IF_TOTAL)
+	else if (ZABBIX_MOCK_NET_IF_TOTAL == net_if_func)
 		actual_result = NET_IF_TOTAL(&request, &param_result);
 	else
 		fail_msg("invalid net_if_func");
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.h b/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.h
index 2b0820658c4..ba3856fb52c 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.h
+++ b/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.h
@@ -17,8 +17,8 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#ifndef ZABBIX_MOCK_NET_IF_COMMON_HELPER_H
-#define ZABBIX_MOCK_NET_IF_COMMON_HELPER_H
+#ifndef NET_IF_COMMON_H
+#define NET_IF_COMMON_H
 
 #define ZABBIX_MOCK_NET_IF_IN		0
 #define ZABBIX_MOCK_NET_IF_OUT		1
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_IN.c b/tests/libs/zbxsysinfo/linux/NET_IF_IN.c
index 9d01e3c6b27..51f2e8cf140 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_IN.c
+++ b/tests/libs/zbxsysinfo/linux/NET_IF_IN.c
@@ -21,9 +21,6 @@
 #include "zbxmocktest.h"
 #include "zbxmockdata.h"
 
-#include "common.h"
-#include "sysinfo.h"
-
 void	zbx_mock_test_entry(void **state)
 {
 	zbx_mock_test_entry_NET_IF_COMMON(state, ZABBIX_MOCK_NET_IF_IN);
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_OUT.c b/tests/libs/zbxsysinfo/linux/NET_IF_OUT.c
index f85ffd2d5f6..01bd78f33ec 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_OUT.c
+++ b/tests/libs/zbxsysinfo/linux/NET_IF_OUT.c
@@ -21,9 +21,6 @@
 #include "zbxmocktest.h"
 #include "zbxmockdata.h"
 
-#include "common.h"
-#include "sysinfo.h"
-
 void	zbx_mock_test_entry(void **state)
 {
 	zbx_mock_test_entry_NET_IF_COMMON(state, ZABBIX_MOCK_NET_IF_OUT);
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.c b/tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.c
index 3aab6380245..d735caa1aa4 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.c
+++ b/tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.c
@@ -21,9 +21,6 @@
 #include "zbxmocktest.h"
 #include "zbxmockdata.h"
 
-#include "common.h"
-#include "sysinfo.h"
-
 void	zbx_mock_test_entry(void **state)
 {
 	zbx_mock_test_entry_NET_IF_COMMON(state, ZABBIX_MOCK_NET_IF_TOTAL);