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

Added ParseContext::IGNORE_EXTRA_RECORDS

Browse Source 
...

...

...

...

...
This commit is contained in:
Steinar Foss
2018-01-12 15:04:25 +01:00
parent 2b4fa833ea
commit e85162703e
4 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/parser/ParseContextTests.cpp
View File

@@ -28,6 +28,7 @@
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/D.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/E.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/G.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/O.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/R.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/S.hpp>
@@ -85,6 +86,34 @@ BOOST_AUTO_TEST_CASE(TestUnkownKeyword) {
}
BOOST_AUTO_TEST_CASE(Handle_extra_records) {
const char * deck_string =
"EQLDIMS\n"
" 2 100 20 1 1 /\n"
"\n"
"EQUIL\n"
" 2469 382.4 1705.0 0.0 500 0.0 1 1 20 /\n"
" 2469 382.4 1705.0 0.0 500 0.0 1 1 20 /\n"
" 2470 382.4 1705.0 0.0 500 0.0 1 1 20 /\n"
"GRID\n";
ParseContext parseContext;
Parser parser(false);
parser.addKeyword<ParserKeywords::EQLDIMS>();
parser.addKeyword<ParserKeywords::EQUIL>();
parser.addKeyword<ParserKeywords::GRID>();
BOOST_CHECK_THROW( parser.parseString( deck_string , parseContext ) , std::invalid_argument );
parseContext.update(ParseContext::IGNORE_EXTRA_RECORDS , InputError::IGNORE );
parser.parseString( deck_string , parseContext );
BOOST_CHECK( parser.hasKeyword( "GRID" ) );
parseContext.update(ParseContext::IGNORE_EXTRA_RECORDS , InputError::THROW_EXCEPTION );
BOOST_CHECK_THROW( parser.parseString( deck_string , parseContext ) , std::invalid_argument);
}
BOOST_AUTO_TEST_CASE(TestUnkownKeyword_DATA) {
const char * deck_string1 =
"RUNSPEC\n"