Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

update help output test

Browse Source
This commit is contained in:
karenzshea 2016-02-15 20:49:49 -05:00 committed by Patrick Niklaus
parent 3beb8c825b
commit 6ac3d902c9
4 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
features/options/extract/help.feature
View File

@ -11,13 +11,12 @@ Feature: osrm-extract command line options: help
And stdout should contain "Options:" And stdout should contain "Options:"
And stdout should contain "--version" And stdout should contain "--version"
And stdout should contain "--help" And stdout should contain "--help"
And stdout should contain "--config"
And stdout should contain "Configuration:" And stdout should contain "Configuration:"
And stdout should contain "--profile" And stdout should contain "--profile"
And stdout should contain "--threads" And stdout should contain "--threads"
And stdout should contain "--generate-edge-lookup" And stdout should contain "--generate-edge-lookup"
And stdout should contain "--small-component-size" And stdout should contain "--small-component-size"
And stdout should contain 20 lines And stdout should contain 18 lines
And it should exit with code 0 And it should exit with code 0
Scenario: osrm-extract - Help, short Scenario: osrm-extract - Help, short
@ -27,13 +26,12 @@ Feature: osrm-extract command line options: help
And stdout should contain "Options:" And stdout should contain "Options:"
And stdout should contain "--version" And stdout should contain "--version"
And stdout should contain "--help" And stdout should contain "--help"
And stdout should contain "--config"
And stdout should contain "Configuration:" And stdout should contain "Configuration:"
And stdout should contain "--profile" And stdout should contain "--profile"
And stdout should contain "--threads" And stdout should contain "--threads"
And stdout should contain "--generate-edge-lookup" And stdout should contain "--generate-edge-lookup"
And stdout should contain "--small-component-size" And stdout should contain "--small-component-size"
And stdout should contain 20 lines And stdout should contain 18 lines
And it should exit with code 0 And it should exit with code 0
Scenario: osrm-extract - Help, long Scenario: osrm-extract - Help, long
@ -43,11 +41,10 @@ Feature: osrm-extract command line options: help
And stdout should contain "Options:" And stdout should contain "Options:"
And stdout should contain "--version" And stdout should contain "--version"
And stdout should contain "--help" And stdout should contain "--help"
And stdout should contain "--config"
And stdout should contain "Configuration:" And stdout should contain "Configuration:"
And stdout should contain "--profile" And stdout should contain "--profile"
And stdout should contain "--threads" And stdout should contain "--threads"
And stdout should contain "--generate-edge-lookup" And stdout should contain "--generate-edge-lookup"
And stdout should contain "--small-component-size" And stdout should contain "--small-component-size"
And stdout should contain 20 lines And stdout should contain 18 lines
And it should exit with code 0 And it should exit with code 0

9
features/options/prepare/help.feature
View File

@ -11,14 +11,13 @@ Feature: osrm-prepare command line options: help
And stdout should contain "Options:" And stdout should contain "Options:"
And stdout should contain "--version" And stdout should contain "--version"
And stdout should contain "--help" And stdout should contain "--help"
And stdout should contain "--config"
And stdout should contain "Configuration:" And stdout should contain "Configuration:"
And stdout should contain "--profile" And stdout should contain "--profile"
And stdout should contain "--threads" And stdout should contain "--threads"
And stdout should contain "--core" And stdout should contain "--core"
And stdout should contain "--level-cache" And stdout should contain "--level-cache"
And stdout should contain "--segment-speed-file" And stdout should contain "--segment-speed-file"
And stdout should contain 21 lines And stdout should contain 18 lines
And it should exit with code 1 And it should exit with code 1
Scenario: osrm-prepare - Help, short Scenario: osrm-prepare - Help, short
@ -28,14 +27,13 @@ Feature: osrm-prepare command line options: help
And stdout should contain "Options:" And stdout should contain "Options:"
And stdout should contain "--version" And stdout should contain "--version"
And stdout should contain "--help" And stdout should contain "--help"
And stdout should contain "--config"
And stdout should contain "Configuration:" And stdout should contain "Configuration:"
And stdout should contain "--profile" And stdout should contain "--profile"
And stdout should contain "--threads" And stdout should contain "--threads"
And stdout should contain "--core" And stdout should contain "--core"
And stdout should contain "--level-cache" And stdout should contain "--level-cache"
And stdout should contain "--segment-speed-file" And stdout should contain "--segment-speed-file"
And stdout should contain 21 lines And stdout should contain 18 lines
And it should exit with code 0 And it should exit with code 0
Scenario: osrm-prepare - Help, long Scenario: osrm-prepare - Help, long
@ -45,12 +43,11 @@ Feature: osrm-prepare command line options: help
And stdout should contain "Options:" And stdout should contain "Options:"
And stdout should contain "--version" And stdout should contain "--version"
And stdout should contain "--help" And stdout should contain "--help"
And stdout should contain "--config"
And stdout should contain "Configuration:" And stdout should contain "Configuration:"
And stdout should contain "--profile" And stdout should contain "--profile"
And stdout should contain "--threads" And stdout should contain "--threads"
And stdout should contain "--core" And stdout should contain "--core"
And stdout should contain "--level-cache" And stdout should contain "--level-cache"
And stdout should contain "--segment-speed-file" And stdout should contain "--segment-speed-file"
And stdout should contain 21 lines And stdout should contain 18 lines
And it should exit with code 0 And it should exit with code 0

3
features/options/routed/help.feature
View File

@ -11,7 +11,6 @@ Feature: osrm-routed command line options: help
And stdout should contain "Options:" And stdout should contain "Options:"
And stdout should contain "--version" And stdout should contain "--version"
And stdout should contain "--help" And stdout should contain "--help"
And stdout should contain "--config"
And stdout should contain "--trial" And stdout should contain "--trial"
And stdout should contain "Configuration:" And stdout should contain "Configuration:"
And stdout should contain "--hsgrdata arg" And stdout should contain "--hsgrdata arg"
@ -39,7 +38,6 @@ Feature: osrm-routed command line options: help
And stdout should contain "Options:" And stdout should contain "Options:"
And stdout should contain "--version" And stdout should contain "--version"
And stdout should contain "--help" And stdout should contain "--help"
And stdout should contain "--config"
And stdout should contain "--trial" And stdout should contain "--trial"
And stdout should contain "Configuration:" And stdout should contain "Configuration:"
And stdout should contain "--hsgrdata arg" And stdout should contain "--hsgrdata arg"
@ -67,7 +65,6 @@ Feature: osrm-routed command line options: help
And stdout should contain "Options:" And stdout should contain "Options:"
And stdout should contain "--version" And stdout should contain "--version"
And stdout should contain "--help" And stdout should contain "--help"
And stdout should contain "--config"
And stdout should contain "--trial" And stdout should contain "--trial"
And stdout should contain "Configuration:" And stdout should contain "Configuration:"
And stdout should contain "--hsgrdata arg" And stdout should contain "--hsgrdata arg"

4
src/tools/contract.cpp
View File

@ -91,7 +91,7 @@ return_code parseArguments(int argc, char *argv[], contractor::ContractorConfig
if (option_variables.count("help")) if (option_variables.count("help"))
{ {
util::SimpleLogger().Write() << "\n" << visible_options; util::SimpleLogger().Write() << visible_options;
return return_code::exit; return return_code::exit;
} }
@ -99,7 +99,7 @@ return_code parseArguments(int argc, char *argv[], contractor::ContractorConfig
if (!option_variables.count("input")) if (!option_variables.count("input"))
{ {
util::SimpleLogger().Write() << "\n" << visible_options; util::SimpleLogger().Write() << visible_options;
return return_code::fail; return return_code::fail;
} }