fix unit test

This commit is contained in:
Michael Reichert
2018-04-01 10:38:48 +02:00
parent 8a2038e85d
commit 41fd21a992

View File

@ -200,18 +200,18 @@ void test_parsing_tile_expiry_zoom_levels_fails()
"-8-12", "--style", "-8-12", "--style",
"default.style", "tests/liechtenstein-2013-08-03.osm.pbf"}; "default.style", "tests/liechtenstein-2013-08-03.osm.pbf"};
parse_fail(len(a2), a2, parse_fail(len(a2), a2,
"Missing argument for option -e. Zoom levels must be positive."); "Missing argument for option --expire-tiles. Zoom levels must be positive.");
const char *a3[] = {"osm2pgsql", "-e", "--style", "default.style", const char *a3[] = {"osm2pgsql", "-e", "--style", "default.style",
"tests/liechtenstein-2013-08-03.osm.pbf"}; "tests/liechtenstein-2013-08-03.osm.pbf"};
parse_fail(len(a3), a3, parse_fail(len(a3), a3,
"Missing argument for option -e. Zoom levels must be positive."); "Missing argument for option --expire-tiles. Zoom levels must be positive.");
const char *a4[] = { const char *a4[] = {
"osm2pgsql", "-e", "osm2pgsql", "-e",
"a-8", "--style", "a-8", "--style",
"default.style", "tests/liechtenstein-2013-08-03.osm.pbf"}; "default.style", "tests/liechtenstein-2013-08-03.osm.pbf"};
parse_fail(len(a4), a4, "Missing zoom level for tile expiry."); parse_fail(len(a4), a4, "Bad argument for option --expire-tiles. Minimum zoom level must be larger than 0.");
const char *a5[] = { const char *a5[] = {
"osm2pgsql", "-e", "osm2pgsql", "-e",
@ -239,8 +239,8 @@ void test_parsing_tile_expiry_zoom_levels_fails()
"0-8", "--style", "0-8", "--style",
"default.style", "tests/liechtenstein-2013-08-03.osm.pbf"}; "default.style", "tests/liechtenstein-2013-08-03.osm.pbf"};
parse_fail(len(a8), a8, parse_fail(len(a8), a8,
"Missing zoom level for tile expiry. Minimum zoom " "Bad argument for option --expire-tiles. Minimum zoom level "
"level must be larger than 0."); "must be larger than 0.");
const char *a9[] = {"osm2pgsql", const char *a9[] = {"osm2pgsql",
"-e", "-e",
@ -259,7 +259,7 @@ void test_parsing_tile_expiry_zoom_levels_fails()
"default.style", "default.style",
"tests/liechtenstein-2013-08-03.osm.pbf"}; "tests/liechtenstein-2013-08-03.osm.pbf"};
parse_fail(len(a10), a10, parse_fail(len(a10), a10,
"Missing argument for option -e. Zoom levels " "Missing argument for option --expire-tiles. Zoom levels "
"must be positive."); "must be positive.");
const char *a11[] = {"osm2pgsql", const char *a11[] = {"osm2pgsql",
@ -269,8 +269,8 @@ void test_parsing_tile_expiry_zoom_levels_fails()
"default.style", "default.style",
"tests/liechtenstein-2013-08-03.osm.pbf"}; "tests/liechtenstein-2013-08-03.osm.pbf"};
parse_fail(len(a11), a11, parse_fail(len(a11), a11,
"Missing zoom level for tile expiry. Minimum " "Bad argument for option --expire-tiles. Minimum zoom level "
"zoom level must be larger than 0."); "must be larger than 0.");
} }
int get_random_proj(std::vector<std::string>& args) int get_random_proj(std::vector<std::string>& args)