iox-#1613 Use IOX_EXPECT_FATAL_FAILURE in some iceoryx_posh tests

Author: elBoberido

iceoryx_posh/test/moduletests/test_capro_service.cpp

@@ -19,6 +19,8 @@
 
 #include "iceoryx_dust/cxx/convert.hpp"
 #include "iceoryx_dust/cxx/serialization.hpp"
+#include "iceoryx_hoofs/error_handling/error_handling.hpp"
+#include "iceoryx_hoofs/testing/fatal_failure.hpp"
 #include "iceoryx_hoofs/testing/mocks/logger_mock.hpp"
 #include "iceoryx_posh/capro/service_description.hpp"
 #include "iox/string.hpp"
@@ -30,6 +32,7 @@
 namespace
 {
 using namespace ::testing;
+using namespace iox::testing;
 
 using namespace iox::capro;
 
@@ -129,7 +132,8 @@ TEST_F(ServiceDescription_test, ClassHashSubsriptOperatorOutOfBoundsFails)
     testHash[2] = 3U;
     testHash[3] = 4U;
 
-    EXPECT_DEATH({ testHash[4] = 5U; }, ".*");
+
+    IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { testHash[4] = 5U; }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
 }
 
 /// END CLASSHASH TESTS

iceoryx_posh/test/moduletests/test_mepoo_chunk_header.cpp

@@ -17,6 +17,8 @@
 
 #include "iceoryx_dust/cxx/convert.hpp"
 #include "iceoryx_hoofs/cxx/type_traits.hpp"
+#include "iceoryx_hoofs/error_handling/error_handling.hpp"
+#include "iceoryx_hoofs/testing/fatal_failure.hpp"
 #include "iceoryx_posh/internal/mepoo/mem_pool.hpp"
 #include "iceoryx_posh/internal/mepoo/memory_manager.hpp"
 #include "iceoryx_posh/mepoo/chunk_header.hpp"
@@ -30,6 +32,7 @@ namespace
 {
 using namespace ::testing;
 using namespace iox::mepoo;
+using namespace iox::testing;
 
 using UserPayloadOffset_t = ChunkHeader::UserPayloadOffset_t;
 
@@ -367,7 +370,12 @@ TEST(ChunkHeader_test, ConstructorTerminatesWhenUserPayloadSizeExceedsChunkSize)
     ASSERT_FALSE(chunkSettingsResult.has_error());
     auto& chunkSettings = chunkSettingsResult.value();
 
-    EXPECT_DEATH({ ChunkHeader sut(CHUNK_SIZE, chunkSettings); }, ".*");
+    IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>(
+        [&] {
+            ChunkHeader sut(CHUNK_SIZE, chunkSettings);
+            ;
+        },
+        iox::HoofsError::EXPECTS_ENSURES_FAILED);
 }
 
 // BEGIN PARAMETERIZED TESTS FOR CHUNK HEADER

iceoryx_posh/test/moduletests/test_mepoo_config.cpp

@@ -14,11 +14,14 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
+#include "iceoryx_hoofs/testing/fatal_failure.hpp"
+#include "iceoryx_posh/error_handling/error_handling.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/mepoo/mepoo_config.hpp"
 #include "test.hpp"
 
 using namespace ::testing;
+using namespace iox::testing;
 
 using namespace iox::mepoo;
 
@@ -58,7 +61,11 @@ TEST_F(MePooConfig_Test, AddingMempoolWhenTheMemPoolConfigContainerIsFullReturns
     {
         sut.addMemPool({SIZE, CHUNK_COUNT});
     }
-    EXPECT_DEATH({ sut.addMemPool({SIZE, CHUNK_COUNT}); }, ".*");
+    IOX_EXPECT_FATAL_FAILURE<iox::PoshError>(
+        [&] {
+            sut.addMemPool({SIZE, CHUNK_COUNT});
+        },
+        iox::PoshError::MEPOO__MAXIMUM_NUMBER_OF_MEMPOOLS_REACHED);
 }
 
 TEST_F(MePooConfig_Test, SetDefaultMethodAddsTheDefaultMemPoolConfigurationToTheMemPoolConfigContainer)

iceoryx_posh/test/moduletests/test_popo_chunk_distributor.cpp

@@ -16,7 +16,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "iceoryx_hoofs/cxx/variant_queue.hpp"
+#include "iceoryx_hoofs/error_handling/error_handling.hpp"
 #include "iceoryx_hoofs/testing/barrier.hpp"
+#include "iceoryx_hoofs/testing/fatal_failure.hpp"
 #include "iceoryx_hoofs/testing/watch_dog.hpp"
 #include "iceoryx_posh/internal/mepoo/shared_chunk.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/chunk_distributor.hpp"
@@ -33,6 +35,7 @@
 namespace
 {
 using namespace ::testing;
+using namespace iox::testing;
 using namespace iox::popo;
 using namespace iox::cxx;
 using namespace iox::mepoo;
@@ -126,17 +129,16 @@ constexpr std::chrono::milliseconds ChunkDistributor_test<PolicyType>::BLOCKING_
 template <typename PolicyType>
 constexpr iox::units::Duration ChunkDistributor_test<PolicyType>::DEADLOCK_TIMEOUT;
 
-/// @todo iox-#898: this is broken on macOS and triggers the watchdog, even with 5 seconds timeout
-#if !defined(__APPLE__)
 TYPED_TEST(ChunkDistributor_test, AddingNullptrQueueDoesNotWork)
 {
     ::testing::Test::RecordProperty("TEST_ID", "aa7eaa9e-c337-45dc-945a-d097b8916eaa");
     auto sutData = this->getChunkDistributorData();
     typename TestFixture::ChunkDistributor_t sut(sutData.get());
 
-    EXPECT_DEATH(IOX_DISCARD_RESULT(sut.tryAddQueue(nullptr)), ".*");
+
+    IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { sut.tryAddQueue(nullptr); },
+                                              iox::HoofsError::EXPECTS_ENSURES_FAILED);
 }
-#endif
 
 TYPED_TEST(ChunkDistributor_test, NewChunkDistributorHasNoQueues)
 {