sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

expressions unit test - add logical expr

Browse source
This commit is contained in:
artemp 2015-12-08 11:58:10 +00:00
parent 3f61adc170
commit 96f7366e9a
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
test/unit/core/expresssions_test.cpp
View file

@ -43,10 +43,16 @@ TEST_CASE("expressions")
{ {
using properties_type = std::vector<std::pair<std::string, mapnik::value> > ; using properties_type = std::vector<std::pair<std::string, mapnik::value> > ;
mapnik::transcoder tr("utf8"); mapnik::transcoder tr("utf8");
auto expr = mapnik::parse_expression("[foo]='bar'");
properties_type prop = {{ "foo", tr.transcode("bar") }}; properties_type prop = {{ "foo" , tr.transcode("bar") },
{ "double", mapnik::value_double(1.23456)},
{ "int" , mapnik::value_integer(123)},
{ "bool" , mapnik::value_bool(true)},
{ "null" , mapnik::value_null()}};
auto feature = make_test_feature(1, "POINT(100 200)", prop); auto feature = make_test_feature(1, "POINT(100 200)", prop);
auto expr = mapnik::parse_expression("[foo]='bar'");
REQUIRE(evaluate(*feature, *expr) == true); REQUIRE(evaluate(*feature, *expr) == true);
// primary expressions // primary expressions
@ -135,4 +141,7 @@ TEST_CASE("expressions")
expr2 = mapnik::parse_expression("(2.0 * 2.0 + 3.0 * 3.0)/((2.0 - 3.0) * (2.0 + 3.0))"); expr2 = mapnik::parse_expression("(2.0 * 2.0 + 3.0 * 3.0)/((2.0 - 3.0) * (2.0 + 3.0))");
REQUIRE(evaluate(*feature, *expr).to_double() == evaluate(*feature, *expr2).to_double()); REQUIRE(evaluate(*feature, *expr).to_double() == evaluate(*feature, *expr2).to_double());
// logical
expr = mapnik::parse_expression("[int] = 123 and [double] = 1.23456 && [bool] = true and [null] = null && [foo] = 'bar'");
REQUIRE(evaluate(*feature, *expr) == true);
} }