diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-28 16:33:09 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-28 16:33:09 -0700 |
commit | da78422c5c37b2150eefeb399658903e45bf05d9 (patch) | |
tree | 1a7219a082c02de4f9f4d1274abb289090989826 /test | |
parent | 10528091db0baaad4b528555498d43236e32ccce (diff) | |
download | qtlocation-mapboxgl-da78422c5c37b2150eefeb399658903e45bf05d9.tar.gz |
[core] Prepare Filter for public API (#4900)
Diffstat (limited to 'test')
-rw-r--r-- | test/style/filter.cpp (renamed from test/style/comparisons.cpp) | 41 | ||||
-rw-r--r-- | test/style/variant.cpp | 459 | ||||
-rw-r--r-- | test/test.gypi | 3 |
3 files changed, 23 insertions, 480 deletions
diff --git a/test/style/comparisons.cpp b/test/style/filter.cpp index 4eab5d2cb8..4d6963267a 100644 --- a/test/style/comparisons.cpp +++ b/test/style/filter.cpp @@ -1,9 +1,11 @@ -#include <iostream> #include <mbgl/test/util.hpp> -#include <mbgl/tile/vector_tile.hpp> -#include <mbgl/style/filter_expression.hpp> -#include <mbgl/style/filter_expression_private.hpp> +#include <mbgl/style/filter.hpp> +#include <mbgl/style/filter_evaluator.hpp> +#include <mbgl/style/style_parser.hpp> +#include <mbgl/tile/geometry_tile.hpp> + +#include <rapidjson/document.h> #include <map> @@ -36,24 +38,25 @@ private: FeatureType type; }; -FilterExpression parse(const char * expression) { +Filter parse(const char * expression) { rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> doc; doc.Parse<0>(expression); - return parseFilterExpression(doc); + return parseFilter(doc); } -bool evaluate(const FilterExpression& expression, const Properties& properties, FeatureType type = FeatureType::Unknown) { - return mbgl::evaluate(expression, Extractor(properties, type)); +bool evaluate(const Filter& filter, const Properties& properties, FeatureType type = FeatureType::Unknown) { + FilterEvaluator<Extractor> evaluator({properties, type}); + return Filter::visit(filter, evaluator); } -TEST(FilterComparison, EqualsString) { - FilterExpression f = parse("[\"==\", \"foo\", \"bar\"]"); +TEST(Filter, EqualsString) { + Filter f = parse("[\"==\", \"foo\", \"bar\"]"); ASSERT_TRUE(evaluate(f, {{ "foo", std::string("bar") }})); ASSERT_FALSE(evaluate(f, {{ "foo", std::string("baz") }})); }; -TEST(FilterComparison, EqualsNumber) { - FilterExpression f = parse("[\"==\", \"foo\", 0]"); +TEST(Filter, EqualsNumber) { + Filter f = parse("[\"==\", \"foo\", 0]"); ASSERT_TRUE(evaluate(f, {{ "foo", int64_t(0) }})); ASSERT_TRUE(evaluate(f, {{ "foo", uint64_t(0) }})); ASSERT_TRUE(evaluate(f, {{ "foo", double(0) }})); @@ -66,20 +69,20 @@ TEST(FilterComparison, EqualsNumber) { ASSERT_FALSE(evaluate(f, {{}})); } -TEST(FilterComparison, EqualsType) { - FilterExpression f = parse("[\"==\", \"$type\", \"LineString\"]"); +TEST(Filter, EqualsType) { + Filter f = parse("[\"==\", \"$type\", \"LineString\"]"); ASSERT_FALSE(evaluate(f, {{}}, FeatureType::Point)); ASSERT_TRUE(evaluate(f, {{}}, FeatureType::LineString)); } -TEST(FilterComparison, InType) { - FilterExpression f = parse("[\"in\", \"$type\", \"LineString\", \"Polygon\"]"); +TEST(Filter, InType) { + Filter f = parse("[\"in\", \"$type\", \"LineString\", \"Polygon\"]"); ASSERT_FALSE(evaluate(f, {{}}, FeatureType::Point)); ASSERT_TRUE(evaluate(f, {{}}, FeatureType::LineString)); ASSERT_TRUE(evaluate(f, {{}}, FeatureType::Polygon)); } -TEST(FilterComparison, Any) { +TEST(Filter, Any) { ASSERT_FALSE(evaluate(parse("[\"any\"]"), {{}})); ASSERT_TRUE(evaluate(parse("[\"any\", [\"==\", \"foo\", 1]]"), {{ std::string("foo"), int64_t(1) }})); @@ -89,7 +92,7 @@ TEST(FilterComparison, Any) { {{ std::string("foo"), int64_t(1) }})); } -TEST(FilterComparison, All) { +TEST(Filter, All) { ASSERT_TRUE(evaluate(parse("[\"all\"]"), {{}})); ASSERT_TRUE(evaluate(parse("[\"all\", [\"==\", \"foo\", 1]]"), {{ std::string("foo"), int64_t(1) }})); @@ -99,7 +102,7 @@ TEST(FilterComparison, All) { {{ std::string("foo"), int64_t(1) }})); } -TEST(FilterComparison, None) { +TEST(Filter, None) { ASSERT_TRUE(evaluate(parse("[\"none\"]"), {{}})); ASSERT_FALSE(evaluate(parse("[\"none\", [\"==\", \"foo\", 1]]"), {{ std::string("foo"), int64_t(1) }})); diff --git a/test/style/variant.cpp b/test/style/variant.cpp index 199606d666..e69de29bb2 100644 --- a/test/style/variant.cpp +++ b/test/style/variant.cpp @@ -1,459 +0,0 @@ -#include <iostream> -#include <mbgl/test/util.hpp> - -#include <mbgl/style/value.hpp> -#include <mbgl/style/value_comparison.hpp> - -using namespace mbgl; - -TEST(Variant, toString) { - // Force the default locale so we don't - // get results like "3,14" instead of "3.14". - std::locale::global(std::locale::classic()); - - EXPECT_EQ("lord", toString( (std::string)"lord" )); - EXPECT_EQ("36", toString( (uint64_t)36 )); - EXPECT_EQ("-239", toString( (int64_t)-239 )); - EXPECT_EQ("0", toString( (int64_t)0 )); - EXPECT_EQ("3.14159268", toString( (double)3.14159268 )); - EXPECT_EQ("3.1415926535897931", toString( (double)3.1415926535897931 )); - EXPECT_EQ("true", toString( true )); - EXPECT_EQ("false", toString( false )); -} - -TEST(Variant, RelaxedEquality) { - // Compare to bool - EXPECT_TRUE(util::relaxed_equal(bool(false), bool(false))); - EXPECT_TRUE(util::relaxed_equal(bool(true), bool(true))); - EXPECT_FALSE(util::relaxed_equal(bool(false), bool(true))); - EXPECT_FALSE(util::relaxed_equal(bool(false), int64_t(0))); - EXPECT_FALSE(util::relaxed_equal(bool(false), uint64_t(0))); - EXPECT_FALSE(util::relaxed_equal(bool(false), double(0))); - EXPECT_FALSE(util::relaxed_equal(bool(false), std::string("0"))); - EXPECT_FALSE(util::relaxed_equal(bool(false), std::string(""))); - EXPECT_FALSE(util::relaxed_equal(bool(false), int64_t(386))); - EXPECT_FALSE(util::relaxed_equal(bool(false), int64_t(-7042))); - EXPECT_FALSE(util::relaxed_equal(bool(false), uint64_t(386))); - EXPECT_FALSE(util::relaxed_equal(bool(false), double(3.145))); - EXPECT_FALSE(util::relaxed_equal(bool(false), std::string("386"))); - EXPECT_FALSE(util::relaxed_equal(bool(false), std::string("test"))); - EXPECT_FALSE(util::relaxed_equal(bool(true), int64_t(1))); - EXPECT_FALSE(util::relaxed_equal(bool(true), uint64_t(1))); - EXPECT_FALSE(util::relaxed_equal(bool(true), double(1))); - EXPECT_FALSE(util::relaxed_equal(bool(true), std::string("1"))); - EXPECT_FALSE(util::relaxed_equal(bool(true), bool(false))); - EXPECT_FALSE(util::relaxed_equal(bool(true), int64_t(386))); - EXPECT_FALSE(util::relaxed_equal(bool(true), int64_t(-7042))); - EXPECT_FALSE(util::relaxed_equal(bool(true), uint64_t(386))); - EXPECT_FALSE(util::relaxed_equal(bool(true), double(3.145))); - EXPECT_FALSE(util::relaxed_equal(bool(true), std::string("386"))); - EXPECT_FALSE(util::relaxed_equal(bool(true), std::string("test"))); - EXPECT_FALSE(util::relaxed_equal(bool(true), std::string(""))); - - // Compare to int64_t - EXPECT_TRUE(util::relaxed_equal(int64_t(386), int64_t(386))); - EXPECT_TRUE(util::relaxed_equal(int64_t(-7042), int64_t(-7042))); - EXPECT_TRUE(util::relaxed_equal(int64_t(386), uint64_t(386))); - EXPECT_TRUE(util::relaxed_equal(int64_t(386), double(386))); - EXPECT_FALSE(util::relaxed_equal(int64_t(386), std::string("386"))); - EXPECT_FALSE(util::relaxed_equal(int64_t(1), bool(true))); - EXPECT_FALSE(util::relaxed_equal(int64_t(0), bool(false))); - EXPECT_FALSE(util::relaxed_equal(int64_t(386), int64_t(387))); - EXPECT_FALSE(util::relaxed_equal(int64_t(-7042), int64_t(-7043))); - EXPECT_FALSE(util::relaxed_equal(int64_t(386), uint64_t(387))); - EXPECT_FALSE(util::relaxed_equal(int64_t(386), double(387))); - EXPECT_FALSE(util::relaxed_equal(int64_t(386), std::string("387"))); - EXPECT_FALSE(util::relaxed_equal(int64_t(1), bool(false))); - EXPECT_FALSE(util::relaxed_equal(int64_t(0), bool(true))); - EXPECT_FALSE(util::relaxed_equal(int64_t(1), std::string("true"))); - EXPECT_FALSE(util::relaxed_equal(int64_t(0), std::string("false"))); - EXPECT_FALSE(util::relaxed_equal(int64_t(1), std::string("false"))); - EXPECT_FALSE(util::relaxed_equal(int64_t(0), std::string("true"))); - - // Compare to uint64_t - EXPECT_TRUE(util::relaxed_equal(uint64_t(386), int64_t(386))); - EXPECT_TRUE(util::relaxed_equal(uint64_t(386), uint64_t(386))); - EXPECT_TRUE(util::relaxed_equal(uint64_t(0), uint64_t(0))); - EXPECT_TRUE(util::relaxed_equal(uint64_t(386), double(386))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(386), std::string("386"))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(1), bool(true))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(0), bool(false))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(386), int64_t(387))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(386), uint64_t(387))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(0), uint64_t(1))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(386), double(387))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(386), std::string("387"))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(1), bool(false))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(0), bool(true))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(1), std::string("true"))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(0), std::string("false"))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(1), std::string("false"))); - EXPECT_FALSE(util::relaxed_equal(uint64_t(0), std::string("true"))); - - // Compare to double - EXPECT_TRUE(util::relaxed_equal(double(3.159385), double(3.159385))); - EXPECT_TRUE(util::relaxed_equal(double(386), int64_t(386))); - EXPECT_TRUE(util::relaxed_equal(double(386), uint64_t(386))); - EXPECT_TRUE(util::relaxed_equal(double(0), uint64_t(0))); - EXPECT_TRUE(util::relaxed_equal(double(386), double(386))); - EXPECT_FALSE(util::relaxed_equal(double(386), std::string("386"))); - EXPECT_FALSE(util::relaxed_equal(double(1), bool(true))); - EXPECT_FALSE(util::relaxed_equal(double(0), bool(false))); - EXPECT_FALSE(util::relaxed_equal(double(3.159385), double(3.159383))); - EXPECT_FALSE(util::relaxed_equal(double(386), int64_t(387))); - EXPECT_FALSE(util::relaxed_equal(double(386), uint64_t(387))); - EXPECT_FALSE(util::relaxed_equal(double(0), uint64_t(1))); - EXPECT_FALSE(util::relaxed_equal(double(386), double(387))); - EXPECT_FALSE(util::relaxed_equal(double(386), std::string("387"))); - EXPECT_FALSE(util::relaxed_equal(double(1), bool(false))); - EXPECT_FALSE(util::relaxed_equal(double(0), bool(true))); - EXPECT_FALSE(util::relaxed_equal(double(1), std::string("true"))); - EXPECT_FALSE(util::relaxed_equal(double(1), std::string("TRue"))); - EXPECT_FALSE(util::relaxed_equal(double(0), std::string("false"))); - EXPECT_FALSE(util::relaxed_equal(double(0), std::string("FALSe"))); - EXPECT_FALSE(util::relaxed_equal(double(0), std::string("null"))); - EXPECT_FALSE(util::relaxed_equal(double(0), std::string("Null"))); - EXPECT_FALSE(util::relaxed_equal(double(1), std::string("false"))); - EXPECT_FALSE(util::relaxed_equal(double(1), std::string("False"))); - EXPECT_FALSE(util::relaxed_equal(double(1), std::string("null"))); - EXPECT_FALSE(util::relaxed_equal(double(1), std::string("NULL"))); - EXPECT_FALSE(util::relaxed_equal(double(0), std::string("true"))); - EXPECT_FALSE(util::relaxed_equal(double(0), std::string("TRUE"))); - - // Compare to string - EXPECT_TRUE(util::relaxed_equal(std::string("lord"), std::string("lord"))); - EXPECT_FALSE(util::relaxed_equal(std::string("386"), int64_t(386))); - EXPECT_FALSE(util::relaxed_equal(std::string("-386"), int64_t(-386))); - EXPECT_FALSE(util::relaxed_equal(std::string("386"), uint64_t(386))); - EXPECT_FALSE(util::relaxed_equal(std::string("386.36"), double(386.36))); - EXPECT_FALSE(util::relaxed_equal(std::string(""), bool(false))); - EXPECT_FALSE(util::relaxed_equal(std::string("1"), bool(true))); - EXPECT_FALSE(util::relaxed_equal(std::string("lord"), std::string("baron"))); - EXPECT_FALSE(util::relaxed_equal(std::string("386"), int64_t(387))); - EXPECT_FALSE(util::relaxed_equal(std::string("-386"), int64_t(-387))); - EXPECT_FALSE(util::relaxed_equal(std::string("386"), uint64_t(387))); - EXPECT_FALSE(util::relaxed_equal(std::string("386.36"), double(386.37))); - EXPECT_FALSE(util::relaxed_equal(std::string("some string"), bool(true))); - EXPECT_FALSE(util::relaxed_equal(std::string("true"), bool(true))); - EXPECT_FALSE(util::relaxed_equal(std::string("True"), bool(true))); - EXPECT_FALSE(util::relaxed_equal(std::string("false"), bool(false))); - EXPECT_FALSE(util::relaxed_equal(std::string("fAlse"), bool(false))); - EXPECT_FALSE(util::relaxed_equal(std::string("null"), bool(false))); - EXPECT_FALSE(util::relaxed_equal(std::string("NULl"), bool(false))); - EXPECT_FALSE(util::relaxed_equal(std::string("true"), bool(false))); - EXPECT_FALSE(util::relaxed_equal(std::string("TRUE"), bool(false))); - EXPECT_FALSE(util::relaxed_equal(std::string("some string"), bool(false))); - EXPECT_FALSE(util::relaxed_equal(std::string("false"), bool(true))); - EXPECT_FALSE(util::relaxed_equal(std::string("FALSE"), bool(true))); - EXPECT_FALSE(util::relaxed_equal(std::string("null"), bool(true))); - EXPECT_FALSE(util::relaxed_equal(std::string("NULl"), bool(true))); - EXPECT_FALSE(util::relaxed_equal(std::string(""), bool(true))); -} - -TEST(Variant, RelaxedGreater) { - EXPECT_TRUE(util::relaxed_greater(std::string("387"), std::string("386"))); - EXPECT_FALSE(util::relaxed_greater(uint64_t(387), std::string("386"))); - EXPECT_FALSE(util::relaxed_greater(int64_t(387), std::string("386"))); - EXPECT_FALSE(util::relaxed_greater(double(387), std::string("386"))); - EXPECT_FALSE(util::relaxed_greater(bool(true), std::string("0"))); - - EXPECT_FALSE(util::relaxed_greater(std::string("387"), uint64_t(386))); - EXPECT_TRUE(util::relaxed_greater(uint64_t(387), uint64_t(386))); - EXPECT_TRUE(util::relaxed_greater(int64_t(387), uint64_t(386))); - EXPECT_TRUE(util::relaxed_greater(double(387), uint64_t(386))); - EXPECT_FALSE(util::relaxed_greater(bool(true), uint64_t(0))); - - EXPECT_FALSE(util::relaxed_greater(std::string("387"), int64_t(386))); - EXPECT_TRUE(util::relaxed_greater(uint64_t(387), int64_t(386))); - EXPECT_TRUE(util::relaxed_greater(int64_t(387), int64_t(386))); - EXPECT_TRUE(util::relaxed_greater(double(387), int64_t(386))); - EXPECT_FALSE(util::relaxed_greater(bool(true), int64_t(0))); - - EXPECT_FALSE(util::relaxed_greater(std::string("387"), double(386.7))); - EXPECT_TRUE(util::relaxed_greater(uint64_t(387), double(386.7))); - EXPECT_TRUE(util::relaxed_greater(int64_t(387), double(386.7))); - EXPECT_TRUE(util::relaxed_greater(double(387), double(386.7))); - EXPECT_FALSE(util::relaxed_greater(bool(true), double(0))); - - EXPECT_FALSE(util::relaxed_greater(std::string("387"), bool(true))); - EXPECT_FALSE(util::relaxed_greater(std::string("387"), bool(false))); - EXPECT_FALSE(util::relaxed_greater(uint64_t(387), bool(false))); - EXPECT_FALSE(util::relaxed_greater(int64_t(387), bool(false))); - EXPECT_FALSE(util::relaxed_greater(double(387), bool(false))); - EXPECT_FALSE(util::relaxed_greater(double(387), bool(false))); - EXPECT_FALSE(util::relaxed_greater(uint64_t(387), bool(true))); - EXPECT_FALSE(util::relaxed_greater(int64_t(387), bool(true))); - EXPECT_FALSE(util::relaxed_greater(double(387), bool(true))); - EXPECT_FALSE(util::relaxed_greater(double(387), bool(true))); - - EXPECT_FALSE(util::relaxed_greater(bool(true), double(0))); - EXPECT_FALSE(util::relaxed_greater(bool(true), double(0.5))); - EXPECT_TRUE(util::relaxed_greater(bool(true), bool(false))); - EXPECT_FALSE(util::relaxed_greater(bool(true), bool(true))); - EXPECT_FALSE(util::relaxed_greater(bool(true), int64_t(0))); - EXPECT_FALSE(util::relaxed_greater(bool(true), uint64_t(0))); - - - - - EXPECT_FALSE(util::relaxed_greater(std::string("387"), std::string("388"))); - EXPECT_FALSE(util::relaxed_greater(uint64_t(387), std::string("388"))); - EXPECT_FALSE(util::relaxed_greater(int64_t(387), std::string("388"))); - EXPECT_FALSE(util::relaxed_greater(double(387), std::string("388"))); - EXPECT_FALSE(util::relaxed_greater(bool(true), std::string("388"))); - - EXPECT_FALSE(util::relaxed_greater(std::string("387"), uint64_t(388))); - EXPECT_FALSE(util::relaxed_greater(uint64_t(387), uint64_t(388))); - EXPECT_FALSE(util::relaxed_greater(int64_t(387), uint64_t(388))); - EXPECT_FALSE(util::relaxed_greater(double(387), uint64_t(388))); - EXPECT_FALSE(util::relaxed_greater(bool(true), uint64_t(388))); - - EXPECT_FALSE(util::relaxed_greater(std::string("387"), int64_t(388))); - EXPECT_FALSE(util::relaxed_greater(uint64_t(387), int64_t(388))); - EXPECT_FALSE(util::relaxed_greater(int64_t(387), int64_t(388))); - EXPECT_FALSE(util::relaxed_greater(double(387), int64_t(388))); - EXPECT_FALSE(util::relaxed_greater(bool(true), int64_t(388))); - - EXPECT_FALSE(util::relaxed_greater(std::string("387"), double(388.7))); - EXPECT_FALSE(util::relaxed_greater(uint64_t(387), double(388.7))); - EXPECT_FALSE(util::relaxed_greater(int64_t(387), double(388.7))); - EXPECT_FALSE(util::relaxed_greater(double(387), double(388.7))); - EXPECT_FALSE(util::relaxed_greater(bool(true), double(388))); - EXPECT_FALSE(util::relaxed_greater(bool(true), bool(true))); - EXPECT_FALSE(util::relaxed_greater(bool(false), bool(false))); -} - - - -TEST(Variant, RelaxedGreaterEqual) { - EXPECT_TRUE(util::relaxed_greater_equal(std::string("387"), std::string("386"))); - EXPECT_TRUE(util::relaxed_greater_equal(std::string("387"), std::string("387"))); - EXPECT_FALSE(util::relaxed_greater_equal(uint64_t(387), std::string("386"))); - EXPECT_FALSE(util::relaxed_greater_equal(uint64_t(387), std::string("387"))); - EXPECT_FALSE(util::relaxed_greater_equal(int64_t(387), std::string("386"))); - EXPECT_FALSE(util::relaxed_greater_equal(int64_t(387), std::string("387"))); - EXPECT_FALSE(util::relaxed_greater_equal(double(387), std::string("386"))); - EXPECT_FALSE(util::relaxed_greater_equal(double(387), std::string("387"))); - EXPECT_FALSE(util::relaxed_greater_equal(bool(true), std::string("0"))); - - EXPECT_FALSE(util::relaxed_greater_equal(std::string("387"), uint64_t(386))); - EXPECT_FALSE(util::relaxed_greater_equal(std::string("387"), uint64_t(387))); - EXPECT_TRUE(util::relaxed_greater_equal(uint64_t(387), uint64_t(386))); - EXPECT_TRUE(util::relaxed_greater_equal(uint64_t(387), uint64_t(387))); - EXPECT_TRUE(util::relaxed_greater_equal(int64_t(387), uint64_t(386))); - EXPECT_TRUE(util::relaxed_greater_equal(int64_t(387), uint64_t(387))); - EXPECT_TRUE(util::relaxed_greater_equal(double(387), uint64_t(386))); - EXPECT_TRUE(util::relaxed_greater_equal(double(387), uint64_t(387))); - EXPECT_FALSE(util::relaxed_greater_equal(bool(true), uint64_t(0))); - - EXPECT_FALSE(util::relaxed_greater_equal(std::string("387"), int64_t(386))); - EXPECT_FALSE(util::relaxed_greater_equal(std::string("387"), int64_t(387))); - EXPECT_TRUE(util::relaxed_greater_equal(uint64_t(387), int64_t(386))); - EXPECT_TRUE(util::relaxed_greater_equal(uint64_t(387), int64_t(387))); - EXPECT_TRUE(util::relaxed_greater_equal(int64_t(387), int64_t(386))); - EXPECT_TRUE(util::relaxed_greater_equal(int64_t(387), int64_t(387))); - EXPECT_TRUE(util::relaxed_greater_equal(double(387), int64_t(386))); - EXPECT_TRUE(util::relaxed_greater_equal(double(387), int64_t(387))); - EXPECT_FALSE(util::relaxed_greater_equal(bool(true), int64_t(0))); - - EXPECT_FALSE(util::relaxed_greater_equal(std::string("387"), double(386.7))); - EXPECT_FALSE(util::relaxed_greater_equal(std::string("387"), double(387))); - EXPECT_TRUE(util::relaxed_greater_equal(uint64_t(387), double(386.7))); - EXPECT_TRUE(util::relaxed_greater_equal(uint64_t(387), double(387))); - EXPECT_TRUE(util::relaxed_greater_equal(int64_t(387), double(386.7))); - EXPECT_TRUE(util::relaxed_greater_equal(int64_t(387), double(387))); - EXPECT_TRUE(util::relaxed_greater_equal(double(387), double(386.7))); - EXPECT_TRUE(util::relaxed_greater_equal(double(387), double(387))); - EXPECT_FALSE(util::relaxed_greater_equal(bool(true), double(0))); - - EXPECT_FALSE(util::relaxed_greater_equal(std::string("387"), bool(false))); - EXPECT_FALSE(util::relaxed_greater_equal(std::string("387"), bool(true))); - EXPECT_FALSE(util::relaxed_greater_equal(uint64_t(387), bool(false))); - EXPECT_FALSE(util::relaxed_greater_equal(uint64_t(387), bool(true))); - EXPECT_FALSE(util::relaxed_greater_equal(int64_t(387), bool(false))); - EXPECT_FALSE(util::relaxed_greater_equal(int64_t(387), bool(true))); - EXPECT_FALSE(util::relaxed_greater_equal(double(387), bool(false))); - EXPECT_FALSE(util::relaxed_greater_equal(double(387), bool(true))); - EXPECT_TRUE(util::relaxed_greater_equal(bool(true), bool(false))); - EXPECT_TRUE(util::relaxed_greater_equal(bool(true), bool(true))); - - - - - EXPECT_FALSE(util::relaxed_greater_equal(std::string("387"), std::string("388"))); - EXPECT_FALSE(util::relaxed_greater_equal(uint64_t(387), std::string("388"))); - EXPECT_FALSE(util::relaxed_greater_equal(int64_t(387), std::string("388"))); - EXPECT_FALSE(util::relaxed_greater_equal(double(387), std::string("388"))); - - EXPECT_FALSE(util::relaxed_greater_equal(std::string("387"), uint64_t(388))); - EXPECT_FALSE(util::relaxed_greater_equal(uint64_t(387), uint64_t(388))); - EXPECT_FALSE(util::relaxed_greater_equal(int64_t(387), uint64_t(388))); - EXPECT_FALSE(util::relaxed_greater_equal(double(387), uint64_t(388))); - - EXPECT_FALSE(util::relaxed_greater_equal(std::string("387"), int64_t(388))); - EXPECT_FALSE(util::relaxed_greater_equal(uint64_t(387), int64_t(388))); - EXPECT_FALSE(util::relaxed_greater_equal(int64_t(387), int64_t(388))); - EXPECT_FALSE(util::relaxed_greater_equal(double(387), int64_t(388))); - - EXPECT_FALSE(util::relaxed_greater_equal(std::string("387"), double(388.7))); - EXPECT_FALSE(util::relaxed_greater_equal(uint64_t(387), double(388.7))); - EXPECT_FALSE(util::relaxed_greater_equal(int64_t(387), double(388.7))); - EXPECT_FALSE(util::relaxed_greater_equal(double(387), double(388.7))); -} - - -TEST(Variant, RelaxedLess) { - EXPECT_TRUE(util::relaxed_less(std::string("387"), std::string("388"))); - EXPECT_FALSE(util::relaxed_less(uint64_t(387), std::string("388"))); - EXPECT_FALSE(util::relaxed_less(int64_t(387), std::string("388"))); - EXPECT_FALSE(util::relaxed_less(double(387), std::string("388"))); - EXPECT_FALSE(util::relaxed_less(bool(false), std::string("388"))); - EXPECT_FALSE(util::relaxed_less(bool(false), std::string("1"))); - - EXPECT_FALSE(util::relaxed_less(std::string("387"), uint64_t(388))); - EXPECT_TRUE(util::relaxed_less(uint64_t(387), uint64_t(388))); - EXPECT_TRUE(util::relaxed_less(int64_t(387), uint64_t(388))); - EXPECT_TRUE(util::relaxed_less(double(387), uint64_t(388))); - EXPECT_FALSE(util::relaxed_less(bool(false), uint64_t(388))); - EXPECT_FALSE(util::relaxed_less(bool(false), uint64_t(1))); - - EXPECT_FALSE(util::relaxed_less(std::string("387"), int64_t(388))); - EXPECT_TRUE(util::relaxed_less(uint64_t(387), int64_t(388))); - EXPECT_TRUE(util::relaxed_less(int64_t(387), int64_t(388))); - EXPECT_TRUE(util::relaxed_less(double(387), int64_t(388))); - EXPECT_FALSE(util::relaxed_less(bool(false), int64_t(388))); - EXPECT_FALSE(util::relaxed_less(bool(false), int64_t(1))); - - EXPECT_FALSE(util::relaxed_less(std::string("387"), double(387.7))); - EXPECT_TRUE(util::relaxed_less(uint64_t(387), double(387.7))); - EXPECT_TRUE(util::relaxed_less(int64_t(387), double(387.7))); - EXPECT_TRUE(util::relaxed_less(double(387), double(387.7))); - EXPECT_FALSE(util::relaxed_less(bool(false), double(387))); - EXPECT_FALSE(util::relaxed_less(bool(false), double(1))); - - EXPECT_FALSE(util::relaxed_less(std::string("0"), bool(true))); - EXPECT_FALSE(util::relaxed_less(uint64_t(0), bool(true))); - EXPECT_FALSE(util::relaxed_less(int64_t(0), bool(true))); - EXPECT_FALSE(util::relaxed_less(double(0), bool(true))); - EXPECT_TRUE(util::relaxed_less(bool(false), bool(true))); - - EXPECT_FALSE(util::relaxed_less(bool(true), std::string("386"))); - EXPECT_FALSE(util::relaxed_less(bool(true), uint64_t(386))); - EXPECT_FALSE(util::relaxed_less(bool(true), int64_t(386))); - EXPECT_FALSE(util::relaxed_less(bool(true), double(386))); - - - - - EXPECT_FALSE(util::relaxed_less(std::string("387"), std::string("386"))); - EXPECT_FALSE(util::relaxed_less(uint64_t(387), std::string("386"))); - EXPECT_FALSE(util::relaxed_less(int64_t(387), std::string("386"))); - EXPECT_FALSE(util::relaxed_less(double(387), std::string("386"))); - - EXPECT_FALSE(util::relaxed_less(std::string("387"), uint64_t(386))); - EXPECT_FALSE(util::relaxed_less(uint64_t(387), uint64_t(386))); - EXPECT_FALSE(util::relaxed_less(int64_t(387), uint64_t(386))); - EXPECT_FALSE(util::relaxed_less(double(387), uint64_t(386))); - - EXPECT_FALSE(util::relaxed_less(std::string("387"), int64_t(386))); - EXPECT_FALSE(util::relaxed_less(uint64_t(387), int64_t(386))); - EXPECT_FALSE(util::relaxed_less(int64_t(387), int64_t(386))); - EXPECT_FALSE(util::relaxed_less(double(387), int64_t(386))); - - EXPECT_FALSE(util::relaxed_less(std::string("387"), double(386.7))); - EXPECT_FALSE(util::relaxed_less(uint64_t(387), double(386.7))); - EXPECT_FALSE(util::relaxed_less(int64_t(387), double(386.7))); - EXPECT_FALSE(util::relaxed_less(double(387), double(386.7))); - - EXPECT_FALSE(util::relaxed_less(std::string("387"), bool(true))); - EXPECT_FALSE(util::relaxed_less(uint64_t(387), bool(true))); - EXPECT_FALSE(util::relaxed_less(int64_t(387), bool(true))); - EXPECT_FALSE(util::relaxed_less(double(387), bool(true))); - EXPECT_FALSE(util::relaxed_less(bool(true), bool(true))); - EXPECT_FALSE(util::relaxed_less(bool(false), bool(false))); -} - - -TEST(Variant, RelaxedLessEqual) { - EXPECT_TRUE(util::relaxed_less_equal(std::string("387"), std::string("388"))); - EXPECT_TRUE(util::relaxed_less_equal(std::string("387"), std::string("387"))); - EXPECT_FALSE(util::relaxed_less_equal(uint64_t(387), std::string("388"))); - EXPECT_FALSE(util::relaxed_less_equal(uint64_t(387), std::string("387"))); - EXPECT_FALSE(util::relaxed_less_equal(int64_t(387), std::string("388"))); - EXPECT_FALSE(util::relaxed_less_equal(int64_t(387), std::string("387"))); - EXPECT_FALSE(util::relaxed_less_equal(double(387), std::string("388"))); - EXPECT_FALSE(util::relaxed_less_equal(double(387), std::string("387"))); - EXPECT_FALSE(util::relaxed_less_equal(bool(false), std::string("388"))); - EXPECT_FALSE(util::relaxed_less_equal(bool(false), std::string("1"))); - EXPECT_FALSE(util::relaxed_less_equal(bool(false), std::string("0"))); - - EXPECT_FALSE(util::relaxed_less_equal(std::string("387"), uint64_t(388))); - EXPECT_FALSE(util::relaxed_less_equal(std::string("387"), uint64_t(387))); - EXPECT_TRUE(util::relaxed_less_equal(uint64_t(387), uint64_t(388))); - EXPECT_TRUE(util::relaxed_less_equal(uint64_t(387), uint64_t(387))); - EXPECT_TRUE(util::relaxed_less_equal(int64_t(387), uint64_t(388))); - EXPECT_TRUE(util::relaxed_less_equal(int64_t(387), uint64_t(387))); - EXPECT_TRUE(util::relaxed_less_equal(double(387), uint64_t(388))); - EXPECT_TRUE(util::relaxed_less_equal(double(387), uint64_t(387))); - EXPECT_FALSE(util::relaxed_less_equal(bool(false), uint64_t(388))); - EXPECT_FALSE(util::relaxed_less_equal(bool(false), uint64_t(1))); - EXPECT_FALSE(util::relaxed_less_equal(bool(false), uint64_t(0))); - - EXPECT_FALSE(util::relaxed_less_equal(std::string("387"), int64_t(388))); - EXPECT_FALSE(util::relaxed_less_equal(std::string("387"), int64_t(387))); - EXPECT_TRUE(util::relaxed_less_equal(uint64_t(387), int64_t(388))); - EXPECT_TRUE(util::relaxed_less_equal(uint64_t(387), int64_t(387))); - EXPECT_TRUE(util::relaxed_less_equal(int64_t(387), int64_t(388))); - EXPECT_TRUE(util::relaxed_less_equal(int64_t(387), int64_t(387))); - EXPECT_TRUE(util::relaxed_less_equal(double(387), int64_t(388))); - EXPECT_TRUE(util::relaxed_less_equal(double(387), int64_t(387))); - EXPECT_FALSE(util::relaxed_less_equal(bool(false), int64_t(388))); - EXPECT_FALSE(util::relaxed_less_equal(bool(false), int64_t(1))); - EXPECT_FALSE(util::relaxed_less_equal(bool(false), int64_t(0))); - - EXPECT_FALSE(util::relaxed_less_equal(std::string("387"), double(387.7))); - EXPECT_FALSE(util::relaxed_less_equal(std::string("387"), double(387))); - EXPECT_TRUE(util::relaxed_less_equal(uint64_t(387), double(387.7))); - EXPECT_TRUE(util::relaxed_less_equal(uint64_t(387), double(387))); - EXPECT_TRUE(util::relaxed_less_equal(int64_t(387), double(387.7))); - EXPECT_TRUE(util::relaxed_less_equal(int64_t(387), double(387))); - EXPECT_TRUE(util::relaxed_less_equal(double(387), double(387.7))); - EXPECT_TRUE(util::relaxed_less_equal(double(387), double(387))); - EXPECT_FALSE(util::relaxed_less_equal(bool(false), double(387))); - EXPECT_FALSE(util::relaxed_less_equal(bool(false), double(1))); - EXPECT_FALSE(util::relaxed_less_equal(bool(false), double(0))); - - EXPECT_FALSE(util::relaxed_less_equal(std::string("0"), bool(true))); - EXPECT_FALSE(util::relaxed_less_equal(std::string("0"), bool(false))); - EXPECT_FALSE(util::relaxed_less_equal(uint64_t(0), bool(true))); - EXPECT_FALSE(util::relaxed_less_equal(uint64_t(0), bool(false))); - EXPECT_FALSE(util::relaxed_less_equal(int64_t(0), bool(true))); - EXPECT_FALSE(util::relaxed_less_equal(int64_t(0), bool(false))); - EXPECT_FALSE(util::relaxed_less_equal(double(0), bool(true))); - EXPECT_FALSE(util::relaxed_less_equal(double(0), bool(false))); - EXPECT_TRUE(util::relaxed_less_equal(bool(false), bool(true))); - EXPECT_TRUE(util::relaxed_less_equal(bool(false), bool(false))); - - - - - EXPECT_FALSE(util::relaxed_less_equal(std::string("387"), std::string("386"))); - EXPECT_FALSE(util::relaxed_less_equal(uint64_t(387), std::string("386"))); - EXPECT_FALSE(util::relaxed_less_equal(int64_t(387), std::string("386"))); - EXPECT_FALSE(util::relaxed_less_equal(double(387), std::string("386"))); - - EXPECT_FALSE(util::relaxed_less_equal(std::string("387"), uint64_t(386))); - EXPECT_FALSE(util::relaxed_less_equal(uint64_t(387), uint64_t(386))); - EXPECT_FALSE(util::relaxed_less_equal(int64_t(387), uint64_t(386))); - EXPECT_FALSE(util::relaxed_less_equal(double(387), uint64_t(386))); - - EXPECT_FALSE(util::relaxed_less_equal(std::string("387"), int64_t(386))); - EXPECT_FALSE(util::relaxed_less_equal(uint64_t(387), int64_t(386))); - EXPECT_FALSE(util::relaxed_less_equal(int64_t(387), int64_t(386))); - EXPECT_FALSE(util::relaxed_less_equal(double(387), int64_t(386))); - - EXPECT_FALSE(util::relaxed_less_equal(std::string("387"), double(386.7))); - EXPECT_FALSE(util::relaxed_less_equal(uint64_t(387), double(386.7))); - EXPECT_FALSE(util::relaxed_less_equal(int64_t(387), double(386.7))); - EXPECT_FALSE(util::relaxed_less_equal(double(387), double(386.7))); -} diff --git a/test/test.gypi b/test/test.gypi index 6c2e8ad493..4f0726eb16 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -59,10 +59,9 @@ 'style/source.cpp', 'style/style.cpp', 'style/style_layer.cpp', - 'style/comparisons.cpp', + 'style/filter.cpp', 'style/functions.cpp', 'style/style_parser.cpp', - 'style/variant.cpp', 'sprite/sprite_atlas.cpp', 'sprite/sprite_image.cpp', |