OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Throws exception with nesting, and generalises tests to account for same.

Browse Source
This commit is contained in:
Williham Williham Totland
2020-10-05 11:06:19 +02:00
parent d0c5fa042c
commit c43600337b
8 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp
+1 -4
View File
@@ -1771,10 +1771,7 @@ namespace {
OpmLog::error(opm_error.what());
// Ideally, we'd be doing this, but the ramifications are not clear p.t.
// std::throw_with_nested(opm_error);
// So we're doing this instead
throw;
std::throw_with_nested(opm_error);
}
return true;
tests/parser/GroupTests.cpp
+1 -1
View File
@@ -305,7 +305,7 @@ BOOST_AUTO_TEST_CASE(TESTGuideRateLINCOM) {
/* The 'COMB' target mode is not supported */
BOOST_CHECK_THROW(create_schedule(input), std::logic_error);
BOOST_CHECK_THROW(create_schedule(input), std::exception);
}
BOOST_AUTO_TEST_CASE(TESTGuideRate) {
tests/parser/NetworkTests.cpp
+3 -3
View File
@@ -94,7 +94,7 @@ NODEPROP
/
)";
BOOST_CHECK_THROW( make_schedule(deck_string), std::invalid_argument);
BOOST_CHECK_THROW( make_schedule(deck_string), std::exception);
}
@@ -128,7 +128,7 @@ NODEPROP
/
)";
BOOST_CHECK_THROW( make_schedule(deck_string), std::invalid_argument);
BOOST_CHECK_THROW( make_schedule(deck_string), std::exception);
}
BOOST_AUTO_TEST_CASE(INVALID_VFP_NODE) {
@@ -161,7 +161,7 @@ NODEPROP
/
)";
BOOST_CHECK_THROW( make_schedule(deck_string), std::invalid_argument);
BOOST_CHECK_THROW( make_schedule(deck_string), std::exception);
}
BOOST_AUTO_TEST_CASE(OK) {
tests/parser/ScheduleTests.cpp
+1 -1
View File
@@ -2169,7 +2169,7 @@ BOOST_AUTO_TEST_CASE( complump_less_than_1 ) {
TableManager table ( deck );
FieldPropsManager fp( deck, Phases{true, true, true}, grid, table);
Runspec runspec (deck);
BOOST_CHECK_THROW( Schedule( deck , grid, fp, runspec, python), std::invalid_argument );
BOOST_CHECK_THROW( Schedule( deck , grid, fp, runspec, python), std::exception );
}
BOOST_AUTO_TEST_CASE( complump ) {
tests/parser/UDQTests.cpp
+1 -1
View File
@@ -506,7 +506,7 @@ UDQ
/
)";
BOOST_CHECK_THROW( make_schedule(input), std::invalid_argument);
BOOST_CHECK_THROW( make_schedule(input), std::exception);
}
tests/parser/WLIST.cpp
+5 -5
View File
@@ -205,11 +205,11 @@ BOOST_AUTO_TEST_CASE(WlistInvalid) {
"10 AUG 2007 /\n"
"/\n";
BOOST_CHECK_THROW( createSchedule(wlist_invalid_well), std::invalid_argument);
BOOST_CHECK_THROW( createSchedule(wlist_invalid_well), std::invalid_argument);
BOOST_CHECK_THROW( createSchedule(wlist_invalid_action), std::invalid_argument);
BOOST_CHECK_THROW( createSchedule(wlist_invalid_list1), std::invalid_argument);
BOOST_CHECK_THROW( createSchedule(wlist_invalid_list2), std::invalid_argument);
BOOST_CHECK_THROW( createSchedule(wlist_invalid_well), std::exception);
BOOST_CHECK_THROW( createSchedule(wlist_invalid_well), std::exception);
BOOST_CHECK_THROW( createSchedule(wlist_invalid_action), std::exception);
BOOST_CHECK_THROW( createSchedule(wlist_invalid_list1), std::exception);
BOOST_CHECK_THROW( createSchedule(wlist_invalid_list2), std::exception);
}
BOOST_AUTO_TEST_CASE(Wlist) {
tests/parser/WellSolventTests.cpp
+2 -2
View File
@@ -223,7 +223,7 @@ BOOST_AUTO_TEST_CASE(TestOilInjector) {
TableManager table ( deck );
FieldPropsManager fp(deck, Phases{true, true, true}, grid, table);
Runspec runspec(deck);
BOOST_CHECK_THROW (Schedule(deck , grid , fp, runspec, python), std::invalid_argument);
BOOST_CHECK_THROW (Schedule(deck , grid , fp, runspec, python), std::exception);
}
BOOST_AUTO_TEST_CASE(TestWaterInjector) {
@@ -233,5 +233,5 @@ BOOST_AUTO_TEST_CASE(TestWaterInjector) {
TableManager table ( deck );
FieldPropsManager fp(deck, Phases{true, true, true}, grid, table);
Runspec runspec(deck);
BOOST_CHECK_THROW (Schedule(deck, grid , fp, runspec, python), std::invalid_argument);
BOOST_CHECK_THROW (Schedule(deck, grid , fp, runspec, python), std::exception);
}
tests/parser/integration/ScheduleCreateFromDeck.cpp
+2 -2
View File
@@ -105,7 +105,7 @@ BOOST_AUTO_TEST_CASE(WCONPROD_Missing_DATA) {
FieldPropsManager fp(deck, Phases{true, true, true}, grid, table);
Runspec runspec (deck);
auto python = std::make_shared<Python>();
BOOST_CHECK_THROW( Schedule(deck, grid , fp, runspec, python) , std::invalid_argument );
BOOST_CHECK_THROW( Schedule(deck, grid , fp, runspec, python) , std::exception );
}
@@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE(WellTestRefDepth) {
const auto& well4 = sched.getWellatEnd("W_4");
BOOST_CHECK_EQUAL( well1.getRefDepth() , grid.getCellDepth( 29 , 36 , 0 ));
BOOST_CHECK_EQUAL( well2.getRefDepth() , 100 );
BOOST_CHECK_THROW( well4.getRefDepth() , std::invalid_argument );
BOOST_CHECK_THROW( well4.getRefDepth() , std::exception );
}