OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9a0ccfd853
opm-common/tests/parser/StarTokenTests.cpp

128 lines
5.7 KiB
C++
Raw Normal View History

Added class StarToken() to treat tokens with a multiplier/default
2013-10-14 09:54:43 -05:00
/*
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>
Refactor initial parsing stage - Reduced the amount of state in the RawKeyword and ParserState classes. - RawKeyword class has normal constructor - remove init method. - The Rawxxx symbols are module private and the header files are not installed. - Removed several unused static methods from Rawxxx and ParserKeyword.
2019-08-15 16:03:23 -05:00
Filesystem rename parser/eclipse/ input/eclipse
2021-12-14 01:06:42 -06:00
#include "src/opm/input/eclipse/Parser/raw/StarToken.hpp"
Added class StarToken() to treat tokens with a multiplier/default
2013-10-14 09:54:43 -05:00
BOOST_AUTO_TEST_CASE(NoStarThrows) {
Handle quotes better 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...
2014-09-18 07:47:05 -05:00
BOOST_REQUIRE_THROW(Opm::StarToken st("Hei...") , std::invalid_argument);
Added class StarToken() to treat tokens with a multiplier/default
2013-10-14 09:54:43 -05:00
}
extend "StarToken" class that's because not every token which contains a star represents an repetion, e.g. 'PROD*' and '123*456' (with the quotes) are strings...
2014-09-11 06:05:32 -05:00
BOOST_AUTO_TEST_CASE(InvalidCountThrow) {
Handle quotes better 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...
2014-09-18 07:47:05 -05:00
BOOST_REQUIRE_THROW( Opm::StarToken st("X*") , std::invalid_argument);
BOOST_REQUIRE_THROW( Opm::StarToken st("1.25*") , std::invalid_argument);
BOOST_REQUIRE_THROW( Opm::StarToken st("-3*") , std::invalid_argument);
BOOST_REQUIRE_THROW( Opm::StarToken st("0*") , std::invalid_argument);
BOOST_REQUIRE_THROW( Opm::StarToken st("*123") , std::invalid_argument);
Added class StarToken() to treat tokens with a multiplier/default
2013-10-14 09:54:43 -05:00
}
extend "StarToken" class that's because not every token which contains a star represents an repetion, e.g. 'PROD*' and '123*456' (with the quotes) are strings...
2014-09-11 06:05:32 -05:00
BOOST_AUTO_TEST_CASE(CountCorrect) {
Handle quotes better 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...
2014-09-18 07:47:05 -05:00
Opm::StarToken st1("*");
Opm::StarToken st2("5*");
Opm::StarToken st3("54*");
extend "StarToken" class that's because not every token which contains a star represents an repetion, e.g. 'PROD*' and '123*456' (with the quotes) are strings...
2014-09-11 06:05:32 -05:00
BOOST_CHECK(st1.countString() == "");
Handle quotes better 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...
2014-09-18 07:47:05 -05:00
BOOST_CHECK(st2.countString() == "5");
BOOST_CHECK(st3.countString() == "54");
extend "StarToken" class that's because not every token which contains a star represents an repetion, e.g. 'PROD*' and '123*456' (with the quotes) are strings...
2014-09-11 06:05:32 -05:00
BOOST_CHECK(st1.valueString() == "");
Handle quotes better 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...
2014-09-18 07:47:05 -05:00
BOOST_CHECK(st2.valueString() == "");
BOOST_CHECK(st3.valueString() == "");
extend "StarToken" class that's because not every token which contains a star represents an repetion, e.g. 'PROD*' and '123*456' (with the quotes) are strings...
2014-09-11 06:05:32 -05:00
BOOST_CHECK(!st1.hasValue());
Handle quotes better 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...
2014-09-18 07:47:05 -05:00
BOOST_CHECK(!st2.hasValue());
BOOST_CHECK(!st3.hasValue());
BOOST_REQUIRE_EQUAL(1U , st1.count());
extend "StarToken" class that's because not every token which contains a star represents an repetion, e.g. 'PROD*' and '123*456' (with the quotes) are strings...
2014-09-11 06:05:32 -05:00
BOOST_REQUIRE_EQUAL(5U , st2.count());
BOOST_REQUIRE_EQUAL(54U , st3.count());
Added class StarToken() to treat tokens with a multiplier/default
2013-10-14 09:54:43 -05:00
}
BOOST_AUTO_TEST_CASE(NoValueGetValueThrow) {
Handle quotes better 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...
2014-09-18 07:47:05 -05:00
Opm::StarToken st1("*");
Opm::StarToken st2("5*");
Added class StarToken() to treat tokens with a multiplier/default
2013-10-14 09:54:43 -05:00
BOOST_CHECK_EQUAL( false , st1.hasValue());
BOOST_CHECK_EQUAL( false , st2.hasValue());
}
extend "StarToken" class that's because not every token which contains a star represents an repetion, e.g. 'PROD*' and '123*456' (with the quotes) are strings...
2014-09-11 06:05:32 -05:00
BOOST_AUTO_TEST_CASE(StarNoCountThrows) {
Handle quotes better 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...
2014-09-18 07:47:05 -05:00
BOOST_CHECK_THROW( Opm::StarToken st1("*10") , std::invalid_argument);
Added class StarToken() to treat tokens with a multiplier/default
2013-10-14 09:54:43 -05:00
}
Handle quotes better 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...
2014-09-18 07:47:05 -05:00
BOOST_AUTO_TEST_CASE(CorrectValueString) {
Opm::StarToken st1("1*10.09");
Opm::StarToken st2("5*20.13");
Opm::StarToken st3("1*'123'");
Opm::StarToken st4("1*123*456");
Added class StarToken() to treat tokens with a multiplier/default
2013-10-14 09:54:43 -05:00
BOOST_CHECK_EQUAL( true , st1.hasValue());
BOOST_CHECK_EQUAL( true , st2.hasValue());
Handle quotes better 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...
2014-09-18 07:47:05 -05:00
BOOST_CHECK_EQUAL( true , st3.hasValue());
BOOST_CHECK_EQUAL( true , st4.hasValue());
Added class StarToken() to treat tokens with a multiplier/default
2013-10-14 09:54:43 -05:00
Handle quotes better 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...
2014-09-18 07:47:05 -05:00
BOOST_CHECK_EQUAL( "10.09" , st1.valueString());
BOOST_CHECK_EQUAL( "20.13" , st2.valueString());
BOOST_CHECK_EQUAL( "'123'" , st3.valueString());
BOOST_CHECK_EQUAL( "123*456" , st4.valueString());
Added class StarToken() to treat tokens with a multiplier/default
2013-10-14 09:54:43 -05:00
}
Added loose function tokenCOntainsStar to StarToken.cpp
2013-10-14 14:24:03 -05:00
BOOST_AUTO_TEST_CASE( ContainsStar_WithStar_ReturnsTrue ) {
extend "StarToken" class that's because not every token which contains a star represents an repetion, e.g. 'PROD*' and '123*456' (with the quotes) are strings...
2014-09-11 06:05:32 -05:00
std::string countString, valueString;
BOOST_CHECK_EQUAL( true , Opm::isStarToken("*", countString, valueString) );
BOOST_CHECK_EQUAL( true , Opm::isStarToken("*1", countString, valueString) );
BOOST_CHECK_EQUAL( true , Opm::isStarToken("1*", countString, valueString) );
BOOST_CHECK_EQUAL( true , Opm::isStarToken("1*2", countString, valueString) );
remove all trailing white space this is just the result of ``` find -iname "*.[ch]pp" | xargs sed -i "s/ *$//" find opm/parser/share/keywords -type f | xargs sed -i "s/ *$//" ``` so if it causes conflicts with other patches, the others should get priority. The rationale behind this patch is that some people tell their editor to remove white space which leads to larger than necessary patches...
2014-12-08 09:34:28 -06:00
extend "StarToken" class that's because not every token which contains a star represents an repetion, e.g. 'PROD*' and '123*456' (with the quotes) are strings...
2014-09-11 06:05:32 -05:00
BOOST_CHECK_EQUAL( false , Opm::isStarToken("12", countString, valueString) );
Handle quotes better 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...
2014-09-18 07:47:05 -05:00
BOOST_CHECK_EQUAL( false , Opm::isStarToken("'12*34'", countString, valueString) );
Added loose function tokenCOntainsStar to StarToken.cpp
2013-10-14 14:24:03 -05:00
}
OPM-94: Removed specialized int,double,string implementations, one generic covers the same
2014-07-10 06:23:37 -05:00
BOOST_AUTO_TEST_CASE( readValueToken_basic_validity_tests ) {
Replace boost::lexical_cast<> with std functions The boost provided lexical cast are inefficient and is shown to be a slowdown in the inner loop. Replaces them with std::atoi/std::atof and some simple correctness checking.
2016-03-03 04:46:10 -06:00
BOOST_CHECK_THROW( Opm::readValueToken<int>( std::string( "3.3" ) ), std::invalid_argument );
ReadValueToken correctly parses numbers Changes the implementation of numbers parsing from std::atoi/f to std::strtod/l. These support setting the optional end-of-string pointer which are used to determine if a parsing was successful or not. This has the nice side effect of *greatly* simplifying the logic, at the expense of some C-style details. Tests added to verify that the different edge cases are handled properly.
2016-04-01 03:13:37 -05:00
BOOST_CHECK_EQUAL( 3, Opm::readValueToken<int>( std::string( "3" ) ) );
BOOST_CHECK_EQUAL( 3, Opm::readValueToken<int>( std::string( "+3" ) ) );
BOOST_CHECK_EQUAL( -3, Opm::readValueToken<int>( std::string( "-3" ) ) );
Replace boost::lexical_cast<> with std functions The boost provided lexical cast are inefficient and is shown to be a slowdown in the inner loop. Replaces them with std::atoi/std::atof and some simple correctness checking.
2016-03-03 04:46:10 -06:00
BOOST_CHECK_THROW( Opm::readValueToken<double>( std::string( "truls" ) ), std::invalid_argument );
ReadValueToken correctly parses numbers Changes the implementation of numbers parsing from std::atoi/f to std::strtod/l. These support setting the optional end-of-string pointer which are used to determine if a parsing was successful or not. This has the nice side effect of *greatly* simplifying the logic, at the expense of some C-style details. Tests added to verify that the different edge cases are handled properly.
2016-04-01 03:13:37 -05:00
BOOST_CHECK_EQUAL( 0, Opm::readValueToken<double>( std::string( "0" ) ) );
BOOST_CHECK_EQUAL( 0, Opm::readValueToken<double>( std::string( "0.0" ) ) );
BOOST_CHECK_EQUAL( 0, Opm::readValueToken<double>( std::string( "+0.0" ) ) );
BOOST_CHECK_EQUAL( 0, Opm::readValueToken<double>( std::string( "-0.0" ) ) );
BOOST_CHECK_EQUAL( 0, Opm::readValueToken<double>( std::string( ".0" ) ) );
BOOST_CHECK_THROW( Opm::readValueToken<double>( std::string( "1.0.0" ) ), std::invalid_argument );
BOOST_CHECK_THROW( Opm::readValueToken<double>( std::string( "1g0" ) ), std::invalid_argument );
BOOST_CHECK_THROW( Opm::readValueToken<double>( std::string( "1.23h" ) ), std::invalid_argument );
BOOST_CHECK_THROW( Opm::readValueToken<double>( std::string( "+1.23h" ) ), std::invalid_argument );
BOOST_CHECK_THROW( Opm::readValueToken<double>( std::string( "-1.23h" ) ), std::invalid_argument );
BOOST_CHECK_EQUAL( 3.3, Opm::readValueToken<double>( std::string( "3.3" ) ) );
Replace boost::lexical_cast<> with std functions The boost provided lexical cast are inefficient and is shown to be a slowdown in the inner loop. Replaces them with std::atoi/std::atof and some simple correctness checking.
2016-03-03 04:46:10 -06:00
BOOST_CHECK_CLOSE( 3.3, Opm::readValueToken<double>( std::string( "3.3e0" ) ), 1e-6 );
BOOST_CHECK_CLOSE( 3.3, Opm::readValueToken<double>( std::string( "3.3d0" ) ), 1e-6 );
BOOST_CHECK_CLOSE( 3.3, Opm::readValueToken<double>( std::string( "3.3E0" ) ), 1e-6 );
BOOST_CHECK_CLOSE( 3.3, Opm::readValueToken<double>( std::string( "3.3D0" ) ), 1e-6 );
BOOST_CHECK_EQUAL( "OLGA", Opm::readValueToken<std::string>( std::string( "OLGA" ) ) );
BOOST_CHECK_EQUAL( "OLGA", Opm::readValueToken<std::string>( std::string( "'OLGA'" ) ) );
BOOST_CHECK_EQUAL( "123*456", Opm::readValueToken<std::string>( std::string( "123*456" ) ) );
BOOST_CHECK_EQUAL( "123*456", Opm::readValueToken<std::string>( std::string( "'123*456'" ) ) );
OPM-94: Removed specialized int,double,string implementations, one generic covers the same
2014-07-10 06:23:37 -05:00
}
Reference in New Issue Copy Permalink