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

Parser: rename and split canParseKeyword to isRecognizedKeyword

Browse Source 
which is more what the method does because the keyword can still
contain an error in its data which would make it non-parseable.

While at it, split the method into a "get keyword name from input
line" and "is a valid keyword name" part. (this will be needed later.)
This commit is contained in:
Andreas Lauser
2014-09-02 17:26:07 +02:00
committed by Joakim Hove
parent 6eb3421f38
commit fbf6008da4
8 changed files with 74 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
opm/parser/eclipse/IntegrationTests/IntegrationTests.cpp
View File

@@ -49,8 +49,8 @@ static ParserPtr createWWCTParser() {
BOOST_AUTO_TEST_CASE(parse_fileWithWWCTKeyword_deckReturned) {
boost::filesystem::path singleKeywordFile("testdata/integration_tests/wwct.data");
ParserPtr parser = createWWCTParser();
BOOST_CHECK( parser->canParseDeckKeyword("WWCT"));
BOOST_CHECK( parser->canParseDeckKeyword("SUMMARY"));
BOOST_CHECK( parser->isRecognizedKeyword("WWCT"));
BOOST_CHECK( parser->isRecognizedKeyword("SUMMARY"));
BOOST_CHECK_NO_THROW(DeckPtr deck = parser->parseFile(singleKeywordFile.string()));
}
@@ -63,8 +63,8 @@ BOOST_AUTO_TEST_CASE(parse_stringWithWWCTKeyword_deckReturned) {
" 'WELL-1' 'WELL-2' / -- Ehne mehne muh\n"
"/\n";
ParserPtr parser = createWWCTParser();
BOOST_CHECK( parser->canParseDeckKeyword("WWCT"));
BOOST_CHECK( parser->canParseDeckKeyword("SUMMARY"));
BOOST_CHECK( parser->isRecognizedKeyword("WWCT"));
BOOST_CHECK( parser->isRecognizedKeyword("SUMMARY"));
BOOST_CHECK_NO_THROW(DeckPtr deck = parser->parseString(wwctString));
}
@@ -79,8 +79,8 @@ BOOST_AUTO_TEST_CASE(parse_streamWithWWCTKeyword_deckReturned) {
std::shared_ptr<std::istream> wwctStream(new std::istringstream(wwctString));
ParserPtr parser = createWWCTParser();
BOOST_CHECK( parser->canParseDeckKeyword("WWCT"));
BOOST_CHECK( parser->canParseDeckKeyword("SUMMARY"));
BOOST_CHECK( parser->isRecognizedKeyword("WWCT"));
BOOST_CHECK( parser->isRecognizedKeyword("SUMMARY"));
BOOST_CHECK_NO_THROW(DeckPtr deck = parser->parseStream(wwctStream));
}
@@ -111,16 +111,16 @@ BOOST_AUTO_TEST_CASE(parser_internal_name_vs_deck_name) {
// internal names cannot appear in the deck if the deck names and/or deck regular
// match expressions are given
BOOST_CHECK(!parser->canParseDeckKeyword("WELL_PROBE"));
BOOST_CHECK(!parser->isRecognizedKeyword("WELL_PROBE"));
// an existing deck name
BOOST_CHECK(parser->canParseDeckKeyword("WWPR"));
BOOST_CHECK(parser->isRecognizedKeyword("WWPR"));
// a non-existing deck name
BOOST_CHECK(!parser->canParseDeckKeyword("WWPRFOO"));
BOOST_CHECK(!parser->isRecognizedKeyword("WWPRFOO"));
// user defined quantity. (regex needs to be used.)
BOOST_CHECK(parser->canParseDeckKeyword("WUFOO"));
BOOST_CHECK(parser->isRecognizedKeyword("WUFOO"));
}
static ParserPtr createBPRParser() {
@@ -202,8 +202,6 @@ BOOST_AUTO_TEST_CASE(parse_fileWithBPRKeyword_dataiscorrect) {
}
/***************** Testing non-recognized keywords ********************/
BOOST_AUTO_TEST_CASE(parse_unknownkeywordWithnonstrictparsing_keywordmarked) {
ParserPtr parser(new Parser());