Tests: unify usage of Message Generator

Author: AdamZvara

tests/unit/core/parser/CMakeLists.txt

@@ -1,9 +1,9 @@
 # Add header files of the IPFIX Message generator
-include_directories(tools)
+include_directories(../../tools)
 
 set(AUX_TOOLS
-    "tools/MsgGen.cpp"
-    "tools/MsgGen.h"
+    "../../tools/MsgGen.cpp"
+    "../../tools/MsgGen.h"
 )
 
 # Copy auxiliary files for tests

tests/unit/core/parser/parser_common.cpp

@@ -86,7 +86,7 @@ class Common : public ::testing::TestWithParam<enum fds_session_type> {
 };
 
 // Define parameters of parametrized test
-INSTANTIATE_TEST_CASE_P(Parser, Common, ::testing::Values(FDS_SESSION_UDP,
+INSTANTIATE_TEST_SUITE_P(Parser, Common, ::testing::Values(FDS_SESSION_UDP,
     FDS_SESSION_TCP, FDS_SESSION_SCTP, FDS_SESSION_FILE));
 
 // Just create and destroy parser
@@ -147,7 +147,7 @@ TEST_P(Common, simple)
     ipx_msg_garbage *garbage;
     ASSERT_EQ(ipx_parser_process(parser, &ipfix_msg, &garbage), IPX_OK);
 
-    EXPECT_EQ(ipx_msg_ipfix_get_drec_cnt(ipfix_msg), 1);
+    EXPECT_EQ(ipx_msg_ipfix_get_drec_cnt(ipfix_msg), 1u);
     ipx_ipfix_record *rec = ipx_msg_ipfix_get_drec(ipfix_msg, 0);
     ASSERT_NE(rec, nullptr);