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

make Action::AST constructible from variables

Browse Source 
also add accessors and equality operator
This commit is contained in:
Arne Morten Kvarving
2019-12-16 14:27:16 +01:00
parent 73001501f0
commit e7e2458951
3 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/parser/ACTIONX.cpp
View File

@@ -232,13 +232,13 @@ TSTEP
BOOST_AUTO_TEST_CASE(TestAction_AST_BASIC) {
// Missing comparator
BOOST_REQUIRE_THROW( Action::AST( {"WWCT", "OPX", "0.75"} ), std::invalid_argument);
BOOST_REQUIRE_THROW( Action::AST( std::vector<std::string>{"WWCT", "OPX", "0.75"} ), std::invalid_argument);
// Left hand side must be function expression
BOOST_REQUIRE_THROW( Action::AST({"0.75", "<", "1.0"}), std::invalid_argument);
BOOST_REQUIRE_THROW( Action::AST(std::vector<std::string>{"0.75", "<", "1.0"}), std::invalid_argument);
//Extra data
BOOST_REQUIRE_THROW(Action::AST({"0.75", "<", "1.0", "EXTRA"}), std::invalid_argument);
BOOST_REQUIRE_THROW(Action::AST(std::vector<std::string>{"0.75", "<", "1.0", "EXTRA"}), std::invalid_argument);
Action::AST ast1({"WWCT", "OPX", ">", "0.75"});
Action::AST ast2({"WWCT", "OPX", "=", "WWCT", "OPX"});
@@ -296,7 +296,7 @@ BOOST_AUTO_TEST_CASE(TestAction_AST_OR_AND) {
}
BOOST_AUTO_TEST_CASE(DATE) {
Action::AST ast({"MNTH", ">=", "JUN"});
Action::AST ast(std::vector<std::string>{"MNTH", ">=", "JUN"});
SummaryState st(std::chrono::system_clock::now());
Action::Context context(st);