From de1983807d3e01b0f86b48c70c426837a950a23f Mon Sep 17 00:00:00 2001 From: Kristian Flikka Date: Tue, 18 Jun 2013 13:47:07 +0200 Subject: [PATCH] Added single parser test to test raw to deck parsing of int --- .../eclipse/Parser/tests/ParserTests.cpp | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/opm/parser/eclipse/Parser/tests/ParserTests.cpp b/opm/parser/eclipse/Parser/tests/ParserTests.cpp index 76f4445ee..c726ea45d 100644 --- a/opm/parser/eclipse/Parser/tests/ParserTests.cpp +++ b/opm/parser/eclipse/Parser/tests/ParserTests.cpp @@ -29,6 +29,8 @@ #include #include +#include "opm/parser/eclipse/Parser/ParserIntItem.hpp" + using namespace Opm; BOOST_AUTO_TEST_CASE(Initializing) { @@ -37,12 +39,11 @@ BOOST_AUTO_TEST_CASE(Initializing) { BOOST_CHECK_NO_THROW(ParserConstPtr parserConstPtr(new Parser())); } -BOOST_AUTO_TEST_CASE(ParserAddKW) { +BOOST_AUTO_TEST_CASE(addKW_keyword_doesntfail) { Parser parser; { ParserRecordSizePtr recordSize(new ParserRecordSize(9)); ParserKWPtr equilKW(new ParserKW("EQUIL", recordSize)); - parser.addKW(equilKW); } } @@ -53,6 +54,32 @@ BOOST_AUTO_TEST_CASE(hasKeyword_hasKeyword_returnstrue) { BOOST_CHECK(parser->hasKeyword("FJAS")); } +BOOST_AUTO_TEST_CASE(parseFromRawDeck_singleRawIntItem_deckReturned) { + ParserPtr parser(new Parser()); + + ParserKWPtr parserKw(new ParserKW("RANDOM")); + ParserRecordPtr parserRecord(new ParserRecord()); + ParserItemPtr intItem(new ParserIntItem("ETTALL", SINGLE)); + parserRecord->addItem(intItem); + parserKw->setRecord(parserRecord); + + parser->addKW(parserKw); + + RawParserKWsConstPtr rawParserKWs(new RawParserKWs()); + RawDeckPtr rawDeck(new RawDeck(rawParserKWs)); + RawKeywordPtr rawKeyword(new RawKeyword("RANDOM")); + rawKeyword->addRawRecordString("1"); + + rawDeck->addKeyword(rawKeyword); + + DeckPtr deck = parser->parseFromRawDeck(rawDeck); + + BOOST_CHECK(deck->hasKeyword("RANDOM")); + BOOST_CHECK(!deck->hasKeyword("ANDOM")); +} + + +