OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added test for ParserDoubleItem

Browse Source
This commit is contained in:
Joakim Hove 2013-08-09 09:12:55 +02:00
parent b190d74df6
commit fe070640ad
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/Parser/ParserDoubleItem.cpp
View File

@ -34,7 +34,7 @@ namespace Opm {
}
ParserDoubleItem::ParserDoubleItem(const std::string& itemName, ParserItemSizeEnum sizeType, int defaultValue) : ParserItem(itemName, sizeType) {
ParserDoubleItem::ParserDoubleItem(const std::string& itemName, ParserItemSizeEnum sizeType, double defaultValue) : ParserItem(itemName, sizeType) {
m_default = defaultValue;
}

2
opm/parser/eclipse/Parser/ParserDoubleItem.hpp
View File

@ -33,7 +33,7 @@ namespace Opm {
class ParserDoubleItem : public ParserItem {
public:
ParserDoubleItem(const std::string& itemName, ParserItemSizeEnum sizeType);
ParserDoubleItem(const std::string& itemName, ParserItemSizeEnum sizeType, int defaultValue);
ParserDoubleItem(const std::string& itemName, ParserItemSizeEnum sizeType, double defaultValue);
ParserDoubleItem( const Json::JsonObject& jsonConfig);
DeckItemConstPtr scan(size_t expectedItems , RawRecordPtr rawRecord) const;

13
opm/parser/eclipse/Parser/tests/ParserItemTests.cpp
View File

@ -40,8 +40,7 @@ BOOST_AUTO_TEST_CASE(Initialize) {
ParserItemSizeEnum sizeType = SINGLE;
BOOST_CHECK_NO_THROW(ParserIntItem item1("ITEM1", sizeType));
BOOST_CHECK_NO_THROW(ParserStringItem item1("ITEM1", sizeType));
// BOOST_CHECK_NO_THROW(ParserBoolItem item1("ITEM1", sizeType));
// BOOST_CHECK_NO_THROW(ParserDoubleItem item1("ITEM1", sizeType));
BOOST_CHECK_NO_THROW(ParserDoubleItem item1("ITEM1", sizeType));
}
BOOST_AUTO_TEST_CASE(Initialize_Default) {
@ -52,6 +51,16 @@ BOOST_AUTO_TEST_CASE(Initialize_Default) {
BOOST_CHECK_EQUAL(item2.getDefault(), 88);
}
BOOST_AUTO_TEST_CASE(Initialize_Default_Double) {
ParserItemSizeEnum sizeType = SINGLE;
ParserDoubleItem item1("ITEM1", sizeType);
ParserDoubleItem item2("ITEM1", sizeType, 88.91);
BOOST_CHECK_EQUAL(item1.getDefault(), ParserItem::defaultDouble());
BOOST_CHECK_EQUAL( 88.91 , item2.getDefault());
}
/******************************************************************/
/* <Json> */
BOOST_AUTO_TEST_CASE(InitializeIntItem_FromJsonObject_missingName_throws) {