fix some screw-up with internal vs deck names

Parser::hasKeyword() was called with deckNames but looked up the map
for internal names. This patch renames the method to hasDeckName(),
renames Parser::getKeyword() to Parser::getKeywordFromDeckName() and
adapts/extends the tests.
This commit is contained in:
Andreas Lauser
2014-07-01 16:57:07 +02:00
parent e2eca64f59
commit f754bd9c45
7 changed files with 118 additions and 81 deletions

View File

@@ -38,7 +38,7 @@ using namespace Opm;
BOOST_AUTO_TEST_CASE( parse_VFPPROD_OK ) {
ParserPtr parser(new Parser());
boost::filesystem::path file("testdata/integration_tests/VFPPROD/VFPPROD1");
BOOST_CHECK( parser->canParseKeyword("VFPPROD"));
BOOST_CHECK( parser->canParseDeckKeyword("VFPPROD"));
DeckPtr deck = parser->parseFile(file.string());