Merge pull request #1195 from joto/reorg-tests-extract-flex-box

Extract flex get_bbox() tests into their own file

Author: lonvia

tests/CMakeLists.txt

@@ -74,6 +74,7 @@ if (HAVE_LUA)
     set_test(test-output-flex)
     set_test(test-output-flex-area)
     set_test(test-output-flex-attr)
+    set_test(test-output-flex-bbox)
     set_test(test-output-flex-extra)
     set_test(test-output-flex-invalid-geom)
     set_test(test-output-flex-lua-fail)

tests/data/test_output_flex_bbox.lua

@@ -0,0 +1,40 @@
+
+local points = osm2pgsql.define_node_table('osm2pgsql_test_points', {
+    { column = 'tags',  type = 'hstore' },
+    { column = 'min_x', type = 'real' },
+    { column = 'min_y', type = 'real' },
+    { column = 'max_x', type = 'real' },
+    { column = 'max_y', type = 'real' },
+    { column = 'geom',  type = 'point' },
+})
+
+local highways = osm2pgsql.define_way_table('osm2pgsql_test_highways', {
+    { column = 'tags',  type = 'hstore' },
+    { column = 'min_x', type = 'real' },
+    { column = 'min_y', type = 'real' },
+    { column = 'max_x', type = 'real' },
+    { column = 'max_y', type = 'real' },
+    { column = 'geom',  type = 'linestring' },
+})
+
+function osm2pgsql.process_node(object)
+    local row = {
+        tags = object.tags,
+    }
+
+    row.min_x, row.min_y, row.max_x, row.max_y = object:get_bbox()
+
+    points:add_row(row)
+end
+
+function osm2pgsql.process_way(object)
+    local row = {
+        tags = object.tags,
+        geom = { create = 'line' }
+    }
+
+    row.min_x, row.min_y, row.max_x, row.max_y = object:get_bbox()
+
+    highways:add_row(row)
+end
+

tests/data/test_output_flex_extra.lua

@@ -7,10 +7,6 @@ tables.highways = osm2pgsql.define_table{
     columns = {
         { column = 'tags',  type = 'hstore' },
         { column = 'refs',  type = 'text' },
-        { column = 'min_x', type = 'real' },
-        { column = 'min_y', type = 'real' },
-        { column = 'max_x', type = 'real' },
-        { column = 'max_y', type = 'real' },
         { column = 'geom',  type = 'linestring' },
     }
 }
@@ -38,8 +34,6 @@ function osm2pgsql.process_way(object)
         geom = { create = 'line' }
     }
 
-    row.min_x, row.min_y, row.max_x, row.max_y = object:get_bbox()
-
     -- if there is any data from relations, add it in
     local d = by_way_id[object.id]
     if d then

tests/test-output-flex-bbox.cpp

@@ -0,0 +1,43 @@
+#include <catch.hpp>
+
+#include "common-import.hpp"
+#include "common-options.hpp"
+
+static testing::db::import_t db;
+
+TEST_CASE("bbox on nodes and ways")
+{
+    testing::opt_t options = testing::opt_t()
+                                 .flex("test_output_flex_bbox.lua")
+                                 .srs(PROJ_LATLONG);
+
+    REQUIRE_NOTHROW(db.run_import(options,
+                                  "n10 v1 dV Ta=b x10.0 y10.0\n"
+                                  "n11 v1 dV Ta=b x10.0 y10.2\n"
+                                  "n12 v1 dV Ta=b x10.2 y10.2\n"
+                                  "w20 v1 dV Thighway=primary Nn10,n11,n12\n"));
+
+    auto conn = db.db().connect();
+
+    CHECK(3 == conn.get_count("osm2pgsql_test_points"));
+
+    CHECK(1 == conn.get_count("osm2pgsql_test_points",
+                              "ST_AsText(geom) = 'POINT(10 10)'"));
+
+    CHECK(1 == conn.get_count(
+                   "osm2pgsql_test_points",
+                   "abs(min_x - 10.0) < 0.01 AND abs(min_y - 10.0) < 0.01 AND "
+                   "abs(max_x - 10.0) < 0.01 AND abs(max_y - 10.0) < 0.01"));
+
+    CHECK(1 == conn.get_count("osm2pgsql_test_highways"));
+
+    CHECK(1 == conn.get_count(
+                   "osm2pgsql_test_highways",
+                   "ST_AsText(geom) = 'LINESTRING(10 10,10 10.2,10.2 10.2)'"));
+
+    CHECK(1 == conn.get_count(
+                   "osm2pgsql_test_highways",
+                   "abs(min_x - 10.0) < 0.01 AND abs(min_y - 10.0) < 0.01 AND "
+                   "abs(max_x - 10.2) < 0.01 AND abs(max_y - 10.2) < 0.01"));
+}
+

tests/test-output-flex-extra.cpp

@@ -117,11 +117,6 @@ TEST_CASE("relation data on ways")
     CHECK(2 == conn.get_count("osm2pgsql_test_highways", "refs = 'X11'"));
     CHECK(1 == conn.get_count("osm2pgsql_test_highways", "refs IS NULL"));
 
-    CHECK(1 == conn.get_count(
-                   "osm2pgsql_test_highways",
-                   "abs(min_x - 10.0) < 0.01 AND abs(min_y - 10.0) < 0.01 AND "
-                   "abs(max_x - 10.2) < 0.01 AND abs(max_y - 10.2) < 0.01"));
-
     CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '20,21'"));
 
     // move node in way in the relation
@@ -138,11 +133,6 @@ TEST_CASE("relation data on ways")
     CHECK(2 == conn.get_count("osm2pgsql_test_highways", "refs = 'X11'"));
     CHECK(1 == conn.get_count("osm2pgsql_test_highways", "refs IS NULL"));
 
-    CHECK(1 == conn.get_count(
-                   "osm2pgsql_test_highways",
-                   "abs(min_x - 10.0) < 0.01 AND abs(min_y - 10.0) < 0.01 AND "
-                   "abs(max_x - 10.2) < 0.01 AND abs(max_y - 10.2) < 0.01"));
-
     CHECK(1 == conn.get_count("osm2pgsql_test_routes", "members = '20,21'"));
 
     // add the third way to the relation