iox-eclipse-iceoryx#563 remove superfluous using directive

Signed-off-by: Mathias Kraus <mathias.kraus@apex.ai>
ApexAI · May 12, 2021 · 3542c0d · 3542c0d
1 parent ab96552
commit 3542c0d
Show file tree

Hide file tree

Showing 37 changed files with 11 additions and 44 deletions.
diff --git a/doc/aspice_swe3_4/example/iceoryx_component/test/moduletests/test_component_modules.cpp b/doc/aspice_swe3_4/example/iceoryx_component/test/moduletests/test_component_modules.cpp
@@ -19,7 +19,6 @@
 
 using namespace ::testing;
 using ::testing::_;
-using ::testing::Return;
 
 
 int main(int argc, char* argv[])

diff --git a/doc/aspice_swe3_4/example/iceoryx_component/test/moduletests/test_example_base_class.cpp b/doc/aspice_swe3_4/example/iceoryx_component/test/moduletests/test_example_base_class.cpp
@@ -23,7 +23,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 
 /// @req IOX_SWRS_112, IOX_SWRS_200
 /// @brief Test goal: "This test suite verifies that the BaseClass function is verified"

diff --git a/iceoryx_binding_c/test/moduletests/main.cpp b/iceoryx_binding_c/test/moduletests/main.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) 2019 by Robert Bosch GmbH. All rights reserved.
+// Copyright (c) 2021 by Apex.AI inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +19,6 @@
 
 using namespace ::testing;
 using ::testing::_;
-using ::testing::Return;
 
 int main(int argc, char* argv[])
 {

diff --git a/iceoryx_dds/test/moduletests/main.cpp b/iceoryx_dds/test/moduletests/main.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) 2019 by Robert Bosch GmbH. All rights reserved.
+// Copyright (c) 2021 by Apex.AI inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +19,6 @@
 
 using namespace ::testing;
 using ::testing::_;
-using ::testing::Return;
 
 int main(int argc, char* argv[])
 {

diff --git a/iceoryx_dds/test/moduletests/test_iox_to_dds.cpp b/iceoryx_dds/test/moduletests/test_iox_to_dds.cpp
@@ -35,7 +35,6 @@
 using namespace ::testing;
 using ::testing::_;
 using ::testing::InSequence;
-using ::testing::Return;
 using ::testing::SetArgPointee;
 
 // ======================================== Helpers ======================================== //

diff --git a/iceoryx_posh/test/integrationtests/test_interface_port_stack_blowup.cpp b/iceoryx_posh/test/integrationtests/test_interface_port_stack_blowup.cpp
@@ -25,7 +25,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 
 using namespace iox::gw;
 

diff --git a/iceoryx_posh/test/integrationtests/test_popo_chunk_building_blocks.cpp b/iceoryx_posh/test/integrationtests/test_popo_chunk_building_blocks.cpp
@@ -36,7 +36,6 @@ using namespace iox::popo;
 using namespace iox::cxx;
 using namespace iox::mepoo;
 using namespace iox::posix;
-using ::testing::Return;
 
 struct DummySample
 {

diff --git a/iceoryx_posh/test/integrationtests/test_popo_port_user_building_blocks.cpp b/iceoryx_posh/test/integrationtests/test_popo_port_user_building_blocks.cpp
@@ -40,7 +40,6 @@ using namespace iox::capro;
 using namespace iox::cxx;
 using namespace iox::mepoo;
 using namespace iox::posix;
-using ::testing::Return;
 
 struct DummySample
 {

diff --git a/iceoryx_posh/test/integrationtests/test_popo_pub_sub_listener.cpp b/iceoryx_posh/test/integrationtests/test_popo_pub_sub_listener.cpp
@@ -25,7 +25,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 
 using namespace iox::popo;
 using namespace iox::capro;

diff --git a/iceoryx_posh/test/integrationtests/test_posh_integration.cpp b/iceoryx_posh/test/integrationtests/test_posh_integration.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) 2019 by Robert Bosch GmbH. All rights reserved.
+// Copyright (c) 2021 by Apex.AI inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,7 +21,6 @@
 
 using namespace ::testing;
 using ::testing::_;
-using ::testing::Return;
 
 int main(int argc, char* argv[])
 {

diff --git a/iceoryx_posh/test/integrationtests/test_posh_mepoo.cpp b/iceoryx_posh/test/integrationtests/test_posh_mepoo.cpp
@@ -46,7 +46,6 @@ using namespace ::testing;
 using namespace iox::units::duration_literals;
 using iox::mepoo::MePooConfig;
 using iox::roudi::RouDiEnvironment;
-using ::testing::Return;
 
 using iox::posix::Timer;
 

diff --git a/iceoryx_posh/test/integrationtests/test_publisher_subscriber_communication.cpp b/iceoryx_posh/test/integrationtests/test_publisher_subscriber_communication.cpp
@@ -33,7 +33,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 
 using namespace iox;
 using namespace iox::popo;

diff --git a/iceoryx_posh/test/integrationtests/test_roudi_roudi_environment.cpp b/iceoryx_posh/test/integrationtests/test_roudi_roudi_environment.cpp
@@ -23,7 +23,6 @@ namespace
 {
 using namespace ::testing;
 using namespace iox::roudi;
-using ::testing::Return;
 
 class RouDiEnvironment_test : public Test
 {

diff --git a/iceoryx_posh/test/moduletests/test_capro_service.cpp b/iceoryx_posh/test/moduletests/test_capro_service.cpp
@@ -26,7 +26,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 
 using namespace iox::capro;
 

diff --git a/iceoryx_posh/test/moduletests/test_fixed_size_container.cpp b/iceoryx_posh/test/moduletests/test_fixed_size_container.cpp
@@ -23,7 +23,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 
 using namespace iox::roudi;
 

diff --git a/iceoryx_posh/test/moduletests/test_gw_gateway_discovery.cpp b/iceoryx_posh/test/moduletests/test_gw_gateway_discovery.cpp
@@ -23,7 +23,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 
 using CaproMessage = iox::capro::CaproMessage;
 using BasePort = iox::popo::BasePort;

diff --git a/iceoryx_posh/test/moduletests/test_popo_chunk_distributor.cpp b/iceoryx_posh/test/moduletests/test_popo_chunk_distributor.cpp
@@ -31,7 +31,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 using namespace iox::popo;
 using namespace iox::cxx;
 using namespace iox::mepoo;

diff --git a/iceoryx_posh/test/moduletests/test_popo_chunk_queue.cpp b/iceoryx_posh/test/moduletests/test_popo_chunk_queue.cpp
@@ -31,7 +31,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 
 using namespace iox::popo;
 using namespace iox::mepoo;

diff --git a/iceoryx_posh/test/moduletests/test_popo_condition_variable.cpp b/iceoryx_posh/test/moduletests/test_popo_condition_variable.cpp
@@ -30,7 +30,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 using namespace iox::popo;
 using namespace iox::cxx;
 using namespace iox::units::duration_literals;

diff --git a/iceoryx_posh/test/moduletests/test_popo_listener.cpp b/iceoryx_posh/test/moduletests/test_popo_listener.cpp
@@ -35,7 +35,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 using namespace iox::popo;
 using namespace iox::cxx;
 using namespace iox::units::duration_literals;

diff --git a/iceoryx_posh/test/moduletests/test_popo_waitset.cpp b/iceoryx_posh/test/moduletests/test_popo_waitset.cpp
@@ -32,7 +32,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 using namespace iox::popo;
 using namespace iox::cxx;
 using namespace iox::units::duration_literals;

diff --git a/iceoryx_posh/test/moduletests/test_posh_modules.cpp b/iceoryx_posh/test/moduletests/test_posh_modules.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) 2019 by Robert Bosch GmbH. All rights reserved.
+// Copyright (c) 2021 by Apex.AI inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +19,6 @@
 
 using namespace ::testing;
 using ::testing::_;
-using ::testing::Return;
 
 
 int main(int argc, char* argv[])

diff --git a/iceoryx_posh/test/moduletests/test_roudi_cmd_line_parser.cpp b/iceoryx_posh/test/moduletests/test_roudi_cmd_line_parser.cpp
@@ -21,7 +21,6 @@
 #include "iceoryx_posh/roudi/roudi_cmd_line_parser.hpp"
 
 using namespace ::testing;
-using ::testing::Return;
 
 using namespace iox::roudi;
 using namespace iox::config;

diff --git a/iceoryx_posh/test/moduletests/test_roudi_cmd_line_parser_config_file_option.cpp b/iceoryx_posh/test/moduletests/test_roudi_cmd_line_parser_config_file_option.cpp
@@ -26,7 +26,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 
 using namespace iox::cxx;
 using namespace iox::config;

diff --git a/iceoryx_posh/test/moduletests/test_roudi_iceoryx_roudi_app.cpp b/iceoryx_posh/test/moduletests/test_roudi_iceoryx_roudi_app.cpp
@@ -28,7 +28,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 
 using iox::roudi::IceOryxRouDiApp;
 using namespace iox::config;

diff --git a/iceoryx_posh/test/moduletests/test_roudi_mempool_introspection.cpp b/iceoryx_posh/test/moduletests/test_roudi_mempool_introspection.cpp
@@ -15,22 +15,19 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#include "iceoryx_posh/testing/mocks/chunk_mock.hpp"
-#include "mocks/mepoo_memory_manager_mock.hpp"
-#include "mocks/publisher_mock.hpp"
-#include "iceoryx_utils/testing/timing_test.hpp"
-#include "iceoryx_posh/internal/roudi/introspection/mempool_introspection.hpp"
 #include "iceoryx_posh/internal/mepoo/segment_manager.hpp"
+#include "iceoryx_posh/internal/roudi/introspection/mempool_introspection.hpp"
 #include "iceoryx_posh/roudi/introspection_types.hpp"
+#include "iceoryx_posh/testing/mocks/chunk_mock.hpp"
 #include "iceoryx_utils/cxx/vector.hpp"
+#include "iceoryx_utils/testing/timing_test.hpp"
+#include "mocks/mepoo_memory_manager_mock.hpp"
+#include "mocks/publisher_mock.hpp"
 
 #include "test.hpp"
 
 namespace
 {
-using ::testing::Return;
-using namespace ::testing;
-
 class CallChecker
 {
   public:

diff --git a/iceoryx_posh/test/moduletests/test_roudi_port_introspection.cpp b/iceoryx_posh/test/moduletests/test_roudi_port_introspection.cpp
@@ -28,7 +28,6 @@
 
 namespace
 {
-using ::testing::Return;
 using namespace ::testing;
 
 template <typename PublisherPort, typename SubscriberPort>

diff --git a/iceoryx_posh/test/moduletests/test_roudi_portmanager.cpp b/iceoryx_posh/test/moduletests/test_roudi_portmanager.cpp
@@ -34,7 +34,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 
 using iox::popo::PublisherOptions;
 using iox::popo::PublisherPortUser;

diff --git a/iceoryx_posh/test/moduletests/test_roudi_portpool.cpp b/iceoryx_posh/test/moduletests/test_roudi_portpool.cpp
@@ -24,7 +24,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 using namespace iox::capro;
 using namespace iox;
 

diff --git a/iceoryx_posh/test/moduletests/test_roudi_process.cpp b/iceoryx_posh/test/moduletests/test_roudi_process.cpp
@@ -31,7 +31,6 @@ using namespace iox::roudi;
 using namespace iox::popo;
 using namespace iox::runtime;
 using namespace iox::posix;
-using ::testing::Return;
 
 class IpcInterfaceUser_Mock : public iox::roudi::Process
 {

diff --git a/iceoryx_posh/test/moduletests/test_roudi_process_introspection.cpp b/iceoryx_posh/test/moduletests/test_roudi_process_introspection.cpp
@@ -25,7 +25,6 @@
 
 namespace
 {
-using ::testing::Return;
 using namespace ::testing;
 
 class ProcessIntrospectionAccess : public iox::roudi::ProcessIntrospection<MockPublisherPortUser>

diff --git a/iceoryx_posh/test/moduletests/test_roudi_process_manager.cpp b/iceoryx_posh/test/moduletests/test_roudi_process_manager.cpp
@@ -34,7 +34,6 @@ using namespace iox::popo;
 using namespace iox::runtime;
 using namespace iox::posix;
 using namespace iox::version;
-using ::testing::Return;
 
 class ProcessManager_test : public Test
 {

diff --git a/iceoryx_posh/test/moduletests/test_roudi_service_registry.cpp b/iceoryx_posh/test/moduletests/test_roudi_service_registry.cpp
@@ -23,7 +23,6 @@
 namespace
 {
 using namespace ::testing;
-using ::testing::Return;
 
 class ServiceRegistry_test : public Test
 {

diff --git a/iceoryx_posh/testing/include/iceoryx_posh/testing/roudi_gtest.hpp b/iceoryx_posh/testing/include/iceoryx_posh/testing/roudi_gtest.hpp
@@ -23,7 +23,6 @@
 #include <gtest/gtest.h>
 
 using namespace ::testing;
-using ::testing::Return;
 
 class RouDi_GTest : public iox::roudi::RouDiEnvironment, public Test
 {

diff --git a/iceoryx_utils/test/integrationtests/test_utils_integration.cpp b/iceoryx_utils/test/integrationtests/test_utils_integration.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) 2019 by Robert Bosch GmbH. All rights reserved.
+// Copyright (c) 2021 by Apex.AI inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +19,6 @@
 
 using namespace ::testing;
 using ::testing::_;
-using ::testing::Return;
 
 int main(int argc, char* argv[])
 {

diff --git a/iceoryx_utils/test/moduletests/test_utils_modules.cpp b/iceoryx_utils/test/moduletests/test_utils_modules.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) 2019 by Robert Bosch GmbH. All rights reserved.
+// Copyright (c) 2021 by Apex.AI inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +19,6 @@
 
 using namespace ::testing;
 using ::testing::_;
-using ::testing::Return;
 
 // global argc and argv needed by the argv_inspection test
 int g_argc;

diff --git a/iceoryx_utils/testing/include/iceoryx_utils/testing/mocks/time_mock.hpp b/iceoryx_utils/testing/include/iceoryx_utils/testing/mocks/time_mock.hpp
@@ -23,7 +23,6 @@
 #include <time.h>
 
 using namespace ::testing;
-using ::testing::Return;
 
 class time_MOCK
 {