From 6ac3d902c9ad7321e250da7b160d2cdf43cddec9 Mon Sep 17 00:00:00 2001 From: karenzshea Date: Mon, 15 Feb 2016 20:49:49 -0500 Subject: [PATCH] update help output test --- features/options/extract/help.feature | 9 +++------ features/options/prepare/help.feature | 9 +++------ features/options/routed/help.feature | 3 --- src/tools/contract.cpp | 4 ++-- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/features/options/extract/help.feature b/features/options/extract/help.feature index 722c4dc98..85b97a50a 100644 --- a/features/options/extract/help.feature +++ b/features/options/extract/help.feature @@ -11,13 +11,12 @@ Feature: osrm-extract command line options: help And stdout should contain "Options:" And stdout should contain "--version" And stdout should contain "--help" - And stdout should contain "--config" And stdout should contain "Configuration:" And stdout should contain "--profile" And stdout should contain "--threads" And stdout should contain "--generate-edge-lookup" 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 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 "--version" And stdout should contain "--help" - And stdout should contain "--config" And stdout should contain "Configuration:" And stdout should contain "--profile" And stdout should contain "--threads" And stdout should contain "--generate-edge-lookup" 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 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 "--version" And stdout should contain "--help" - And stdout should contain "--config" And stdout should contain "Configuration:" And stdout should contain "--profile" And stdout should contain "--threads" And stdout should contain "--generate-edge-lookup" 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 diff --git a/features/options/prepare/help.feature b/features/options/prepare/help.feature index 34ec3d5f3..6d19dcbeb 100644 --- a/features/options/prepare/help.feature +++ b/features/options/prepare/help.feature @@ -11,14 +11,13 @@ Feature: osrm-prepare command line options: help And stdout should contain "Options:" And stdout should contain "--version" And stdout should contain "--help" - And stdout should contain "--config" And stdout should contain "Configuration:" And stdout should contain "--profile" And stdout should contain "--threads" And stdout should contain "--core" And stdout should contain "--level-cache" 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 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 "--version" And stdout should contain "--help" - And stdout should contain "--config" And stdout should contain "Configuration:" And stdout should contain "--profile" And stdout should contain "--threads" And stdout should contain "--core" And stdout should contain "--level-cache" 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 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 "--version" And stdout should contain "--help" - And stdout should contain "--config" And stdout should contain "Configuration:" And stdout should contain "--profile" And stdout should contain "--threads" And stdout should contain "--core" And stdout should contain "--level-cache" 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 diff --git a/features/options/routed/help.feature b/features/options/routed/help.feature index 34c6ee2a8..e6ddd8bcd 100644 --- a/features/options/routed/help.feature +++ b/features/options/routed/help.feature @@ -11,7 +11,6 @@ Feature: osrm-routed command line options: help And stdout should contain "Options:" And stdout should contain "--version" And stdout should contain "--help" - And stdout should contain "--config" And stdout should contain "--trial" And stdout should contain "Configuration:" 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 "--version" And stdout should contain "--help" - And stdout should contain "--config" And stdout should contain "--trial" And stdout should contain "Configuration:" 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 "--version" And stdout should contain "--help" - And stdout should contain "--config" And stdout should contain "--trial" And stdout should contain "Configuration:" And stdout should contain "--hsgrdata arg" diff --git a/src/tools/contract.cpp b/src/tools/contract.cpp index 290e5a919..685f36213 100644 --- a/src/tools/contract.cpp +++ b/src/tools/contract.cpp @@ -91,7 +91,7 @@ return_code parseArguments(int argc, char *argv[], contractor::ContractorConfig if (option_variables.count("help")) { - util::SimpleLogger().Write() << "\n" << visible_options; + util::SimpleLogger().Write() << visible_options; return return_code::exit; } @@ -99,7 +99,7 @@ return_code parseArguments(int argc, char *argv[], contractor::ContractorConfig if (!option_variables.count("input")) { - util::SimpleLogger().Write() << "\n" << visible_options; + util::SimpleLogger().Write() << visible_options; return return_code::fail; }