From fcb09d4c6e2f0407332e865068f736f7b940f52d Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 14 Jan 2020 16:03:36 +0100 Subject: [PATCH] rtt_roscomm_tests: check exact callback signature in transport_tests.cpp --- tests/rtt_roscomm_tests/test/transport_tests.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/rtt_roscomm_tests/test/transport_tests.cpp b/tests/rtt_roscomm_tests/test/transport_tests.cpp index 9edb0e1d..ecd45a2e 100644 --- a/tests/rtt_roscomm_tests/test/transport_tests.cpp +++ b/tests/rtt_roscomm_tests/test/transport_tests.cpp @@ -117,22 +117,22 @@ TEST(TransportTest, VectorTest) EXPECT_FALSE(in.connected()); } -static int callback_called = 0; +static std::map callback_called; bool callback0(std_srvs::Empty::Request&, std_srvs::Empty::Response&) { - ++callback_called; + ++callback_called[0]; return true; } bool callback1() { - ++callback_called; + ++callback_called[1]; return true; } void callback2() { - ++callback_called; + ++callback_called[2]; } TEST(TransportTest, ServiceServerTest) @@ -180,14 +180,14 @@ TEST(TransportTest, ServiceServerTest) EXPECT_TRUE(service_caller2.ready()); // Call the service - EXPECT_EQ(0, callback_called); + EXPECT_TRUE(callback_called.empty()); std_srvs::Empty empty; EXPECT_TRUE(service_caller0(empty.request, empty.response)); - EXPECT_EQ(1, callback_called); + EXPECT_EQ(1, callback_called[0]); EXPECT_TRUE(service_caller1(empty.request, empty.response)); - EXPECT_EQ(2, callback_called); + EXPECT_EQ(1, callback_called[1]); EXPECT_TRUE(service_caller2(empty.request, empty.response)); - EXPECT_EQ(3, callback_called); + EXPECT_EQ(1, callback_called[2]); // Disconnect the service EXPECT_TRUE(rosservice.lock()->disconnect(service + "0"));