Merge fixup

This commit is contained in:
Joakim Hove
2015-08-05 20:49:30 +02:00
parent 91bd434963
commit e368a05e00
2 changed files with 4 additions and 2 deletions

View File

@@ -899,9 +899,9 @@ BOOST_AUTO_TEST_CASE(createDeckWithRPTRST) {
BOOST_CHECK_EQUAL(false, ioConfig2->getWriteRestartFile(3));
DeckPtr deck3 = parser.parseString(deckData3) ;
DeckPtr deck3 = parser.parseString(deckData3 , parseMode) ;
IOConfigPtr ioConfig3 = std::make_shared<IOConfig>();
Schedule schedule3(grid , deck3, ioConfig3);
Schedule schedule3(parseMode , grid , deck3, ioConfig3);
BOOST_CHECK_EQUAL(false, ioConfig3->getWriteRestartFile(0));
BOOST_CHECK_EQUAL(false, ioConfig3->getWriteRestartFile(1));

View File

@@ -35,6 +35,7 @@ BOOST_AUTO_TEST_CASE( test_parse ) {
ParseMode parseMode;
parseMode.unknownKeyword = InputError::IGNORE;
parseMode.randomText = InputError::IGNORE;
parseMode.randomSlash = InputError::IGNORE;
parser.addKeyword<ParserKeywords::SPECGRID>();
parser.addKeyword<ParserKeywords::FAULTS>();
@@ -51,6 +52,7 @@ BOOST_AUTO_TEST_CASE( test_state ) {
ParseMode parseMode;
parseMode.unknownKeyword = InputError::IGNORE;
parseMode.randomText = InputError::IGNORE;
parseMode.randomSlash = InputError::IGNORE;
parser.addKeyword<ParserKeywords::SPECGRID>();
parser.addKeyword<ParserKeywords::FAULTS>();