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

Add overloads without ParseContext and ErrorGuard - update all tests

Browse Source
This commit is contained in:
Joakim Hove
2019-01-03 18:05:19 +01:00
parent bf52e6d123
commit 2cd6fa2f49
75 changed files with 939 additions and 919 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/parser/ADDREGTests.cpp
View File

@@ -29,7 +29,6 @@
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
@@ -55,7 +54,7 @@ static Opm::Deck createDeckInvalidArray() {
"\n";
Opm::Parser parser;
return parser.parseString(deckData, Opm::ParseContext()) ;
return parser.parseString(deckData) ;
}
@@ -73,7 +72,7 @@ static Opm::Deck createDeckInvalidRegion() {
"\n";
Opm::Parser parser;
return parser.parseString(deckData, Opm::ParseContext()) ;
return parser.parseString(deckData) ;
}
@@ -93,7 +92,7 @@ static Opm::Deck createDeckInvalidValue() {
"\n";
Opm::Parser parser;
return parser.parseString(deckData, Opm::ParseContext()) ;
return parser.parseString(deckData) ;
}
@@ -114,7 +113,7 @@ static Opm::Deck createDeckUnInitializedRegion() {
"\n";
Opm::Parser parser;
return parser.parseString(deckData, Opm::ParseContext()) ;
return parser.parseString(deckData) ;
}
@@ -135,7 +134,7 @@ static Opm::Deck createDeckUnInitializedVector() {
"\n";
Opm::Parser parser;
return parser.parseString(deckData, Opm::ParseContext()) ;
return parser.parseString(deckData) ;
}
@@ -175,7 +174,7 @@ static Opm::Deck createValidIntDeck() {
"\n";
Opm::Parser parser;
return parser.parseString(deckData, Opm::ParseContext()) ;
return parser.parseString(deckData) ;
}
@@ -223,7 +222,7 @@ static Opm::Deck createValidPERMXDeck() {
"\n";
Opm::Parser parser;
return parser.parseString(deckData, Opm::ParseContext()) ;
return parser.parseString(deckData) ;
}
@@ -234,31 +233,31 @@ static Opm::Deck createValidPERMXDeck() {
BOOST_AUTO_TEST_CASE(InvalidArrayThrows) {
Opm::Deck deck = createDeckInvalidArray();
BOOST_CHECK_THROW( Opm::EclipseState( deck, Opm::ParseContext()) , std::invalid_argument );
BOOST_CHECK_THROW( new Opm::EclipseState( deck) , std::invalid_argument );
}
BOOST_AUTO_TEST_CASE(InvalidRegionThrows) {
Opm::Deck deck = createDeckInvalidRegion();
BOOST_CHECK_THROW( new Opm::EclipseState( deck, Opm::ParseContext()) , std::invalid_argument );
BOOST_CHECK_THROW( new Opm::EclipseState( deck) , std::invalid_argument );
}
BOOST_AUTO_TEST_CASE(ExpectedIntThrows) {
Opm::Deck deck = createDeckInvalidValue();
BOOST_CHECK_THROW( new Opm::EclipseState( deck, Opm::ParseContext()) , std::invalid_argument );
BOOST_CHECK_THROW( new Opm::EclipseState( deck) , std::invalid_argument );
}
BOOST_AUTO_TEST_CASE(UnInitializedRegionThrows) {
Opm::Deck deck = createDeckUnInitializedRegion();
BOOST_CHECK_THROW( new Opm::EclipseState( deck, Opm::ParseContext()) , std::invalid_argument );
BOOST_CHECK_THROW( new Opm::EclipseState( deck) , std::invalid_argument );
}
BOOST_AUTO_TEST_CASE(UnInitializedVectorThrows) {
Opm::Deck deck = createDeckUnInitializedVector();
BOOST_CHECK_THROW( new Opm::EclipseState( deck, Opm::ParseContext()) , std::invalid_argument );
BOOST_CHECK_THROW( new Opm::EclipseState( deck) , std::invalid_argument );
}