Skip to content

Commit 7942d4b

Browse files
committed
#13959 RigSimulationInputTool-Test: Check transformKeywordsInDeckFile return value
Wrap the discarded calls to the [[nodiscard]] std::expected-returning transformKeywordsInDeckFile in EXPECT_TRUE(...has_value()) to silence C4834 and assert that the transformation succeeded.
1 parent 498c6be commit 7942d4b

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

ApplicationLibCode/UnitTests/RigSimulationInputTool-Test.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1906,7 +1906,7 @@ TEST( RigSimulationInputTool, ExpandBoxContext_EqualsInheritsBoxIndices )
19061906
settings.setMax( caf::VecIjk0( 9, 9, 4 ) );
19071907
setSettingsRefinement( settings, cvf::Vec3st( 1, 1, 1 ) );
19081908

1909-
RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile );
1909+
EXPECT_TRUE( RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile ).has_value() );
19101910

19111911
// Verify EQUALS now has explicit box indices matching the BOX keyword
19121912
auto equalsAfterVec = deckFile.findAllKeywordsWithIndices( "EQUALS" );
@@ -1956,7 +1956,7 @@ TEST( RigSimulationInputTool, ExpandBoxContext_ExplicitIndicesPreserved )
19561956
settings.setMax( caf::VecIjk0( 9, 9, 4 ) );
19571957
setSettingsRefinement( settings, cvf::Vec3st( 1, 1, 1 ) );
19581958

1959-
RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile );
1959+
EXPECT_TRUE( RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile ).has_value() );
19601960

19611961
auto equalsVec = deckFile.findAllKeywordsWithIndices( "EQUALS" );
19621962
ASSERT_EQ( 1u, equalsVec.size() );
@@ -2003,7 +2003,7 @@ TEST( RigSimulationInputTool, ExpandBoxContext_OutsideBoxNotModified )
20032003
settings.setMax( caf::VecIjk0( 9, 9, 4 ) );
20042004
setSettingsRefinement( settings, cvf::Vec3st( 1, 1, 1 ) );
20052005

2006-
RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile );
2006+
EXPECT_TRUE( RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile ).has_value() );
20072007

20082008
auto equalsVec = deckFile.findAllKeywordsWithIndices( "EQUALS" );
20092009
ASSERT_EQ( 1u, equalsVec.size() );
@@ -2059,7 +2059,7 @@ TEST( RigSimulationInputTool, CropDataKeywordsInsideBoxContext )
20592059
settings.setMax( caf::VecIjk0( 7, 7, 4 ) );
20602060
setSettingsRefinement( settings, cvf::Vec3st( 1, 1, 1 ) );
20612061

2062-
RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile );
2062+
EXPECT_TRUE( RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile ).has_value() );
20632063

20642064
// After cropping: should still find two EQLNUM keywords
20652065
auto eqlnumAfter = deckFile.findAllKeywordsWithIndices( "EQLNUM" );
@@ -2120,7 +2120,7 @@ TEST( RigSimulationInputTool, CropDataKeywordsInsideBoxContext_NoIntersection )
21202120
settings.setMax( caf::VecIjk0( 7, 7, 2 ) );
21212121
setSettingsRefinement( settings, cvf::Vec3st( 1, 1, 1 ) );
21222122

2123-
RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile );
2123+
EXPECT_TRUE( RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile ).has_value() );
21242124

21252125
// Boxed EQLNUM should be removed since box doesn't intersect sector
21262126
auto eqlnumAfter = deckFile.findAllKeywordsWithIndices( "EQLNUM" );
@@ -2419,7 +2419,7 @@ TEST( RigSimulationInputTool, MultiplyInsideBoxContext_NoIntersection )
24192419
settings.setMax( caf::VecIjk0( 7, 7, 2 ) );
24202420
setSettingsRefinement( settings, cvf::Vec3st( 1, 1, 1 ) );
24212421

2422-
RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile );
2422+
EXPECT_TRUE( RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile ).has_value() );
24232423

24242424
// MULTIPLY record with box K=5 (0-based K=4) outside sector K[0-2] should be removed
24252425
auto multiplyAll = deckFile.findAllKeywordsWithIndices( "MULTIPLY" );
@@ -2464,7 +2464,7 @@ TEST( RigSimulationInputTool, MultiplyInsideBoxContext_WithIntersection )
24642464
settings.setMax( caf::VecIjk0( 7, 7, 4 ) );
24652465
setSettingsRefinement( settings, cvf::Vec3st( 1, 1, 1 ) );
24662466

2467-
RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile );
2467+
EXPECT_TRUE( RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile ).has_value() );
24682468

24692469
auto multiplyAll = deckFile.findAllKeywordsWithIndices( "MULTIPLY" );
24702470
ASSERT_EQ( 1u, multiplyAll.size() );
@@ -2520,7 +2520,7 @@ TEST( RigSimulationInputTool, AddInsideBoxContext_WithIntersection )
25202520
settings.setMax( caf::VecIjk0( 7, 7, 4 ) );
25212521
setSettingsRefinement( settings, cvf::Vec3st( 1, 1, 1 ) );
25222522

2523-
RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile );
2523+
EXPECT_TRUE( RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile ).has_value() );
25242524

25252525
auto addAll = deckFile.findAllKeywordsWithIndices( "ADD" );
25262526
ASSERT_EQ( 1u, addAll.size() );
@@ -2577,7 +2577,7 @@ TEST( RigSimulationInputTool, AddInsideBoxContext_NoIntersection )
25772577
settings.setMax( caf::VecIjk0( 7, 7, 2 ) );
25782578
setSettingsRefinement( settings, cvf::Vec3st( 1, 1, 1 ) );
25792579

2580-
RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile );
2580+
EXPECT_TRUE( RigSimulationInputTool::transformKeywordsInDeckFile( nullptr, settings, deckFile ).has_value() );
25812581

25822582
// ADD record with box K=5 (0-based K=4) outside sector K[0-2] should be removed
25832583
auto addAll = deckFile.findAllKeywordsWithIndices( "ADD" );

0 commit comments

Comments
 (0)