Merge pull request #1243 from joto/test-flex-example-configs

Add minimal testing of flex example configs

Author: lonvia

flex-config/simple.lua

@@ -5,7 +5,7 @@
 -- "geometries.lua".
 
 -- For debugging
-inspect = require('inspect')
+-- inspect = require('inspect')
 
 -- The global variable "osm2pgsql" is used to talk to the main osm2pgsql code.
 -- You can, for instance, get the version of osm2pgsql:
@@ -59,7 +59,7 @@ tables.polygons = osm2pgsql.define_area_table('polygons', {
 for name, dtable in pairs(tables) do
     print("\ntable '" .. name .. "':")
     print("  name='" .. dtable:name() .. "'")
-    print("  columns=" .. inspect(dtable:columns()))
+--    print("  columns=" .. inspect(dtable:columns()))
 end
 
 -- Helper function to remove some of the tags we usually are not interested in.

flex-config/unitable.lua

@@ -1,7 +1,7 @@
 
 -- Put all OSM data into a single table
 
-inspect = require('inspect')
+-- inspect = require('inspect')
 
 -- We define a single table that can take any OSM object and any geometry.
 -- XXX expire will currently not work on these tables.
@@ -17,7 +17,7 @@ local dtable = osm2pgsql.define_table{
     }
 }
 
-print("columns=" .. inspect(dtable:columns()))
+-- print("columns=" .. inspect(dtable:columns()))
 
 -- Helper function to remove some of the tags we usually are not interested in.
 -- Returns true if there are no tags left.

tests/CMakeLists.txt

@@ -89,6 +89,11 @@ if (HAVE_LUA)
     set_test(test-output-flex-types)
     set_test(test-output-flex-update)
     set_test(test-output-flex-validgeom)
+
+    set_test(test-output-flex-example-configs)
+    set(FLEX_EXAMPLE_CONFIGS "compatible,data-types,default-config,geometries,route-relations,simple,unitable")
+    # places.lua not tested because it needs dkjson package
+    set_tests_properties(test-output-flex-example-configs PROPERTIES ENVIRONMENT "EXAMPLE_FILES=${FLEX_EXAMPLE_CONFIGS}")
 endif()
 
 

tests/test-output-flex-example-configs.cpp

@@ -0,0 +1,35 @@
+#include <catch.hpp>
+
+#include "common-import.hpp"
+#include "common-options.hpp"
+#include "format.hpp"
+
+#include <osmium/util/string.hpp>
+
+#include <cstdlib>
+#include <string>
+#include <vector>
+
+static testing::db::import_t db;
+
+static char const *const data_file = "liechtenstein-2013-08-03.osm.pbf";
+
+std::vector<std::string> get_files() {
+    char const *env = std::getenv("EXAMPLE_FILES");
+    return osmium::split_string(env, ',', true);
+}
+
+TEST_CASE("minimal test for flex example configs")
+{
+    auto const files = get_files();
+
+    for (auto const& file : files) {
+        fmt::print(stderr, "Testing example config '{}.lua'\n", file);
+        auto const conf_file = "../../flex-config/" + file + ".lua";
+        options_t const options = testing::opt_t().flex(conf_file.c_str());
+
+        REQUIRE_NOTHROW(db.run_file(options, data_file));
+
+        auto conn = db.db().connect();
+    }
+}