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

better not to rely on implicit conversion to bool but use pointer comparison with nullptr

Browse source
This commit is contained in:
artemp 2015-06-10 11:42:34 +01:00
parent e5f1379fea
commit 793a2f9ffb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/standalone/csv_test.cpp
View file

@ -47,7 +47,7 @@ mapnik::datasource_ptr get_csv_ds(std::string const &file_name, bool strict = tr
params["strict"] = mapnik::value_bool(strict); params["strict"] = mapnik::value_bool(strict);
auto ds = mapnik::datasource_cache::instance().create(params); auto ds = mapnik::datasource_cache::instance().create(params);
// require a non-null pointer returned // require a non-null pointer returned
REQUIRE(bool(ds)); REQUIRE(ds != nullptr);
return ds; return ds;
} }
@ -298,7 +298,7 @@ TEST_CASE("csv") {
require_field_names(fields, {"x", "y", "name"}); require_field_names(fields, {"x", "y", "name"});
// NOTE: y column is integer, even though a double value is used below in the test? // NOTE: y column is integer, even though a double value is used below in the test?
require_field_types(fields, {mapnik::Integer, mapnik::Integer, mapnik::String}); require_field_types(fields, {mapnik::Integer, mapnik::Integer, mapnik::String});
auto featureset = all_features(ds); auto featureset = all_features(ds);
require_attributes(featureset->next(), { require_attributes(featureset->next(), {
attr{"x", 0} attr{"x", 0}
@ -321,7 +321,7 @@ TEST_CASE("csv") {
auto fields = ds->get_descriptor().get_descriptors(); auto fields = ds->get_descriptor().get_descriptors();
require_field_names(fields, {"type"}); require_field_names(fields, {"type"});
require_field_types(fields, {mapnik::String}); require_field_types(fields, {mapnik::String});
auto featureset = all_features(ds); auto featureset = all_features(ds);
require_geometry(featureset->next(), 1, geometry_types::Point); require_geometry(featureset->next(), 1, geometry_types::Point);
require_geometry(featureset->next(), 1, geometry_types::LineString); require_geometry(featureset->next(), 1, geometry_types::LineString);
@ -536,7 +536,7 @@ TEST_CASE("csv") {
auto fields = ds->get_descriptor().get_descriptors(); auto fields = ds->get_descriptor().get_descriptors();
require_field_names(fields, {"type"}); require_field_names(fields, {"type"});
require_field_types(fields, {mapnik::String}); require_field_types(fields, {mapnik::String});
auto featureset = all_features(ds); auto featureset = all_features(ds);
require_geometry(featureset->next(), 1, geometry_types::Point); require_geometry(featureset->next(), 1, geometry_types::Point);
require_geometry(featureset->next(), 1, geometry_types::LineString); require_geometry(featureset->next(), 1, geometry_types::LineString);