Dispose line filters when feature paths are clobbered

Also dispose line filters when feature paths are clobbered with
-Dcucumber.options.

Author: brasmusson

core/src/main/java/cucumber/runtime/RuntimeOptions.java

@@ -31,6 +31,7 @@ public class RuntimeOptions {
 
     private final List<String> glue = new ArrayList<String>();
     private final List<Object> filters = new ArrayList<Object>();
+    private final List<Object> lineFilters = new ArrayList<Object>();
     private final List<Formatter> formatters = new ArrayList<Formatter>();
     private final List<String> featurePaths = new ArrayList<String>();
     private final FormatterFactory formatterFactory;
@@ -47,12 +48,13 @@ public RuntimeOptions(Env env, String... argv) {
     RuntimeOptions(Env env, FormatterFactory formatterFactory, String... argv) {
         this.formatterFactory = formatterFactory;
 
-        parse(new ArrayList<String>(asList(argv)), false);
+        parse(new ArrayList<String>(asList(argv)));
 
         String cucumberOptionsFromEnv = env.get("cucumber.options");
         if (cucumberOptionsFromEnv != null) {
-            parse(shellWords(cucumberOptionsFromEnv), true);
+            parse(shellWords(cucumberOptionsFromEnv));
         }
+        filters.addAll(lineFilters);
 
         if (formatters.isEmpty()) {
             formatters.add(formatterFactory.create("progress"));
@@ -73,15 +75,12 @@ private List<String> shellWords(String cmdline) {
         return matchList;
     }
 
-    private void parse(List<String> args, boolean clobberFeaturePathsAndGlue) {
+    private void parse(List<String> args) {
         List<Object> parsedFilters = new ArrayList<Object>();
+        List<Object> parsedLineFilters = new ArrayList<Object>();
+        List<String> parsedFeaturePaths = new ArrayList<String>();
+        List<String> parsedGlue = new ArrayList<String>();
 
-        List<String> oldFeaturePaths = new ArrayList<String>(featurePaths);
-        List<String> oldGlue = new ArrayList<String>(glue);
-        if (clobberFeaturePathsAndGlue) {
-            featurePaths.clear();
-            glue.clear();
-        }
         while (!args.isEmpty()) {
             String arg = args.remove(0).trim();
 
@@ -93,7 +92,7 @@ private void parse(List<String> args, boolean clobberFeaturePathsAndGlue) {
                 System.exit(0);
             } else if (arg.equals("--glue") || arg.equals("-g")) {
                 String gluePath = args.remove(0);
-                glue.add(gluePath);
+                parsedGlue.add(gluePath);
             } else if (arg.equals("--tags") || arg.equals("-t")) {
                 parsedFilters.add(args.remove(0));
             } else if (arg.equals("--format") || arg.equals("-f")) {
@@ -119,19 +118,23 @@ private void parse(List<String> args, boolean clobberFeaturePathsAndGlue) {
                 throw new CucumberException("Unknown option: " + arg);
             } else {
                 PathWithLines pathWithLines = new PathWithLines(arg);
-                featurePaths.add(pathWithLines.path);
-                parsedFilters.addAll(pathWithLines.lines);
+                parsedFeaturePaths.add(pathWithLines.path);
+                parsedLineFilters.addAll(pathWithLines.lines);
             }
         }
         if (!parsedFilters.isEmpty()) {
             filters.clear();
             filters.addAll(parsedFilters);
         }
-        if (featurePaths.isEmpty()) {
-            featurePaths.addAll(oldFeaturePaths);
+        if (!parsedFeaturePaths.isEmpty()) {
+            featurePaths.clear();
+            lineFilters.clear();
+            featurePaths.addAll(parsedFeaturePaths);
+            lineFilters.addAll(parsedLineFilters);
         }
-        if (glue.isEmpty()) {
-            glue.addAll(oldGlue);
+        if (!parsedGlue.isEmpty()) {
+            glue.clear();
+            glue.addAll(parsedGlue);
         }
     }
 

core/src/test/java/cucumber/runtime/RuntimeOptionsTest.java

@@ -2,15 +2,14 @@
 
 import cucumber.api.SnippetType;
 import org.junit.Test;
-
 import cucumber.runtime.formatter.ColorAware;
 import cucumber.runtime.formatter.FormatterFactory;
 import cucumber.runtime.formatter.StrictAware;
-
 import gherkin.formatter.Formatter;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Properties;
 import java.util.regex.Pattern;
 
@@ -41,6 +40,20 @@ public void assigns_feature_paths() {
         assertEquals(asList("somewhere_else"), options.getFeaturePaths());
     }
 
+    @Test
+    public void assigns_line_filters_from_feature_paths() {
+        RuntimeOptions options = new RuntimeOptions(new Env(), "--glue", "somewhere", "somewhere_else:3");
+        assertEquals(asList("somewhere_else"), options.getFeaturePaths());
+        assertEquals(asList(3L), options.getFilters());
+    }
+
+    @Test
+    public void assigns_filters_and_line_filters_from_feature_paths() {
+        RuntimeOptions options = new RuntimeOptions(new Env(), "--tags", "@keep_this", "somewhere_else:3");
+        assertEquals(asList("somewhere_else"), options.getFeaturePaths());
+        assertEquals(Arrays.<Object>asList("@keep_this", 3L), options.getFilters());
+    }
+
     @Test
     public void strips_options() {
         RuntimeOptions options = new RuntimeOptions(new Env(), "  --glue ", "somewhere", "somewhere_else");
@@ -166,6 +179,15 @@ public void preserves_features_from_cli_if_features_not_specified_in_cucumber_op
         assertEquals(asList("old", "older"), runtimeOptions.getFeaturePaths());
     }
 
+    @Test
+    public void clobbers_line_filters_from_cli_if_features_specified_in_cucumber_options_property() {
+        Properties properties = new Properties();
+        properties.setProperty("cucumber.options", "new newer");
+        RuntimeOptions runtimeOptions = new RuntimeOptions(new Env(properties), "--tags", "@keep_this", "path/file1.feature:1");
+        assertEquals(asList("new", "newer"), runtimeOptions.getFeaturePaths());
+        assertEquals(asList("@keep_this"), runtimeOptions.getFilters());
+    }
+
     @Test
     public void allows_removal_of_strict_in_cucumber_options_property() {
         Properties properties = new Properties();