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

datasource tests: also check value types in REQUIRE_ATTRIBUTES

Browse source
This commit is contained in:
Mickey Rose 2018-06-30 15:04:35 +02:00
parent bf1c55b627
commit fa0d4c923f
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
test/unit/datasource/ds_test_util.hpp
View file

@ -107,13 +107,20 @@ inline std::size_t count_features(mapnik::featureset_ptr features) {
using attr = std::tuple<std::string, mapnik::value>; using attr = std::tuple<std::string, mapnik::value>;
#define REQUIRE_ATTRIBUTES(feature, attrs) \ #define REQUIRE_ATTRIBUTES(feature, ...) \
REQUIRE(bool(feature)); \ do { \
for (auto const &kv : attrs) { \ auto const& _feat = (feature); /* evaluate feature only once */ \
REQUIRE(feature->has_key(std::get<0>(kv))); \ REQUIRE(_feat != nullptr); \
CHECK(feature->get(std::get<0>(kv)) == std::get<1>(kv)); \ for (auto const& kv : __VA_ARGS__) { \
} \ auto& key = std::get<0>(kv); \
auto& val = std::get<1>(kv); \
CAPTURE(key); \
CHECKED_IF(_feat->has_key(key)) { \
CHECK(_feat->get(key) == val); \
CHECK(_feat->get(key).which() == val.which()); \
} \
} \
} while (0)
inline void require_attributes(mapnik::feature_ptr feature, inline void require_attributes(mapnik::feature_ptr feature,
std::initializer_list<attr> const &attrs) { std::initializer_list<attr> const &attrs) {