VladPolskiy/osm2pgsql
1
0
Fork 0
mirror of https://github.com/osm2pgsql-dev/osm2pgsql.git synced 2025-08-19 16:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use parse_*_param() funcs to parse command line option parameters

Browse Source 
Use consistently named functions parse_*_param() for all parameters of
command line options that are more complex to parse. And test them!

Also add print_version() function.
This commit is contained in:
Jochen Topf
2022-12-21 20:27:09 +01:00
parent a910b866c7
commit 1d7ac93a83
2 changed files with 256 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
tests/test-options-parse.cpp
View File

@ -15,7 +15,7 @@
#include "taginfo-impl.hpp"
#include "tagtransform.hpp"
char const *const TEST_PBF = "foo.pbf";
static char const *const TEST_PBF = "foo.pbf";
static void bad_opt(std::vector<char const *> opts, char const *msg)
{
@ -69,6 +69,47 @@ TEST_CASE("Lua styles", "[NoDB]")
#endif
}
TEST_CASE("Parsing bbox", "[NoDB]")
{
auto const opt1 = opt({"-b", "1.2,3.4,5.6,7.8"});
CHECK(opt1.bbox == osmium::Box{1.2, 3.4, 5.6, 7.8});
auto const opt2 = opt({"--bbox", "1.2,3.4,5.6,7.8"});
CHECK(opt2.bbox == osmium::Box{1.2, 3.4, 5.6, 7.8});
auto const opt3 = opt({"--bbox", "1.2, 3.4, 5.6, 7.8"});
CHECK(opt3.bbox == osmium::Box{1.2, 3.4, 5.6, 7.8});
}
TEST_CASE("Parsing bbox fails if coordinates in wrong order", "[NoDB]")
{
bad_opt({"--bbox", "1.0,2.0,0.0,0.0"}, "Bounding box failed due to");
}
TEST_CASE("Parsing bbox fails if wrong format", "[NoDB]")
{
bad_opt({"-b", "123"}, "Bounding box must be specified like:"
" minlon,minlat,maxlon,maxlat.");
}
TEST_CASE("Parsing number-processes", "[NoDB]")
{
auto const opt1 = opt({"--number-processes", "0"});
CHECK(opt1.num_procs == 1);
auto const opt2 = opt({"--number-processes", "1"});
CHECK(opt2.num_procs == 1);
auto const opt3 = opt({"--number-processes", "2"});
CHECK(opt3.num_procs == 2);
auto const opt4 = opt({"--number-processes", "32"});
CHECK(opt4.num_procs == 32);
auto const opt5 = opt({"--number-processes", "33"});
CHECK(opt5.num_procs == 32);
}
TEST_CASE("Parsing tile expiry zoom levels", "[NoDB]")
{
auto options = opt({"-e", "8-12"});
@ -122,3 +163,46 @@ TEST_CASE("Parsing tile expiry zoom levels fails", "[NoDB]")
"Bad argument for option --expire-tiles. Minimum zoom level "
"must be larger than 0.");
}
TEST_CASE("Parsing log-level", "[NoDB]")
{
opt({"--log-level", "debug"});
opt({"--log-level", "info"});
opt({"--log-level", "warn"});
opt({"--log-level", "warning"});
opt({"--log-level", "error"});
}
TEST_CASE("Parsing log-level fails for unknown level", "[NoDB]")
{
bad_opt({"--log-level", "foo"}, "Unknown value for --log-level option: ");
}
TEST_CASE("Parsing log-progress", "[NoDB]")
{
opt({"--log-progress", "true"});
opt({"--log-progress", "false"});
opt({"--log-progress", "auto"});
}
TEST_CASE("Parsing log-progress fails for unknown value", "[NoDB]")
{
bad_opt({"--log-progress", "foo"},
"Unknown value for --log-progress option: ");
}
TEST_CASE("Parsing with-forward-dependencies", "[NoDB]")
{
auto const opt1 = opt({"--with-forward-dependencies", "true"});
CHECK(opt1.with_forward_dependencies);
auto const opt2 = opt({"--with-forward-dependencies", "false"});
CHECK_FALSE(opt2.with_forward_dependencies);
}
TEST_CASE("Parsing with-forward-dependencies fails for unknown value", "[NoDB]")
{
bad_opt({"--with-forward-dependencies", "foo"},
"Unknown value for"
" --with-forward-dependencies option: ");
}