From d79745ce4f298264e3445ec5267b638fa690fb09 Mon Sep 17 00:00:00 2001 From: Kristian Flikka Date: Thu, 20 Jun 2013 15:40:45 +0200 Subject: [PATCH] Changed some KEYWORD->Keyword instances, search and replace hickup --- .../IntegrationTests/IntegrationTests.cpp | 4 ++-- opm/parser/eclipse/Parser/Parser.cpp | 2 +- opm/parser/eclipse/Parser/Parser.hpp | 2 +- opm/parser/eclipse/Parser/ParserConst.hpp | 2 +- opm/parser/eclipse/Parser/ParserKeyword.cpp | 2 +- .../eclipse/Parser/tests/ParserTests.cpp | 21 ++++++++++++------- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/opm/parser/eclipse/IntegrationTests/IntegrationTests.cpp b/opm/parser/eclipse/IntegrationTests/IntegrationTests.cpp index da414383d..9a2f9cbdf 100644 --- a/opm/parser/eclipse/IntegrationTests/IntegrationTests.cpp +++ b/opm/parser/eclipse/IntegrationTests/IntegrationTests.cpp @@ -41,7 +41,7 @@ ParserPtr createWWCTParser() { } ParserPtr parser(new Parser()); - parser->addKEYWORD(parserKeyword); + parser->addKeyword(parserKeyword); return parser; } @@ -79,7 +79,7 @@ ParserPtr createBPRParser() { } ParserPtr parser(new Parser()); - parser->addKEYWORD(parserKeyword); + parser->addKeyword(parserKeyword); return parser; } diff --git a/opm/parser/eclipse/Parser/Parser.cpp b/opm/parser/eclipse/Parser/Parser.cpp index 8dad93a8f..874621cef 100644 --- a/opm/parser/eclipse/Parser/Parser.cpp +++ b/opm/parser/eclipse/Parser/Parser.cpp @@ -49,7 +49,7 @@ namespace Opm { return deck; } - void Parser::addKEYWORD(ParserKeywordConstPtr parserKeyword) { + void Parser::addKeyword(ParserKeywordConstPtr parserKeyword) { m_parserKeywords.insert(std::make_pair(parserKeyword->getName(), parserKeyword)); } diff --git a/opm/parser/eclipse/Parser/Parser.hpp b/opm/parser/eclipse/Parser/Parser.hpp index 5b18dc494..59db42306 100644 --- a/opm/parser/eclipse/Parser/Parser.hpp +++ b/opm/parser/eclipse/Parser/Parser.hpp @@ -50,7 +50,7 @@ namespace Opm { RawDeckPtr readToRawDeck(const std::string& path) const; /// Method to add ParserKeyword instances, these holding type and size information about the keywords and their data. - void addKEYWORD(ParserKeywordConstPtr parserKeyword); + void addKeyword(ParserKeywordConstPtr parserKeyword); bool hasKeyword(const std::string& keyword) const; private: diff --git a/opm/parser/eclipse/Parser/ParserConst.hpp b/opm/parser/eclipse/Parser/ParserConst.hpp index 6a77b645c..a4a1d02a7 100644 --- a/opm/parser/eclipse/Parser/ParserConst.hpp +++ b/opm/parser/eclipse/Parser/ParserConst.hpp @@ -23,7 +23,7 @@ namespace Opm { namespace ParserConst { - const unsigned int maxKEYWORDLength = 8; + const unsigned int maxKeywordLength = 8; } } diff --git a/opm/parser/eclipse/Parser/ParserKeyword.cpp b/opm/parser/eclipse/Parser/ParserKeyword.cpp index 2c1c6fdfe..dd8a639e7 100644 --- a/opm/parser/eclipse/Parser/ParserKeyword.cpp +++ b/opm/parser/eclipse/Parser/ParserKeyword.cpp @@ -31,7 +31,7 @@ namespace Opm { } ParserKeyword::ParserKeyword(const std::string& name, ParserRecordSizeConstPtr recordSize) { - if (name.length() > ParserConst::maxKEYWORDLength) + if (name.length() > ParserConst::maxKeywordLength) throw std::invalid_argument("Given keyword name is too long - max 8 characters."); for (unsigned int i = 0; i < name.length(); i++) diff --git a/opm/parser/eclipse/Parser/tests/ParserTests.cpp b/opm/parser/eclipse/Parser/tests/ParserTests.cpp index c2328145c..562abc9e5 100644 --- a/opm/parser/eclipse/Parser/tests/ParserTests.cpp +++ b/opm/parser/eclipse/Parser/tests/ParserTests.cpp @@ -35,27 +35,32 @@ using namespace Opm; +/************************Basic structural tests**********************'*/ + BOOST_AUTO_TEST_CASE(Initializing) { BOOST_CHECK_NO_THROW(Parser parser); BOOST_CHECK_NO_THROW(ParserPtr parserPtr(new Parser())); BOOST_CHECK_NO_THROW(ParserConstPtr parserConstPtr(new Parser())); } -BOOST_AUTO_TEST_CASE(addKEYWORD_keyword_doesntfail) { +BOOST_AUTO_TEST_CASE(addKeyword_keyword_doesntfail) { Parser parser; { ParserRecordSizePtr recordSize(new ParserRecordSize(9)); - ParserKeywordPtr equilKEYWORD(new ParserKeyword("EQUIL", recordSize)); - parser.addKEYWORD(equilKEYWORD); + ParserKeywordPtr equilKeyword(new ParserKeyword("EQUIL", recordSize)); + parser.addKeyword(equilKeyword); } } BOOST_AUTO_TEST_CASE(hasKeyword_hasKeyword_returnstrue) { ParserPtr parser(new Parser()); - parser->addKEYWORD(ParserKeywordConstPtr(new ParserKeyword("FJAS"))); + parser->addKeyword(ParserKeywordConstPtr(new ParserKeyword("FJAS"))); BOOST_CHECK(parser->hasKeyword("FJAS")); } + + + /***************** Simple Int parsing ********************************/ ParserKeywordPtr setupParserKeywordInt(std::string name, int numberOfItems) { @@ -90,7 +95,7 @@ RawDeckPtr setupRawDeckInt(std::string name, int numberOfRecords, int numberOfIt BOOST_AUTO_TEST_CASE(parseFromRawDeck_singleRawSingleIntItem_deckReturned) { ParserPtr parser(new Parser()); - parser->addKEYWORD(setupParserKeywordInt("RANDOM", 1)); + parser->addKeyword(setupParserKeywordInt("RANDOM", 1)); DeckPtr deck = parser->parseFromRawDeck(setupRawDeckInt("RANDOM", 1, 1)); BOOST_CHECK(!deck->hasKeyword("ANDOM")); @@ -101,7 +106,7 @@ BOOST_AUTO_TEST_CASE(parseFromRawDeck_singleRawSingleIntItem_deckReturned) { BOOST_AUTO_TEST_CASE(parseFromRawDeck_singleRawRecordsSeveralIntItem_deckReturned) { ParserPtr parser(new Parser()); - parser->addKEYWORD(setupParserKeywordInt("RANDOM", 50)); + parser->addKeyword(setupParserKeywordInt("RANDOM", 50)); DeckPtr deck = parser->parseFromRawDeck(setupRawDeckInt("RANDOM", 1, 50)); BOOST_CHECK(deck->hasKeyword("RANDOM")); @@ -110,7 +115,7 @@ BOOST_AUTO_TEST_CASE(parseFromRawDeck_singleRawRecordsSeveralIntItem_deckReturne BOOST_AUTO_TEST_CASE(parseFromRawDeck_severalRawRecordsSeveralIntItem_deckReturned) { ParserPtr parser(new Parser()); - parser->addKEYWORD(setupParserKeywordInt("RANDOM", 50)); + parser->addKeyword(setupParserKeywordInt("RANDOM", 50)); DeckPtr deck = parser->parseFromRawDeck(setupRawDeckInt("RANDOM", 10, 50)); BOOST_CHECK(deck->hasKeyword("RANDOM")); @@ -154,7 +159,7 @@ RawDeckPtr setupRawDeckString(std::string name, int numberOfRecords, int numberO BOOST_AUTO_TEST_CASE(parseFromRawDeck_singleRawRecordsSingleStringItem_deckReturned) { ParserPtr parser(new Parser()); - parser->addKEYWORD(setupParserKeywordString("WWCT", 1)); + parser->addKeyword(setupParserKeywordString("WWCT", 1)); DeckPtr deck = parser->parseFromRawDeck(setupRawDeckString("WWCT",1, 1)); BOOST_CHECK(deck->hasKeyword("WWCT"));