From ed21fc14ac2d321b322bdd3dd0adc28313daaad3 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 9 Dec 2022 11:21:02 +0100 Subject: [PATCH] Fix tests Signed-off-by: Pablo Garrido --- CMakeLists.txt | 2 +- test/test/client_agent/ClientAgentCan.cpp | 8 +++++++- .../test/client_agent/ClientAgentInteraction.cpp | 10 ++++++++-- test/test/client_agent/ClientAgentSerial.cpp | 8 +++++++- test/test/discovery/DiscoveryIntegration.cpp | 8 +++++++- test/test/interaction_client/Discovery.hpp | 1 + .../PublisherSubscriberCan.cpp | 8 +++++++- .../PublisherSubscriberInteraction.cpp | 16 +++++++++++----- .../PublisherSubscriberSerial.cpp | 8 +++++++- test/test/shapes_demo/ShapesDemo.cpp | 8 +++++++- 10 files changed, 63 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48d6985..ace2ee9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,7 +198,7 @@ if(UXRCE_BUILD_TESTS) GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG - 2fe3bd994b3189899d93f1d5a881e725e046fdc2 + release-1.11.0 PREFIX ${PROJECT_BINARY_DIR}/googletest INSTALL_DIR diff --git a/test/test/client_agent/ClientAgentCan.cpp b/test/test/client_agent/ClientAgentCan.cpp index 14ca84b..c8c7ecb 100644 --- a/test/test/client_agent/ClientAgentCan.cpp +++ b/test/test/client_agent/ClientAgentCan.cpp @@ -9,7 +9,13 @@ TEST_P(ClientAgentCan, PingFromClientToAgent) ASSERT_NO_FATAL_FAILURE(client_can_.ping_agent()); } -INSTANTIATE_TEST_CASE_P( +#ifdef INSTANTIATE_TEST_SUITE_P +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_SUITE_P(x, y, z) +#else +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_CASE_P(x, y, z) +#endif // ifdef INSTANTIATE_TEST_SUITE_P + +GTEST_INSTANTIATE_TEST_MACRO( CanTransports, ClientAgentCan, ::testing::Values(MiddlewareKind::FASTDDS)); \ No newline at end of file diff --git a/test/test/client_agent/ClientAgentInteraction.cpp b/test/test/client_agent/ClientAgentInteraction.cpp index e2ebd12..5250212 100644 --- a/test/test/client_agent/ClientAgentInteraction.cpp +++ b/test/test/client_agent/ClientAgentInteraction.cpp @@ -384,14 +384,20 @@ TEST_P(ClientAgentInteraction, PingFromClientToAgent) ASSERT_NO_FATAL_FAILURE(client_.ping_agent(transport_kind)); } -INSTANTIATE_TEST_CASE_P( +#ifdef INSTANTIATE_TEST_SUITE_P +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_SUITE_P(x, y, z) +#else +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_CASE_P(x, y, z) +#endif // ifdef INSTANTIATE_TEST_SUITE_P + +GTEST_INSTANTIATE_TEST_MACRO( Transports, ClientAgentInteraction, ::testing::Combine( ::testing::Values(Transport::UDP_IPV4_TRANSPORT, Transport::TCP_IPV4_TRANSPORT, Transport::UDP_IPV6_TRANSPORT, Transport::TCP_IPV6_TRANSPORT), ::testing::Values(MiddlewareKind::FASTDDS, MiddlewareKind::FASTRTPS, MiddlewareKind::CED))); -INSTANTIATE_TEST_CASE_P( +GTEST_INSTANTIATE_TEST_MACRO( CustomTransports, ClientAgentInteraction, ::testing::Combine( diff --git a/test/test/client_agent/ClientAgentSerial.cpp b/test/test/client_agent/ClientAgentSerial.cpp index 23ad2a6..c7ce52b 100644 --- a/test/test/client_agent/ClientAgentSerial.cpp +++ b/test/test/client_agent/ClientAgentSerial.cpp @@ -39,7 +39,13 @@ TEST_P(ClientAgentSerial, PingFromClientToAgent) } } -INSTANTIATE_TEST_CASE_P( +#ifdef INSTANTIATE_TEST_SUITE_P +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_SUITE_P(x, y, z) +#else +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_CASE_P(x, y, z) +#endif // ifdef INSTANTIATE_TEST_SUITE_P + +GTEST_INSTANTIATE_TEST_MACRO( SerialTransports, ClientAgentSerial, ::testing::Combine( diff --git a/test/test/discovery/DiscoveryIntegration.cpp b/test/test/discovery/DiscoveryIntegration.cpp index f158836..bfe35aa 100644 --- a/test/test/discovery/DiscoveryIntegration.cpp +++ b/test/test/discovery/DiscoveryIntegration.cpp @@ -166,7 +166,13 @@ TEST_P(DiscoveryIntegration, DiscoveryMulticast) discovery_->multicast(); } -INSTANTIATE_TEST_CASE_P( +#ifdef INSTANTIATE_TEST_SUITE_P +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_SUITE_P(x, y, z) +#else +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_CASE_P(x, y, z) +#endif // ifdef INSTANTIATE_TEST_SUITE_P + +GTEST_INSTANTIATE_TEST_MACRO( Transports, DiscoveryIntegration, ::testing::Combine( diff --git a/test/test/interaction_client/Discovery.hpp b/test/test/interaction_client/Discovery.hpp index 5516fe5..03daef5 100644 --- a/test/test/interaction_client/Discovery.hpp +++ b/test/test/interaction_client/Discovery.hpp @@ -11,6 +11,7 @@ #include #include #include +#include inline bool operator==(TransportLocator const & lhs, TransportLocator const & rhs) diff --git a/test/test/publisher_subscriber/PublisherSubscriberCan.cpp b/test/test/publisher_subscriber/PublisherSubscriberCan.cpp index c1754ee..35c6009 100644 --- a/test/test/publisher_subscriber/PublisherSubscriberCan.cpp +++ b/test/test/publisher_subscriber/PublisherSubscriberCan.cpp @@ -137,7 +137,13 @@ TEST_P(PublisherSubscriberCan, PubSub1ContinousFragmentedTopic) publisher_.publish(1, 0x80, 1, message); } -INSTANTIATE_TEST_CASE_P( +#ifdef INSTANTIATE_TEST_SUITE_P +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_SUITE_P(x, y, z) +#else +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_CASE_P(x, y, z) +#endif // ifdef INSTANTIATE_TEST_SUITE_P + +GTEST_INSTANTIATE_TEST_MACRO( PubSubCan, PublisherSubscriberCan, ::testing::Combine( diff --git a/test/test/publisher_subscriber/PublisherSubscriberInteraction.cpp b/test/test/publisher_subscriber/PublisherSubscriberInteraction.cpp index 870a91d..fae6fcb 100644 --- a/test/test/publisher_subscriber/PublisherSubscriberInteraction.cpp +++ b/test/test/publisher_subscriber/PublisherSubscriberInteraction.cpp @@ -202,7 +202,13 @@ TEST_P(PublisherSubscriberUnitary, PubSub1WithPing) ASSERT_EQ(subscriber_.get_received_topics(), message_number); } -INSTANTIATE_TEST_CASE_P( +#ifdef INSTANTIATE_TEST_SUITE_P +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_SUITE_P(x, y, z) +#else +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_CASE_P(x, y, z) +#endif // ifdef INSTANTIATE_TEST_SUITE_P + +GTEST_INSTANTIATE_TEST_MACRO( PublisherSubscriberWithPing, PublisherSubscriberUnitary, ::testing::Combine( @@ -211,7 +217,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(0.0f), ::testing::Values(XRCECreationMode::XRCE_BIN_CREATION))); -INSTANTIATE_TEST_CASE_P( +GTEST_INSTANTIATE_TEST_MACRO( TransportAndLost, PublisherSubscriberNoLost, ::testing::Combine( @@ -220,7 +226,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(0.0f), ::testing::Values(XRCECreationMode::XRCE_XML_CREATION))); -INSTANTIATE_TEST_CASE_P( +GTEST_INSTANTIATE_TEST_MACRO( TransportAndLostCreationModes, PublisherSubscriberNoLost, ::testing::Combine( @@ -229,7 +235,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(0.0f), ::testing::Values(XRCECreationMode::XRCE_XML_CREATION, XRCECreationMode::XRCE_BIN_CREATION))); -INSTANTIATE_TEST_CASE_P( +GTEST_INSTANTIATE_TEST_MACRO( TransportAndLostCustomTransports, PublisherSubscriberNoLost, ::testing::Combine( @@ -262,7 +268,7 @@ TEST_P(PublisherSubscriberLost, PubSub3FragmentedTopic4Parts) check_messages(message, 3, 0x80); } -INSTANTIATE_TEST_CASE_P( +GTEST_INSTANTIATE_TEST_MACRO( TransportAndLost, PublisherSubscriberLost, ::testing::Combine( diff --git a/test/test/publisher_subscriber/PublisherSubscriberSerial.cpp b/test/test/publisher_subscriber/PublisherSubscriberSerial.cpp index 3b2b6fc..b015e59 100644 --- a/test/test/publisher_subscriber/PublisherSubscriberSerial.cpp +++ b/test/test/publisher_subscriber/PublisherSubscriberSerial.cpp @@ -162,7 +162,13 @@ TEST_P(PublisherSubscriberSerial, MultiPubSub) check_messages(SMALL_MESSAGE, 10, 0x01); } -INSTANTIATE_TEST_CASE_P( +#ifdef INSTANTIATE_TEST_SUITE_P +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_SUITE_P(x, y, z) +#else +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_CASE_P(x, y, z) +#endif // ifdef INSTANTIATE_TEST_SUITE_P + +GTEST_INSTANTIATE_TEST_MACRO( MultiSerialPubSubBin, PublisherSubscriberSerial, ::testing::Combine( diff --git a/test/test/shapes_demo/ShapesDemo.cpp b/test/test/shapes_demo/ShapesDemo.cpp index fce9844..56e1302 100644 --- a/test/test/shapes_demo/ShapesDemo.cpp +++ b/test/test/shapes_demo/ShapesDemo.cpp @@ -104,7 +104,13 @@ class ShapesDemoTest : public ::testing::TestWithParam /* ############################################## TESTS ##################################################### */ -INSTANTIATE_TEST_CASE_P(Transport, ShapesDemoTest, ::testing::Values(UDP_TRANSPORT, TCP_TRANSPORT), ::testing::PrintToStringParamName()); +#ifdef INSTANTIATE_TEST_SUITE_P +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z, w) INSTANTIATE_TEST_SUITE_P(x, y, z, w) +#else +#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z, w) INSTANTIATE_TEST_CASE_P(x, y, z, w) +#endif // ifdef INSTANTIATE_TEST_SUITE_P + +GTEST_INSTANTIATE_TEST_MACRO(Transport, ShapesDemoTest, ::testing::Values(UDP_TRANSPORT, TCP_TRANSPORT), ::testing::PrintToStringParamName()); TEST_P(ShapesDemoTest, CreateSession) {