6eb3421f38
This allows to arbitrary characters like stars into strings. e.g. MYKEYWORD '123*456' 2*'Hello, World! (*)' / is now a valid record with three strings while it threw an exception before. This patch works by transferring the removal of the quotes from the RawDeck class to the readValueToken<T>() function which now has a specialization for strings that deals with quotes. One small complication is that the RawDeck needs to be adapted in order not to split tokens in the middle of strings. Finally, the StarToken class does not deal with the conversion from string to the value type of the item anymore which allows it to become a normal class instead of a template...
114 lines
4.3 KiB
C++
114 lines
4.3 KiB
C++
/*
|
|
Copyright 2013 Statoil ASA.
|
|
|
|
This file is part of the Open Porous Media project (OPM).
|
|
|
|
OPM is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OPM is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#define BOOST_TEST_MODULE ParserTests
|
|
#include <stdexcept>
|
|
#include <boost/test/unit_test.hpp>
|
|
#include <opm/parser/eclipse/RawDeck/RawRecord.hpp>
|
|
|
|
BOOST_AUTO_TEST_CASE(RawRecordGetRecordStringReturnsTrimmedString) {
|
|
Opm::RawRecordPtr record(new Opm::RawRecord(" 'NODIR ' 'REVERS' 1 20 /"));
|
|
const std::string& recordString = record->getRecordString();
|
|
BOOST_CHECK_EQUAL("'NODIR ' 'REVERS' 1 20", recordString);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(RawRecordGetRecordsCorrectElementsReturned) {
|
|
Opm::RawRecordPtr record(new Opm::RawRecord(" 'NODIR ' 'REVERS' 1 20 /"));
|
|
|
|
BOOST_CHECK_EQUAL((unsigned) 4, record->size());
|
|
|
|
BOOST_CHECK_EQUAL("'NODIR '", record->getItem(0));
|
|
BOOST_CHECK_EQUAL("'REVERS'", record->getItem(1));
|
|
BOOST_CHECK_EQUAL("1", record->getItem(2));
|
|
BOOST_CHECK_EQUAL("20", record->getItem(3));
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(RawRecordIsCompleteRecordCompleteRecordReturnsTrue) {
|
|
bool isComplete = Opm::RawRecord::isTerminatedRecordString("'NODIR ' 'REVERS' 1 20 /");
|
|
BOOST_CHECK_EQUAL(true, isComplete);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(RawRecordIsCompleteRecordInCompleteRecordReturnsFalse) {
|
|
bool isComplete = Opm::RawRecord::isTerminatedRecordString("'NODIR ' 'REVERS' 1 20 ");
|
|
BOOST_CHECK_EQUAL(false, isComplete);
|
|
isComplete = Opm::RawRecord::isTerminatedRecordString("'NODIR ' 'REVERS 1 20 /");
|
|
BOOST_CHECK_EQUAL(false, isComplete);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(Rawrecord_OperatorThis_OK) {
|
|
Opm::RawRecord record(" 'NODIR ' 'REVERS' 1 20 /");
|
|
Opm::RawRecordPtr recordPtr(new Opm::RawRecord(" 'NODIR ' 'REVERS' 1 20 /"));
|
|
|
|
BOOST_CHECK_EQUAL("'NODIR '", record.getItem(0));
|
|
BOOST_CHECK_EQUAL("'REVERS'", record.getItem(1));
|
|
BOOST_CHECK_EQUAL("1", record.getItem(2));
|
|
BOOST_CHECK_EQUAL("20", record.getItem(3));
|
|
|
|
BOOST_CHECK_EQUAL("20", recordPtr->getItem(3));
|
|
|
|
BOOST_CHECK_THROW(record.getItem(4), std::out_of_range);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(Rawrecord_PushFront_OK) {
|
|
Opm::RawRecordPtr record(new Opm::RawRecord(" 'NODIR ' 'REVERS' 1 20 /"));
|
|
record->push_front("String2");
|
|
record->push_front("String1");
|
|
|
|
|
|
BOOST_CHECK_EQUAL("String1", record->getItem(0));
|
|
BOOST_CHECK_EQUAL("String2", record->getItem(1));
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(Rawrecord_size_OK) {
|
|
Opm::RawRecordPtr record(new Opm::RawRecord(" 'NODIR ' 'REVERS' 1 20 /"));
|
|
|
|
BOOST_CHECK_EQUAL(4U, record->size());
|
|
record->push_front("String2");
|
|
record->push_front("String1");
|
|
BOOST_CHECK_EQUAL(6U, record->size());
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(Rawrecord_sizeEmpty_OK) {
|
|
Opm::RawRecordPtr record(new Opm::RawRecord("/"));
|
|
BOOST_CHECK_EQUAL(0U, record->size());
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(Rawrecord_spaceOnlyEmpty_OK) {
|
|
Opm::RawRecordPtr record(new Opm::RawRecord(" /"));
|
|
BOOST_CHECK_EQUAL("", record->getRecordString());
|
|
BOOST_CHECK_EQUAL(0U, record->size());
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(Rawrecord_noFileAndKeywordGiven_EmptyStringUsed) {
|
|
Opm::RawRecordPtr record(new Opm::RawRecord("32 33 /"));
|
|
BOOST_CHECK_EQUAL("", record->getKeywordName());
|
|
BOOST_CHECK_EQUAL("", record->getFileName());
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(Rawrecord_FileAndKeywordGiven_CorrectStringsReturned) {
|
|
const std::string fileName = "/this/is/it";
|
|
const std::string keywordName = "KEYWD";
|
|
Opm::RawRecordPtr record(new Opm::RawRecord("32 33 /", fileName, keywordName));
|
|
BOOST_CHECK_EQUAL(keywordName, record->getKeywordName());
|
|
BOOST_CHECK_EQUAL(fileName, record->getFileName());
|
|
}
|
|
|
|
|
|
|