Skip to content

Commit f5c0737

Browse files
elBoberidoelBoberido
committed
iox-#1613 Add IOX prefix to EXPECT_FATAL_FAILURE and remove superfluous parameter
1 parent 4ad994a commit f5c0737

File tree

7 files changed

+66
-98
lines changed

7 files changed

+66
-98
lines changed

‎iceoryx_hoofs/test/moduletests/test_concurrent_loffli.cpp‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ TYPED_TEST(LoFFLi_test, Misuse_NullptrMemory)
5959

6060
decltype(this->m_loffli) loFFLi;
6161

62-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
63-
[&] { loFFLi.init(nullptr, 1); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
62+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { loFFLi.init(nullptr, 1); },
63+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
6464
}
6565

6666
TYPED_TEST(LoFFLi_test, Misuse_ZeroSize)
@@ -71,8 +71,8 @@ TYPED_TEST(LoFFLi_test, Misuse_ZeroSize)
7171
uint32_t memoryLoFFLi[4];
7272
decltype(this->m_loffli) loFFLi;
7373

74-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
75-
[&] { loFFLi.init(&memoryLoFFLi[0], 0); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
74+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { loFFLi.init(&memoryLoFFLi[0], 0); },
75+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
7676
// NOLINTEND(hicpp-avoid-c-arrays, cppcoreguidelines-avoid-c-arrays)
7777
}
7878

@@ -84,9 +84,8 @@ TYPED_TEST(LoFFLi_test, Misuse_SizeToLarge)
8484
uint32_t memoryLoFFLi[4];
8585
decltype(this->m_loffli) loFFLi;
8686

87-
EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { loFFLi.init(&memoryLoFFLi[0], UINT32_MAX - 1); },
88-
iox::HoofsError::EXPECTS_ENSURES_FAILED,
89-
iox::ErrorLevel::FATAL);
87+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { loFFLi.init(&memoryLoFFLi[0], UINT32_MAX - 1); },
88+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
9089
// NOLINTEND(hicpp-avoid-c-arrays, cppcoreguidelines-avoid-c-arrays)
9190
}
9291

‎iceoryx_hoofs/test/moduletests/test_cxx_function_ref.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ TEST_F(function_refDeathTest, CallMovedFromLeadsToTermination)
171171

172172
// NOLINTJUSTIFICATION Use after move is tested here
173173
// NOLINTBEGIN(bugprone-use-after-move, hicpp-invalid-access-moved)
174-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
175-
[&] { sut1(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
174+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { sut1(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
176175
// NOLINTEND(bugprone-use-after-move, hicpp-invalid-access-moved)
177176
}
178177

‎iceoryx_hoofs/test/moduletests/test_cxx_list.cpp‎

Lines changed: 29 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ TEST_F(list_test, FullWhenFilledWithMoreThanCapacityElements)
267267
{
268268
::testing::Test::RecordProperty("TEST_ID", "585bb3d9-112c-4db8-af5e-e4c646723515");
269269

270-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
270+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>(
271271
[&] {
272272
for (uint64_t i = 0U; i < sut.capacity(); ++i)
273273
{
@@ -277,8 +277,7 @@ TEST_F(list_test, FullWhenFilledWithMoreThanCapacityElements)
277277
EXPECT_THAT(sut.full(), Eq(true));
278278
sut.emplace_front();
279279
},
280-
iox::HoofsError::EXPECTS_ENSURES_FAILED,
281-
iox::ErrorLevel::FATAL);
280+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
282281
}
283282
TEST_F(list_test, NotFullWhenFilledWithCapacityAndEraseOneElements)
284283
{
@@ -725,8 +724,8 @@ TEST_F(list_test, EmplaceBackWithMoreThanCapacityElements)
725724
}
726725
else
727726
{
728-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
729-
[&] { sut1.emplace_back(cnt); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
727+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { sut1.emplace_back(cnt); },
728+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
730729
}
731730
++cnt;
732731
}
@@ -760,8 +759,8 @@ TEST_F(list_test, EmplaceWithWrongListIterator)
760759
++cnt;
761760
}
762761

763-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
764-
[&] { sut11.emplace(iterOfSut2, cnt); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
762+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { sut11.emplace(iterOfSut2, cnt); },
763+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
765764
}
766765

767766
TEST_F(list_test, PushFrontConstCustomSuccessfullWhenSpaceAvailableLValue)
@@ -1496,44 +1495,38 @@ TEST_F(list_test, IteratorComparisonOfDifferentLists)
14961495
auto iterSut1 = sut11.begin();
14971496
auto iterSut2 = sut12.begin();
14981497

1499-
EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iterSut1 == iterSut2); },
1500-
iox::HoofsError::EXPECTS_ENSURES_FAILED,
1501-
iox::ErrorLevel::FATAL);
1498+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iterSut1 == iterSut2); },
1499+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
15021500

15031501
iterSut1 = sut11.begin();
15041502
iterSut2 = sut12.begin();
15051503

1506-
EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iterSut1 == iterSut2); },
1507-
iox::HoofsError::EXPECTS_ENSURES_FAILED,
1508-
iox::ErrorLevel::FATAL);
1504+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iterSut1 == iterSut2); },
1505+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
15091506

15101507
iterSut1 = sut11.end();
15111508
iterSut2 = sut12.end();
15121509

1513-
EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iterSut1 == iterSut2); },
1514-
iox::HoofsError::EXPECTS_ENSURES_FAILED,
1515-
iox::ErrorLevel::FATAL);
1510+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iterSut1 == iterSut2); },
1511+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
15161512

15171513
iterSut1 = sut11.begin();
15181514
iterSut2 = sut12.begin();
15191515

1520-
EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iterSut1 != iterSut2); },
1521-
iox::HoofsError::EXPECTS_ENSURES_FAILED,
1522-
iox::ErrorLevel::FATAL);
1516+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iterSut1 != iterSut2); },
1517+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
15231518

15241519
iterSut1 = sut11.begin();
15251520
iterSut2 = sut12.begin();
15261521

1527-
EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iterSut1 != iterSut2); },
1528-
iox::HoofsError::EXPECTS_ENSURES_FAILED,
1529-
iox::ErrorLevel::FATAL);
1522+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iterSut1 != iterSut2); },
1523+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
15301524

15311525
iterSut1 = sut11.end();
15321526
iterSut2 = sut12.end();
15331527

1534-
EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iterSut1 != iterSut2); },
1535-
iox::HoofsError::EXPECTS_ENSURES_FAILED,
1536-
iox::ErrorLevel::FATAL);
1528+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iterSut1 != iterSut2); },
1529+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
15371530
}
15381531

15391532

@@ -2316,8 +2309,7 @@ TEST_F(list_test, invalidIteratorErase)
23162309
sut.erase(iter);
23172310

23182311

2319-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
2320-
[&] { sut.erase(iter); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
2312+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { sut.erase(iter); }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
23212313
}
23222314

23232315
TEST_F(list_test, invalidIteratorIncrement)
@@ -2333,8 +2325,7 @@ TEST_F(list_test, invalidIteratorIncrement)
23332325
++iter;
23342326
sut.erase(iter);
23352327

2336-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
2337-
[&] { ++iter; }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
2328+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { ++iter; }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
23382329
}
23392330

23402331
TEST_F(list_test, invalidIteratorDecrement)
@@ -2350,8 +2341,7 @@ TEST_F(list_test, invalidIteratorDecrement)
23502341
++iter;
23512342
sut.erase(iter);
23522343

2353-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
2354-
[&] { --iter; }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
2344+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { --iter; }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
23552345
}
23562346

23572347
TEST_F(list_test, invalidIteratorComparison)
@@ -2368,9 +2358,8 @@ TEST_F(list_test, invalidIteratorComparison)
23682358
auto iter2 IOX_MAYBE_UNUSED = sut.erase(iter);
23692359

23702360

2371-
EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(sut.cbegin() == iter); },
2372-
iox::HoofsError::EXPECTS_ENSURES_FAILED,
2373-
iox::ErrorLevel::FATAL);
2361+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(sut.cbegin() == iter); },
2362+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
23742363
}
23752364

23762365
TEST_F(list_test, invalidIteratorComparisonUnequal)
@@ -2387,8 +2376,8 @@ TEST_F(list_test, invalidIteratorComparisonUnequal)
23872376
auto iter2 = sut.erase(iter);
23882377

23892378

2390-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
2391-
[&] { IOX_DISCARD_RESULT(iter2 != iter); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
2379+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iter2 != iter); },
2380+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
23922381
}
23932382

23942383
TEST_F(list_test, invalidIteratorDereferencing)
@@ -2404,8 +2393,8 @@ TEST_F(list_test, invalidIteratorDereferencing)
24042393
++iter;
24052394
auto iter2 IOX_MAYBE_UNUSED = sut.erase(iter);
24062395

2407-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
2408-
[&] { IOX_DISCARD_RESULT((*iter).m_value); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
2396+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT((*iter).m_value); },
2397+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
24092398
}
24102399

24112400
TEST_F(list_test, invalidIteratorAddressOfOperator)
@@ -2421,10 +2410,8 @@ TEST_F(list_test, invalidIteratorAddressOfOperator)
24212410
++iter;
24222411
auto iter2 IOX_MAYBE_UNUSED = sut.erase(iter);
24232412

2424-
2425-
EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iter->m_value == 12U); },
2426-
iox::HoofsError::EXPECTS_ENSURES_FAILED,
2427-
iox::ErrorLevel::FATAL);
2413+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(iter->m_value == 12U); },
2414+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
24282415
}
24292416

24302417
TEST_F(list_test, ListIsCopyableViaMemcpy)

‎iceoryx_hoofs/test/moduletests/test_design_functional_interface_expect.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ void ExpectDoesCallTerminateWhenObjectIsInvalid(const ExpectCall& callExpect)
8484
{
8585
SutType sut = FactoryType::createInvalidObject();
8686
{
87-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
88-
[&] { callExpect(sut); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
87+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { callExpect(sut); }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
8988
}
9089
}
9190

‎iceoryx_hoofs/test/moduletests/test_vocabulary_expected.cpp‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -589,8 +589,7 @@ TEST_F(expected_test, AccessingErrorOfLValueErrorOnlyExpectedWhichContainsValueL
589589

590590
auto sut = expected<TestError>::create_value();
591591

592-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
593-
[&] { sut.get_error(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
592+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { sut.get_error(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
594593
}
595594

596595
TEST_F(expected_test, AccessingErrorOfConstLValueErrorOnlyExpectedWhichContainsValueLeadsToErrorHandlerCall)
@@ -599,8 +598,7 @@ TEST_F(expected_test, AccessingErrorOfConstLValueErrorOnlyExpectedWhichContainsV
599598

600599
const auto sut = expected<TestError>::create_value();
601600

602-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
603-
[&] { sut.get_error(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
601+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { sut.get_error(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
604602
}
605603

606604
TEST_F(expected_test, AccessingErrorOfRValueErrorOnlyExpectedWhichContainsValueLeadsToErrorHandlerCall)
@@ -609,8 +607,8 @@ TEST_F(expected_test, AccessingErrorOfRValueErrorOnlyExpectedWhichContainsValueL
609607

610608
auto sut = expected<TestError>::create_value();
611609

612-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
613-
[&] { std::move(sut).get_error(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
610+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { std::move(sut).get_error(); },
611+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
614612
}
615613

616614
TEST_F(expected_test, AccessingValueOfLValueExpectedWhichContainsErrorWithArrowOpLeadsToErrorHandlerCall)
@@ -619,8 +617,8 @@ TEST_F(expected_test, AccessingValueOfLValueExpectedWhichContainsErrorWithArrowO
619617

620618
auto sut = expected<TestClass, TestError>::create_error(TestError::ERROR1);
621619

622-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
623-
[&] { IOX_DISCARD_RESULT(sut->m_a); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
620+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(sut->m_a); },
621+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
624622
}
625623

626624
TEST_F(expected_test, AccessingValueOfConstLValueExpectedWhichContainsErrorWithArrowOpLeadsToErrorHandlerCall)
@@ -629,8 +627,8 @@ TEST_F(expected_test, AccessingValueOfConstLValueExpectedWhichContainsErrorWithA
629627

630628
const auto sut = expected<TestClass, TestError>::create_error(TestError::ERROR1);
631629

632-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
633-
[&] { IOX_DISCARD_RESULT(sut->m_a); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
630+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { IOX_DISCARD_RESULT(sut->m_a); },
631+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
634632
}
635633

636634
TEST_F(expected_test, AccessingValueOfLValueExpectedWhichContainsErrorWithDerefOpLeadsToErrorHandlerCall)
@@ -639,8 +637,7 @@ TEST_F(expected_test, AccessingValueOfLValueExpectedWhichContainsErrorWithDerefO
639637

640638
auto sut = expected<TestClass, TestError>::create_error(TestError::ERROR1);
641639

642-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
643-
[&] { *sut; }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
640+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { *sut; }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
644641
}
645642

646643
TEST_F(expected_test, AccessingValueOfConstLValueExpectedWhichContainsErrorWithDerefOpLeadsToErrorHandlerCall)
@@ -649,8 +646,7 @@ TEST_F(expected_test, AccessingValueOfConstLValueExpectedWhichContainsErrorWithD
649646

650647
const auto sut = expected<TestClass, TestError>::create_error(TestError::ERROR1);
651648

652-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
653-
[&] { *sut; }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
649+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { *sut; }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
654650
}
655651

656652
TEST_F(expected_test, AccessingValueOfLValueExpectedWhichContainsErrorLeadsToErrorHandlerCall)
@@ -659,8 +655,7 @@ TEST_F(expected_test, AccessingValueOfLValueExpectedWhichContainsErrorLeadsToErr
659655

660656
auto sut = expected<TestClass, TestError>::create_error(TestError::ERROR1);
661657

662-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
663-
[&] { sut.value(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
658+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { sut.value(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
664659
}
665660

666661
TEST_F(expected_test, AccessingValueOfConstLValueExpectedWhichContainsErrorLeadsToErrorHandlerCall)
@@ -669,8 +664,7 @@ TEST_F(expected_test, AccessingValueOfConstLValueExpectedWhichContainsErrorLeads
669664

670665
const auto sut = expected<TestClass, TestError>::create_error(TestError::ERROR1);
671666

672-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
673-
[&] { sut.value(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
667+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { sut.value(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
674668
}
675669

676670
TEST_F(expected_test, AccessingValueOfRValueExpectedWhichContainsErrorLeadsToErrorHandlerCall)
@@ -679,8 +673,7 @@ TEST_F(expected_test, AccessingValueOfRValueExpectedWhichContainsErrorLeadsToErr
679673

680674
auto sut = expected<TestClass, TestError>::create_error(TestError::ERROR1);
681675

682-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
683-
[&] { std::move(sut).value(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
676+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { std::move(sut).value(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
684677
}
685678

686679
TEST_F(expected_test, AccessingErrorOfLValueExpectedWhichContainsValueLeadsToErrorHandlerCall)
@@ -690,8 +683,7 @@ TEST_F(expected_test, AccessingErrorOfLValueExpectedWhichContainsValueLeadsToErr
690683
constexpr int VALID_VALUE{42};
691684
auto sut = expected<TestClass, TestError>::create_value(VALID_VALUE, VALID_VALUE);
692685

693-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
694-
[&] { sut.get_error(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
686+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { sut.get_error(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
695687
}
696688

697689
TEST_F(expected_test, AccessingErrorOfConstLValueExpectedWhichContainsValueLeadsToErrorHandlerCall)
@@ -701,8 +693,7 @@ TEST_F(expected_test, AccessingErrorOfConstLValueExpectedWhichContainsValueLeads
701693
constexpr int VALID_VALUE{42};
702694
const auto sut = expected<TestClass, TestError>::create_value(VALID_VALUE, VALID_VALUE);
703695

704-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
705-
[&] { sut.get_error(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
696+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { sut.get_error(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED);
706697
}
707698

708699
TEST_F(expected_test, AccessingErrorOfRValueExpectedWhichContainsValueLeadsToErrorHandlerCall)
@@ -712,8 +703,8 @@ TEST_F(expected_test, AccessingErrorOfRValueExpectedWhichContainsValueLeadsToErr
712703
constexpr int VALID_VALUE{42};
713704
auto sut = expected<TestClass, TestError>::create_value(VALID_VALUE, VALID_VALUE);
714705

715-
EXPECT_FATAL_FAILURE<iox::HoofsError>(
716-
[&] { std::move(sut).get_error(); }, iox::HoofsError::EXPECTS_ENSURES_FAILED, iox::ErrorLevel::FATAL);
706+
IOX_EXPECT_FATAL_FAILURE<iox::HoofsError>([&] { std::move(sut).get_error(); },
707+
iox::HoofsError::EXPECTS_ENSURES_FAILED);
717708
}
718709

719710
TEST_F(expected_test, TwoErrorOnlyExpectedWithEqualErrorAreEqual)

0 commit comments

Comments
 (0)