iox-#590 Move ErrorHandlerMock to mock directory

Signed-off-by: Simon Hoinkis <[email protected]>
eclipse-iceoryx · Feb 8, 2022 · 69d9448 · 69d9448
1 parent 1d21571
commit 69d9448
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/iceoryx_binding_c/test/test.hpp b/iceoryx_binding_c/test/test.hpp
@@ -17,7 +17,7 @@
 #ifndef IOX_DDS_GATEWAY_TEST_TEST_HPP
 #define IOX_DDS_GATEWAY_TEST_TEST_HPP
 
-#include "iceoryx_hoofs/testing/error_handler_mock.hpp"
+#include "iceoryx_hoofs/testing/mocks/error_handler_mock.hpp"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>

diff --git a/iceoryx_hoofs/test/moduletests/test_cxx_functional_interface_expect.cpp b/iceoryx_hoofs/test/moduletests/test_cxx_functional_interface_expect.cpp
@@ -15,7 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 #include "iceoryx_hoofs/error_handling/error_handling.hpp"
-#include "iceoryx_hoofs/testing/error_handler_mock.hpp"
+#include "iceoryx_hoofs/testing/mocks/error_handler_mock.hpp"
 
 #include "test_cxx_functional_interface_types.hpp"
 

diff --git a/iceoryx_hoofs/testing/error_handler_mock.cpp b/iceoryx_hoofs/testing/error_handler_mock.cpp
@@ -14,7 +14,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#include "iceoryx_hoofs/testing/error_handler_mock.hpp"
+#include "iceoryx_hoofs/testing/mocks/error_handler_mock.hpp"
 
 namespace iox
 {

diff --git a/...oryx_hoofs/testing/error_handler_mock.hpp → ...oofs/testing/mocks/error_handler_mock.hpp b/...oryx_hoofs/testing/error_handler_mock.hpp → ...oofs/testing/mocks/error_handler_mock.hpp
@@ -41,8 +41,7 @@ template <typename Error>
 cxx::optional<iox::TypedHandlerFunction<Error>> typedHandler;
 
 template <typename ErrorEnumType>
-inline void
-errorHandlerForTest(const uint32_t error, const char* errorName IOX_MAYBE_UNUSED, const ErrorLevel level) noexcept
+inline void errorHandlerForTest(const uint32_t error, const char* errorName, const ErrorLevel level) noexcept
 {
     uint32_t errorEnumType = error >> 16;
     uint32_t expectedErrorEnumType =

diff --git a/iceoryx_posh/test/test.hpp b/iceoryx_posh/test/test.hpp
@@ -16,7 +16,7 @@
 #ifndef IOX_POSH_TEST_TEST_HPP
 #define IOX_POSH_TEST_TEST_HPP
 
-#include "iceoryx_hoofs/testing/error_handler_mock.hpp"
+#include "iceoryx_hoofs/testing/mocks/error_handler_mock.hpp"
 
 #include <fstream>
 #include <gmock/gmock.h>

diff --git a/iceoryx_posh/testing/roudi_environment/roudi_environment.cpp b/iceoryx_posh/testing/roudi_environment/roudi_environment.cpp
@@ -19,7 +19,7 @@
 #include "iceoryx_hoofs/cxx/helplets.hpp"
 #include "iceoryx_hoofs/internal/posix_wrapper/shared_memory_object/memory_map.hpp"
 #include "iceoryx_hoofs/log/logmanager.hpp"
-#include "iceoryx_hoofs/testing/error_handler_mock.hpp"
+#include "iceoryx_hoofs/testing/mocks/error_handler_mock.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/unique_port_id.hpp"
 #include "iceoryx_posh/internal/roudi/roudi.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"