iox-eclipse-iceoryx#563 move tests in binding_c moduletests into anon…

…ymous namespace Signed-off-by: Mathias Kraus <mathias.kraus@apex.ai>
ApexAI · May 19, 2021 · b380a3d · b380a3d
1 parent 2334abe
commit b380a3d
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 43 deletions.
diff --git a/iceoryx_binding_c/test/moduletests/test_c2cpp_enum_translation.cpp b/iceoryx_binding_c/test/moduletests/test_c2cpp_enum_translation.cpp
@@ -19,6 +19,8 @@
 
 #include "test.hpp"
 
+namespace
+{
 using namespace ::testing;
 
 template <typename CPP, typename C>
@@ -99,3 +101,5 @@ TEST(c2cpp_enum_translation_test, SubscriberEvent)
 #endif
 #pragma GCC diagnostic pop
 }
+
+} // namespace
diff --git a/iceoryx_binding_c/test/moduletests/test_cpp2c_service_description_translation.cpp b/iceoryx_binding_c/test/moduletests/test_cpp2c_service_description_translation.cpp
@@ -16,13 +16,13 @@
 
 #include "iceoryx_binding_c/internal/cpp2c_service_description_translation.hpp"
 
-using namespace iox;
-using namespace iox::capro;
-
-
 #include "test.hpp"
 
+namespace
+{
 using namespace ::testing;
+using namespace iox;
+using namespace iox::capro;
 
 TEST(iox_service_description_translation_test, TranslatesIntegersCorrectly)
 {
@@ -52,3 +52,5 @@ TEST(iox_service_description_translation_test, TranslatesStringCorrectly)
     EXPECT_THAT(std::string(cServiceDescription.instanceString), Eq("FunkyInstance"));
     EXPECT_THAT(std::string(cServiceDescription.eventString), Eq("BumbleBeeSighted"));
 }
+
+} // namespace
diff --git a/iceoryx_binding_c/test/moduletests/test_listener.cpp b/iceoryx_binding_c/test/moduletests/test_listener.cpp
@@ -38,13 +38,12 @@ extern "C" {
 #include <atomic>
 #include <thread>
 
+namespace
+{
 using namespace ::testing;
 using namespace iox::posix;
 using namespace iox::mepoo;
 
-
-namespace
-{
 iox_user_trigger_t g_userTriggerCallbackArgument = nullptr;
 iox_sub_t g_subscriberCallbackArgument = nullptr;
 void* g_contextData = nullptr;
@@ -171,9 +170,6 @@ class iox_listener_test : public Test
 };
 constexpr std::chrono::milliseconds iox_listener_test::TIMEOUT;
 
-
-} // namespace
-
 TEST_F(iox_listener_test, InitListenerWithNullptrForStorageReturnsNullptr)
 {
     EXPECT_EQ(iox_listener_init(nullptr), nullptr);
@@ -333,3 +329,5 @@ TIMING_TEST_F(iox_listener_test, SubscriberCallbackWithContextDataIsCalledSample
     EXPECT_THAT(g_subscriberCallbackArgument, Eq(&m_subscriber[0U]));
     EXPECT_THAT(g_contextData, Eq(static_cast<void*>(&someContextData)));
 });
+
+} // namespace
diff --git a/iceoryx_binding_c/test/moduletests/test_log.cpp b/iceoryx_binding_c/test/moduletests/test_log.cpp
@@ -22,6 +22,8 @@ extern "C" {
 
 #include "test.hpp"
 
+namespace
+{
 using namespace ::testing;
 using namespace iox::log;
 
@@ -50,3 +52,5 @@ TEST(iox_log_test, LogLevelIsSetCorrectly)
     iox_set_loglevel(Iceoryx_LogLevel_Verbose);
     EXPECT_EQ(logManager.DefaultLogLevel(), LogLevel::kVerbose);
 }
+
+} // namespace
diff --git a/iceoryx_binding_c/test/moduletests/test_node.cpp b/iceoryx_binding_c/test/moduletests/test_node.cpp
@@ -18,14 +18,15 @@
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 #include "iceoryx_posh/testing/roudi_gtest.hpp"
 
-using namespace iox;
-using namespace iox::runtime;
-
 extern "C" {
 #include "iceoryx_binding_c/node.h"
 #include "iceoryx_binding_c/runtime.h"
 }
 
+namespace
+{
+using namespace iox;
+using namespace iox::runtime;
 class iox_node_test : public RouDi_GTest
 {
   public:
@@ -105,3 +106,5 @@ TEST_F(iox_node_test, getNodeRuntimeNameBufferIsLessThanNodeProcessNameLength)
     ASSERT_THAT(nameLength, Eq(m_runtimeName.size()));
     EXPECT_THAT(truncatedProcessName, StrEq(expectedProcessName));
 }
+
+} // namespace
diff --git a/iceoryx_binding_c/test/moduletests/test_notification_info.cpp b/iceoryx_binding_c/test/moduletests/test_notification_info.cpp
@@ -28,11 +28,6 @@
 
 using namespace iox;
 using namespace iox::popo;
-using namespace iox::capro;
-using namespace iox::mepoo;
-using namespace iox::cxx;
-using namespace iox::posix;
-
 
 extern "C" {
 #include "iceoryx_binding_c/notification_info.h"
@@ -42,7 +37,13 @@ extern "C" {
 
 #include "test.hpp"
 
+namespace
+{
 using namespace ::testing;
+using namespace iox::capro;
+using namespace iox::cxx;
+using namespace iox::mepoo;
+using namespace iox::posix;
 
 class iox_notification_info_test : public Test
 {
@@ -236,3 +237,5 @@ TEST_F(iox_notification_info_test, callbackCanBeCalledMultipleTimes)
 
     EXPECT_EQ(m_lastNotificationCallbackArgument, &m_userTrigger);
 }
+
+} // namespace
diff --git a/iceoryx_binding_c/test/moduletests/test_publisher.cpp b/iceoryx_binding_c/test/moduletests/test_publisher.cpp
@@ -23,13 +23,6 @@
 #include "iceoryx_posh/mepoo/mepoo_config.hpp"
 #include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp"
 
-using namespace iox;
-using namespace iox::popo;
-using namespace iox::capro;
-using namespace iox::mepoo;
-using namespace iox::cxx;
-using namespace iox::posix;
-
 extern "C" {
 #include "iceoryx_binding_c/chunk.h"
 #include "iceoryx_binding_c/publisher.h"
@@ -38,7 +31,15 @@ extern "C" {
 
 #include "test.hpp"
 
+namespace
+{
 using namespace ::testing;
+using namespace iox;
+using namespace iox::capro;
+using namespace iox::cxx;
+using namespace iox::mepoo;
+using namespace iox::popo;
+using namespace iox::posix;
 
 class iox_pub_test : public Test
 {
@@ -374,3 +375,5 @@ TEST(iox_pub_options_test, publisherOptionInitializationWithNullptrDoesNotCrash)
         ::testing::ExitedWithCode(0),
         ".*");
 }
+
+} // namespace
diff --git a/iceoryx_binding_c/test/moduletests/test_runtime.cpp b/iceoryx_binding_c/test/moduletests/test_runtime.cpp
@@ -21,6 +21,8 @@ extern "C" {
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/testing/roudi_gtest.hpp"
 
+namespace
+{
 using namespace iox;
 using namespace iox::runtime;
 
@@ -100,3 +102,5 @@ TEST_F(BindingC_Runtime_test, GetInstanceNameLengthIsLessThanRuntimeNameLength)
     ASSERT_THAT(nameLength, Eq(strnlen(ACTUAL_RUNTIME_NAME, iox::MAX_RUNTIME_NAME_LENGTH + 1)));
     EXPECT_THAT(truncatedRuntimeName, StrEq(EXPECTED_RUNTIME_NAME));
 }
+
+} // namespace
diff --git a/iceoryx_binding_c/test/moduletests/test_service_description.cpp b/iceoryx_binding_c/test/moduletests/test_service_description.cpp
@@ -16,10 +16,6 @@
 
 #include "iceoryx_posh/capro/service_description.hpp"
 
-using namespace iox;
-using namespace iox::capro;
-
-
 extern "C" {
 #include "iceoryx_binding_c/service_description.h"
 }
@@ -28,7 +24,11 @@ extern "C" {
 
 #include <type_traits>
 
+namespace
+{
 using namespace ::testing;
+using namespace iox;
+using namespace iox::capro;
 
 TEST(iox_service_description_test, StringSizesAreCorrect)
 {
@@ -39,3 +39,5 @@ TEST(iox_service_description_test, StringSizesAreCorrect)
     EXPECT_THAT(sizeof(decltype(std::declval<iox_service_description_t>().eventString)),
                 Eq(iox::capro::IdString_t().capacity()));
 }
+
+} // namespace
diff --git a/iceoryx_binding_c/test/moduletests/test_subscriber.cpp b/iceoryx_binding_c/test/moduletests/test_subscriber.cpp
@@ -26,13 +26,6 @@
 #include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp"
 #include "mocks/wait_set_mock.hpp"
 
-using namespace iox;
-using namespace iox::popo;
-using namespace iox::capro;
-using namespace iox::mepoo;
-using namespace iox::cxx;
-using namespace iox::posix;
-
 extern "C" {
 #include "iceoryx_binding_c/chunk.h"
 #include "iceoryx_binding_c/runtime.h"
@@ -43,7 +36,15 @@ extern "C" {
 
 #include "test.hpp"
 
+namespace
+{
 using namespace ::testing;
+using namespace iox;
+using namespace iox::capro;
+using namespace iox::cxx;
+using namespace iox::mepoo;
+using namespace iox::popo;
+using namespace iox::posix;
 
 class iox_sub_test : public Test
 {
@@ -446,3 +447,5 @@ TEST(iox_sub_options_test, subscriberOptionInitializationWithNullptrDoesNotCrash
         ::testing::ExitedWithCode(0),
         ".*");
 }
+
+} // namespace
diff --git a/iceoryx_binding_c/test/moduletests/test_types.cpp b/iceoryx_binding_c/test/moduletests/test_types.cpp
@@ -21,17 +21,17 @@
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 
-using namespace iox;
-using namespace iox::popo;
-
-
 extern "C" {
 #include "iceoryx_binding_c/types.h"
 }
 
 #include "test.hpp"
 
+namespace
+{
 using namespace ::testing;
+using namespace iox;
+using namespace iox::popo;
 
 TEST(iox_types_test, WaitSetStorageSizeFits)
 {
@@ -62,3 +62,5 @@ TEST(iox_types_test, cpp2c_PublisherStorageSizeFits)
     EXPECT_THAT(sizeof(cpp2c_Publisher), Le(sizeof(iox_pub_storage_t)));
     EXPECT_THAT(alignof(cpp2c_Publisher), Le(alignof(iox_pub_storage_t)));
 }
+
+} // namespace
diff --git a/iceoryx_binding_c/test/moduletests/test_user_trigger.cpp b/iceoryx_binding_c/test/moduletests/test_user_trigger.cpp
@@ -18,17 +18,18 @@
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "mocks/wait_set_mock.hpp"
 
-using namespace iox;
-using namespace iox::popo;
-
 extern "C" {
 #include "iceoryx_binding_c/user_trigger.h"
 #include "iceoryx_binding_c/wait_set.h"
 }
 
 #include "test.hpp"
 
+namespace
+{
 using namespace ::testing;
+using namespace iox;
+using namespace iox::popo;
 
 class iox_user_trigger_test : public Test
 {
@@ -126,3 +127,5 @@ TEST_F(iox_user_trigger_test, disable_trigger_eventingItFromWaitsetCleansup)
 
     EXPECT_EQ(m_waitSet.size(), 0U);
 }
+
+} // namespace
diff --git a/iceoryx_binding_c/test/moduletests/test_wait_set.cpp b/iceoryx_binding_c/test/moduletests/test_wait_set.cpp
@@ -38,6 +38,8 @@ extern "C" {
 #include <atomic>
 #include <thread>
 
+namespace
+{
 using namespace ::testing;
 
 namespace
@@ -630,3 +632,5 @@ TEST_F(iox_ws_test, UserTriggerCallbackWithContextDataIsCalled)
     EXPECT_THAT(m_callbackOrigin, Eq(m_userTrigger[0]));
     EXPECT_THAT(m_contextData, Eq(&someContextData));
 }
+
+} // namespace