implementing option tests marked @todo

features/options/extract/files.feature

@@ -22,8 +22,7 @@ Feature: osrm-extract command line options: files
         When I run "osrm-extract --profile {profile} {base}.osm"
         Then stderr should be empty
         And it should exit with code 0
-    
-    @todo
+
     Scenario: osrm-extract - Missing input file
         When I run "osrm-extract over-the-rainbow.osrm --profile {profile}"
         And stderr should contain "over-the-rainbow.osrm"

features/options/extract/help.feature

@@ -3,8 +3,7 @@ Feature: osrm-extract command line options: help
 
     Background:
         Given the profile "testbot"
-    
-    @todo
+
     Scenario: osrm-extract - Help should be shown when no options are passed
         When I run "osrm-extract"
         Then stderr should be empty
@@ -45,4 +44,4 @@ Feature: osrm-extract command line options: help
         And stdout should contain "--profile"
         And stdout should contain "--threads"
         And stdout should contain 12 lines
-        And it should exit with code 0
+        And it should exit with code 0

features/options/extract/invalid.feature

@@ -3,8 +3,7 @@ Feature: osrm-extract command line options: invalid options
 
     Background:
         Given the profile "testbot"
-    
-    @todo
+
     Scenario: osrm-extract - Non-existing option
         When I run "osrm-extract --fly-me-to-the-moon"
         Then stdout should be empty

features/options/prepare/files.feature

@@ -17,13 +17,16 @@ Feature: osrm-prepare command line options: files
         When I run "osrm-prepare {base}.osrm --profile {profile}"
         Then stderr should be empty
         And it should exit with code 0
+<<<<<<< Updated upstream
     
+=======
+
+>>>>>>> Stashed changes
     Scenario: osrm-prepare - Order of options should not matter
         When I run "osrm-prepare --profile {profile} {base}.osrm"
         Then stderr should be empty
         And it should exit with code 0
-    
-    @todo
+
     Scenario: osrm-prepare - Missing input file
         When I run "osrm-prepare over-the-rainbow.osrm --profile {profile}"
         And stderr should contain "over-the-rainbow.osrm"

features/options/prepare/help.feature

@@ -3,8 +3,7 @@ Feature: osrm-prepare command line options: help
 
     Background:
         Given the profile "testbot"
-    
-    @todo
+
     Scenario: osrm-prepare - Help should be shown when no options are passed
         When I run "osrm-prepare"
         Then stderr should be empty
@@ -48,4 +47,4 @@ Feature: osrm-prepare command line options: help
         And stdout should contain "--profile"
         And stdout should contain "--threads"
         And stdout should contain 15 lines
-        And it should exit with code 0
+        And it should exit with code 0

features/options/prepare/invalid.feature

@@ -3,11 +3,10 @@ Feature: osrm-prepare command line options: invalid options
 
     Background:
         Given the profile "testbot"
-    
-    @todo
+
     Scenario: osrm-prepare - Non-existing option
         When I run "osrm-prepare --fly-me-to-the-moon"
         Then stdout should be empty
-        And stderr should contain "exception"
+        And stderr should contain "Exception"
         And stderr should contain "fly-me-to-the-moon"
-        And it should exit with code 1
+        And it should exit with code 1