minor unit test cleanups to prepare to test amalgamation

test/unit/color/css_color.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 #include <mapnik/css_color_grammar.hpp>
 #include <mapnik/css_color_grammar_impl.hpp>

test/unit/core/box2d_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/coord.hpp>

test/unit/core/comparison_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/value_types.hpp>

test/unit/core/conversions_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/value_types.hpp>

test/unit/core/exceptions_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <iostream>

test/unit/core/expressions_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch_ext.hpp"
 
 #include <mapnik/expression.hpp>

test/unit/core/params_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <iostream>

test/unit/core/value_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/value_types.hpp>

test/unit/datasource/csv.cpp

@@ -79,31 +79,11 @@ mapnik::datasource_ptr get_csv_ds(std::string const& file_name, bool strict = tr
     return ds;
 }
 
-int create_disk_index(std::string const& filename, bool silent = true)
-{
-    std::string cmd;
-    if (std::getenv("DYLD_LIBRARY_PATH") != nullptr)
-    {
-        cmd += std::string("DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " ";
-    }
-    cmd += "mapnik-index " + filename;
-    if (silent)
-    {
-#ifndef _WINDOWS
-        cmd += " 2>/dev/null";
-#else
-        cmd += " 2> nul";
-#endif
-    }
-    return std::system(cmd.c_str());
-}
-
 } // anonymous namespace
 
-static const std::string csv_plugin("./plugins/input/csv.input");
-
 TEST_CASE("csv") {
 
+    std::string csv_plugin("./plugins/input/csv.input");
     if (mapnik::util::exists(csv_plugin))
     {
         // make the tests silent since we intentionally test error conditions that are noisy

test/unit/datasource/ds_test_util.hpp

@@ -20,6 +20,10 @@
  *
  *****************************************************************************/
 
+
+#ifndef MAPNIK_UNIT_DATSOURCE_UTIL
+#define MAPNIK_UNIT_DATSOURCE_UTIL
+
 #include "catch.hpp"
 
 #include <mapnik/datasource.hpp>
@@ -176,4 +180,25 @@ inline void require_geometry(mapnik::feature_ptr feature,
     CHECK(feature_count(feature->get_geometry()) == num_parts);
 }
 
+inline int create_disk_index(std::string const& filename, bool silent = true)
+{
+    std::string cmd;
+    if (std::getenv("DYLD_LIBRARY_PATH") != nullptr)
+    {
+        cmd += std::string("DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " ";
     }
+    cmd += "mapnik-index " + filename;
+    if (silent)
+    {
+#ifndef _WINDOWS
+        cmd += " 2>/dev/null";
+#else
+        cmd += " 2> nul";
+#endif
+    }
+    return std::system(cmd.c_str());
+}
+
+}
+
+#endif // MAPNIK_UNIT_DATSOURCE_UTIL

test/unit/datasource/geojson.cpp

@@ -62,25 +62,6 @@ std::pair<mapnik::datasource_ptr,mapnik::feature_ptr> fetch_first_feature(std::s
     return std::make_pair(ds,feature);
 }
 
-int create_disk_index(std::string const& filename, bool silent = true)
-{
-    std::string cmd;
-    if (std::getenv("DYLD_LIBRARY_PATH") != nullptr)
-    {
-        cmd += std::string("DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " ";
-    }
-    cmd += "mapnik-index " + filename;
-    if (silent)
-    {
-#ifndef _WINDOWS
-        cmd += " 2>/dev/null";
-#else
-        cmd += " 2> nul";
-#endif
-    }
-    return std::system(cmd.c_str());
-}
-
 }
 
 TEST_CASE("geojson") {

test/unit/font/fontset_runtime_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/memory_datasource.hpp>

test/unit/geometry/centroid.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/geometry_centroid.hpp>

test/unit/geometry/geometry.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/geometry.hpp>

test/unit/geometry/geometry_envelope_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/geometry.hpp>

test/unit/geometry/geometry_equal.hpp

@@ -1,3 +1,7 @@
+
+#ifndef MAPNIK_UNIT_GEOMETRY_EQUAL
+#define MAPNIK_UNIT_GEOMETRY_EQUAL
+
 #include "catch.hpp"
 
 // boost
@@ -214,3 +218,5 @@ void assert_g_equal(T const& g1, T const& g2)
 {
     return geometry_equal_visitor()(g1,g2);
 }
+
+#endif // MAPNIK_UNIT_GEOMETRY_EQUAL

test/unit/geometry/geometry_hit_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/geometry.hpp>

test/unit/geometry/geometry_is_simple.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <boost/version.hpp>

test/unit/geometry/geometry_is_valid.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/geometry.hpp>

test/unit/geometry/geometry_reprojection.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 #include "geometry_equal.hpp"
 

test/unit/geometry/geometry_strategy_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 #include "geometry_equal.hpp"
 

test/unit/geometry/has_empty.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/geometry_is_empty.hpp>

test/unit/geometry/is_empty.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/geometry_is_empty.hpp>

test/unit/geometry/remove_empty.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/geometry_remove_empty.hpp>

test/unit/imaging/image.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 // mapnik

test/unit/imaging/image_apply_opacity.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 // mapnik

test/unit/imaging/image_filter.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 // mapnik

test/unit/imaging/image_io_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <iostream>

test/unit/imaging/image_is_solid.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 // mapnik

test/unit/imaging/image_painted_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <iostream>

test/unit/imaging/image_premultiply.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 // mapnik

test/unit/imaging/image_set_pixel.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 // mapnik

test/unit/imaging/image_view.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 // mapnik

test/unit/numerics/enumeration.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 #include <mapnik/enumeration.hpp>
 #include <mapnik/symbolizer_enumerations.hpp>

test/unit/numerics/safe_cast.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 #include <mapnik/safe_cast.hpp>
 

test/unit/pixel/agg_blend_src_over_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <iostream>

test/unit/pixel/palette.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/palette.hpp>

test/unit/projection/proj_transform.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/projection.hpp>

test/unit/serialization/wkb_formats_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <iostream>

test/unit/serialization/xml_parser_trim.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/xml_tree.hpp>

test/unit/svg/svg_parser_test.cpp

@@ -317,7 +317,7 @@ TEST_CASE("SVG parser") {
                                                                     std::make_tuple(0, 10,2),
                                                                     std::make_tuple(0, 10,95)};
 
-        REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin(),detail::vertex_equal<3>()));
+        REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin(),vertex_equal<3>()));
     }
 
     SECTION("SVG viewbox fallback")
@@ -377,7 +377,7 @@ TEST_CASE("SVG parser") {
                                                                     std::make_tuple(0, 10,2),
                                                                     std::make_tuple(0, 10,95)};
 
-        REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin(),detail::vertex_equal<3>()));
+        REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin(),vertex_equal<3>()));
     }
 
     SECTION("SVG beveled <rect>")

test/unit/svg/svg_path_parser_test.cpp

@@ -50,7 +50,7 @@ void test_path_parser(std::string const& str, Expected const& expected)
         vec.emplace_back(x, y, cmd);
         //std::cerr << "std::make_tuple(" << x << ", " << y << ", " << cmd  << ")," << std::endl;
     }
-    REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin(), detail::vertex_equal<3>()));
+    REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin(), vertex_equal<3>()));
 }
 } // anonymous ns
 

test/unit/svg/util.hpp

@@ -25,7 +25,7 @@
 
 #include <cmath>
 
-namespace detail {
+namespace {
 
 template <int N = 6>
 struct vertex_equal

test/unit/symbolizer/symbolizer_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <iostream>

test/unit/text/shaping.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 #include <mapnik/text/icu_shaper.hpp>
 #include <mapnik/text/harfbuzz_shaper.hpp>

test/unit/vertex_adapter/clipping_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 // mapnik

test/unit/vertex_adapter/line_offset_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 // mapnik

test/unit/vertex_adapter/offset_converter.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 // mapnik

test/unit/vertex_adapter/simplify_converters_test.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 //#include <mapnik/wkt/wkt_factory.hpp>

test/unit/vertex_adapter/vertex_adapter.cpp

@@ -1,3 +1,4 @@
+
 #include "catch.hpp"
 
 #include <mapnik/vertex_adapters.hpp>