Cleanup flex-area test: Use minimal config file for this test

Author: joto

tests/data/test_output_flex_area.lua

@@ -0,0 +1,33 @@
+
+local polygons = osm2pgsql.define_table{
+    name = 'osm2pgsql_test_polygon',
+    ids = { type = 'area', id_column = 'osm_id' },
+    columns = {
+        { column = 'name', type = 'text' },
+        { column = 'geom', type = 'geometry' },
+        { column = 'area', type = 'area' },
+    }
+}
+
+function is_empty(some_table)
+    return next(some_table) == nil
+end
+
+function osm2pgsql.process_way(object)
+    if is_empty(object.tags) then
+        return
+    end
+
+    polygons:add_row({
+        name = object.tags.name,
+        geom = { create = 'area' }
+    })
+end
+
+function osm2pgsql.process_relation(object)
+    polygons:add_row({
+        name = object.tags.name,
+        geom = { create = 'area', multi = false }
+    })
+end
+

tests/test-output-flex-area.cpp

@@ -5,12 +5,14 @@
 
 static testing::db::import_t db;
 
-TEST_CASE("default projection")
+static char const *const conf_file = "test_output_flex_area.lua";
+static char const *const data_file = "test_output_pgsql_area.osm";
+
+TEST_CASE("area calculation in default projection")
 {
-    options_t const options =
-        testing::opt_t().slim().flex("test_output_flex.lua");
+    options_t const options = testing::opt_t().flex(conf_file);
 
-    REQUIRE_NOTHROW(db.run_file(options, "test_output_pgsql_area.osm"));
+    REQUIRE_NOTHROW(db.run_file(options, data_file));
 
     auto conn = db.db().connect();
 
@@ -23,29 +25,28 @@ TEST_CASE("default projection")
         "SELECT area FROM osm2pgsql_test_polygon WHERE name='multi'");
 }
 
-TEST_CASE("latlon projection")
+TEST_CASE("area calculation in latlon projection")
 {
     options_t const options =
-        testing::opt_t().slim().flex("test_output_flex.lua").srs(PROJ_LATLONG);
+        testing::opt_t().flex(conf_file).srs(PROJ_LATLONG);
 
-    REQUIRE_NOTHROW(db.run_file(options, "test_output_pgsql_area.osm"));
+    REQUIRE_NOTHROW(db.run_file(options, data_file));
 
     auto conn = db.db().connect();
 
     REQUIRE(2 == conn.get_count("osm2pgsql_test_polygon"));
     conn.assert_double(
-        1, "SELECT area FROM osm2pgsql_test_polygon WHERE name='poly'");
+        1.0, "SELECT area FROM osm2pgsql_test_polygon WHERE name='poly'");
     conn.assert_double(
-        8, "SELECT area FROM osm2pgsql_test_polygon WHERE name='multi'");
+        8.0, "SELECT area FROM osm2pgsql_test_polygon WHERE name='multi'");
 }
 
-TEST_CASE("latlon projection with way area reprojection")
+TEST_CASE("area calculation in latlon projection with way area reprojection")
 {
-    options_t options =
-        testing::opt_t().slim().flex("test_output_flex.lua").srs(PROJ_LATLONG);
+    options_t options = testing::opt_t().flex(conf_file).srs(PROJ_LATLONG);
     options.reproject_area = true;
 
-    REQUIRE_NOTHROW(db.run_file(options, "test_output_pgsql_area.osm"));
+    REQUIRE_NOTHROW(db.run_file(options, data_file));
 
     auto conn = db.db().connect();