Attribution for #748

Author: aslakhellesoy

History.md

@@ -1,9 +1,10 @@
 ## [1.2.0-SNAPSHOT (Git master)](https://github.com/cucumber/cucumber-jvm/compare/v1.1.8...master) (Not released)
 
+* [Core] Clobber all filter types when override one filter type in the environment options ([#748](https://github.com/cucumber/cucumber-jvm/pull/748) Björn Rasmusson)
 * [Android] Big refactoring ([#766](https://github.com/cucumber/cucumber-jvm/pull/766) Sebastian Gröbler)
 * [Android] Improve documentation ([#772](https://github.com/cucumber/cucumber-jvm/pull/772) K76154)
 * [Core] New --i18n option for printing keywords ([#785](https://github.com/cucumber/cucumber-jvm/pull/785) Seb Rose)
-* [Core] Make the JUnit formatter handle empty scenarios ([#774](https://github.com/cucumber/cucumber-jvm/issues/774) Björn Rasmusson).
+* [Core] Make the JUnit formatter handle empty scenarios ([#774](https://github.com/cucumber/cucumber-jvm/issues/774) Björn Rasmusson)
 * [Scala] Fixing randomly failing tests in the Scala module ([#768](https://github.com/cucumber/cucumber-jvm/pull/768), [#761](https://github.com/cucumber/cucumber-jvm/issues/761) Manuel Bernhardt)
 * [JRuby] cucumber-jruby backend fails to build when `RUBY_VERSION` is present in environment ([#718](https://github.com/cucumber/cucumber-jvm/issues/718) Aslak Hellesøy)
 * [Core] `DataTable.asMap()` returns a `LinkedHashMap`, ensuring key iteration order is the same as in the gherkin table ([#764](https://github.com/cucumber/cucumber-jvm/issues/764) Aslak Hellesøy).

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

@@ -8,6 +8,7 @@
 import cucumber.runtime.io.ResourceLoader;
 import cucumber.runtime.model.CucumberFeature;
 import gherkin.I18n;
+import cucumber.runtime.model.PathWithLines;
 import gherkin.formatter.Formatter;
 import gherkin.formatter.Reporter;
 import gherkin.util.FixJava;
@@ -132,9 +133,12 @@ private void parse(List<String> args) {
                 parsedFeaturePaths.add(arg);
             }
         }
-        if (!parsedFilters.isEmpty()) {
+        if (!parsedFilters.isEmpty() || haveLineFilters(parsedFeaturePaths)) {
             filters.clear();
             filters.addAll(parsedFilters);
+            if (parsedFeaturePaths.isEmpty() && !featurePaths.isEmpty()) {
+                stripLinesFromFeaturePaths(featurePaths);
+            }
         }
         if (!parsedFeaturePaths.isEmpty()) {
             featurePaths.clear();
@@ -146,6 +150,24 @@ private void parse(List<String> args) {
         }
     }
 
+    private boolean haveLineFilters(List<String> parsedFeaturePaths) {
+        for (String pathName : parsedFeaturePaths) {
+            if (pathName.startsWith("@") || PathWithLines.hasLineFilters(pathName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void stripLinesFromFeaturePaths(List<String> featurePaths) {
+        List<String> newPaths = new ArrayList<String>();
+        for (String pathName : featurePaths) {
+            newPaths.add(PathWithLines.stripLineFilters(pathName));
+        }
+        featurePaths.clear();
+        featurePaths.addAll(newPaths);
+    }
+
     private void printUsage() {
         System.out.println(USAGE);
     }

core/src/main/java/cucumber/runtime/model/PathWithLines.java

@@ -11,6 +11,19 @@ public class PathWithLines {
     public final String path;
     public final List<Long> lines = new ArrayList<Long>();
 
+    public static boolean hasLineFilters(String pathName) {
+        return FILE_COLON_LINE_PATTERN.matcher(pathName).matches();
+    }
+
+    public static String stripLineFilters(String pathName) {
+        Matcher matcher = FILE_COLON_LINE_PATTERN.matcher(pathName);
+        if (matcher.matches()) {
+            return matcher.group(1);
+        } else {
+            return pathName;
+        }
+    }
+
     public PathWithLines(String pathName) {
         Matcher matcher = FILE_COLON_LINE_PATTERN.matcher(pathName);
         if (matcher.matches()) {

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

@@ -154,6 +154,22 @@ public void clobbers_filters_from_cli_if_filters_specified_in_cucumber_options_p
         assertEquals(asList("@clobber_with_this"), runtimeOptions.getFilters());
     }
 
+    @Test
+    public void clobbers_tag_and_name_filters_from_cli_if_line_filters_specified_in_cucumber_options_property() {
+        Properties properties = new Properties();
+        properties.setProperty("cucumber.options", "path/file.feature:3");
+        RuntimeOptions runtimeOptions = new RuntimeOptions(new Env(properties), asList("--tags", "@should_be_clobbered", "--name", "should_be_clobbered"));
+        assertEquals(Collections.<Object>emptyList(), runtimeOptions.getFilters());
+    }
+
+    @Test
+    public void clobbers_tag_and_name_filters_from_cli_if_rerun_file_specified_in_cucumber_options_property() {
+        Properties properties = new Properties();
+        properties.setProperty("cucumber.options", "@rerun.txt");
+        RuntimeOptions runtimeOptions = new RuntimeOptions(new Env(properties), asList("--tags", "@should_be_clobbered", "--name", "should_be_clobbered"));
+        assertEquals(Collections.<Object>emptyList(), runtimeOptions.getFilters());
+    }
+
     @Test
     public void preserves_filters_from_cli_if_filters_not_specified_in_cucumber_options_property() {
         Properties properties = new Properties();
@@ -170,6 +186,14 @@ public void clobbers_features_from_cli_if_features_specified_in_cucumber_options
         assertEquals(asList("new", "newer"), runtimeOptions.getFeaturePaths());
     }
 
+    @Test
+    public void strips_lines_from_features_from_cli_if_filters_are_specified_in_cucumber_options_property() {
+        Properties properties = new Properties();
+        properties.setProperty("cucumber.options", "--tags @Tag");
+        RuntimeOptions runtimeOptions = new RuntimeOptions(new Env(properties), asList("path/file.feature:3"));
+        assertEquals(asList("path/file.feature"), runtimeOptions.getFeaturePaths());
+    }
+
     @Test
     public void preserves_features_from_cli_if_features_not_specified_in_cucumber_options_property() {
         Properties properties = new Properties();