Merge pull request #1370 from joto/refactor-tests

Refactor tests

Author: lonvia

tests/CMakeLists.txt

@@ -38,7 +38,7 @@ add_definitions(-DOSM2PGSQLDATA_DIR=\"${osm2pgsql_SOURCE_DIR}/\")
 
 add_library(catch_main_lib STATIC catch-main.cpp)
 
-set_test(test-check-input)
+set_test(test-check-input LABELS NoDB)
 set_test(test-db-copy-thread)
 set_test(test-db-copy-mgr)
 set_test(test-domain-matcher LABELS NoDB)

tests/test-check-input.cpp

@@ -2,7 +2,7 @@
 
 #include "input.hpp"
 
-TEST_CASE("it's good if input data is ordered")
+TEST_CASE("it's good if input data is ordered", "[NoDB]")
 {
     type_id_version const tiv1{osmium::item_type::node, 1, 1};
     type_id_version const tiv2{osmium::item_type::node, 1, 2};
@@ -20,7 +20,7 @@ TEST_CASE("it's good if input data is ordered")
     REQUIRE_NOTHROW(check_input(tiv6, tiv7));
 }
 
-TEST_CASE("negative OSM object ids are not allowed")
+TEST_CASE("negative OSM object ids are not allowed", "[NoDB]")
 {
     type_id_version const tivn{osmium::item_type::node, -17, 1};
     type_id_version const tivw{osmium::item_type::way, -1, 1};
@@ -36,7 +36,7 @@ TEST_CASE("negative OSM object ids are not allowed")
         "Negative OSM object ids are not allowed: relation id -999.");
 }
 
-TEST_CASE("objects of the same type must be ordered")
+TEST_CASE("objects of the same type must be ordered", "[NoDB]")
 {
     type_id_version const tiv1{osmium::item_type::node, 42, 1};
     type_id_version const tiv2{osmium::item_type::node, 3, 1};
@@ -45,7 +45,7 @@ TEST_CASE("objects of the same type must be ordered")
                         "Input data is not ordered: node id 3 after 42.");
 }
 
-TEST_CASE("a node after a way or relation is not allowed")
+TEST_CASE("a node after a way or relation is not allowed", "[NoDB]")
 {
     type_id_version const tiv1w{osmium::item_type::way, 42, 1};
     type_id_version const tiv1r{osmium::item_type::relation, 42, 1};
@@ -57,7 +57,7 @@ TEST_CASE("a node after a way or relation is not allowed")
                         "Input data is not ordered: node after relation.");
 }
 
-TEST_CASE("a way after a relation is not allowed")
+TEST_CASE("a way after a relation is not allowed", "[NoDB]")
 {
     type_id_version const tiv1{osmium::item_type::relation, 42, 1};
     type_id_version const tiv2{osmium::item_type::way, 100, 1};
@@ -66,7 +66,7 @@ TEST_CASE("a way after a relation is not allowed")
                         "Input data is not ordered: way after relation.");
 }
 
-TEST_CASE("versions must be ordered")
+TEST_CASE("versions must be ordered", "[NoDB]")
 {
     type_id_version const tiv1{osmium::item_type::way, 42, 2};
     type_id_version const tiv2{osmium::item_type::way, 42, 1};

tests/test-domain-matcher.cpp

@@ -20,7 +20,7 @@ static osmium::Tag &fill_buffer(osmium::memory::Buffer &buffer, char const *key,
     return *buffer.get<osmium::TagList>(0).begin();
 }
 
-TEST_CASE("DomainMatcher: name")
+TEST_CASE("DomainMatcher: name", "[NoDB]")
 {
     osmium::memory::Buffer buffer{1024};
     DomainMatcher matcher{"bridge"};
@@ -32,7 +32,7 @@ TEST_CASE("DomainMatcher: name")
     REQUIRE(std::strcmp(result, "name") == 0);
 }
 
-TEST_CASE("DomainMatcher: name with language")
+TEST_CASE("DomainMatcher: name with language", "[NoDB]")
 {
     osmium::memory::Buffer buffer{1024};
     DomainMatcher matcher{"bridge"};
@@ -45,7 +45,7 @@ TEST_CASE("DomainMatcher: name with language")
     REQUIRE(std::strcmp(result, "name:en") == 0);
 }
 
-TEST_CASE("DomainMatcher: no :name")
+TEST_CASE("DomainMatcher: no :name", "[NoDB]")
 {
     osmium::memory::Buffer buffer{1024};
     DomainMatcher matcher{"bridge"};
@@ -56,7 +56,7 @@ TEST_CASE("DomainMatcher: no :name")
     REQUIRE_FALSE(result);
 }
 
-TEST_CASE("DomainMatcher: empty matcher")
+TEST_CASE("DomainMatcher: empty matcher", "[NoDB]")
 {
     osmium::memory::Buffer buffer{1024};
     DomainMatcher matcher{""};
@@ -68,7 +68,7 @@ TEST_CASE("DomainMatcher: empty matcher")
     REQUIRE_FALSE(result);
 }
 
-TEST_CASE("DomainMatcher: names")
+TEST_CASE("DomainMatcher: names", "[NoDB]")
 {
     osmium::memory::Buffer buffer{1024};
     DomainMatcher matcher{"bridge"};
@@ -80,7 +80,7 @@ TEST_CASE("DomainMatcher: names")
     REQUIRE_FALSE(result);
 }
 
-TEST_CASE("DomainMatcher: not matching")
+TEST_CASE("DomainMatcher: not matching", "[NoDB]")
 {
     osmium::memory::Buffer buffer{1024};
     DomainMatcher matcher{"bridge"};
@@ -91,7 +91,7 @@ TEST_CASE("DomainMatcher: not matching")
     REQUIRE_FALSE(result);
 }
 
-TEST_CASE("DomainMatcher: empty tag")
+TEST_CASE("DomainMatcher: empty tag", "[NoDB]")
 {
     osmium::memory::Buffer buffer{1024};
     DomainMatcher matcher{"bridge"};