Add list parting for features, glue and plugins

Author: mpkorstanje

core/src/main/java/io/cucumber/core/options/Constants.java

@@ -73,23 +73,21 @@ public final class Constants {
     /**
      * Property name used to set feature location: {@value}
      * <p>
-     * {@code path/to/dir} Load the files with the extension ".feature" for the
+     * A comma separated list of:
+     * <ul>
+     * <li>{@code path/to/dir}  - Load the files with the extension ".feature" for the
      * directory {@code path} and its sub directories.
-     * <p>
-     * {@code path/name.feature} Load the feature file {@code path/name.feature}
-     * from the file system.
-     * <p>
-     * {@code classpath:path/name.feature} Load the feature file
-     * {@code path/name.feature} from the classpath.
-     * <p>
-     * {@code path/name.feature:3:9} Load the scenarios on line 3 and line 9 in
-     * the file {@code path/name.feature}.
-     * <p>
-     * {@code @path/file} Load {@code path/file} from the file system and parse
-     * feature paths.
-     * <p>
-     * {@code @classpath:path/file} Load {@code path/file} from the classpath and
-     * parse feature paths.
+     * <li>{@code path/name.feature} - Load the feature file {@code path/name.feature}
+     * from the file system.</li>
+     * <li>{@code classpath:path/name.feature} - Load the feature file
+     * {@code path/name.feature} from the classpath.</li>
+     * <li>{@code path/name.feature:3:9} - Load the scenarios on line 3 and line 9 in
+     * the file {@code path/name.feature}.</li>
+     * <li>{@code @path/file} - Load {@code path/file} from the file system and parse
+     * feature paths.</li>
+     * <li>{@code @classpath:path/file} - Load {@code path/file} from the classpath and
+     * parse feature paths.</li>
+     * </ul>
      *
      * @see io.cucumber.core.feature.FeatureWithLines
      */
@@ -127,7 +125,8 @@ public final class Constants {
     /**
      * Property name to set the glue path: {@value}
      * <p>
-     * The glue path is a uri or package name e.g.: {@code com.example.app.steps}.
+     * A comma separated list of a classpath uri or package name e.g.:
+     * {@code com.example.app.steps}.
      *
      * @see io.cucumber.core.feature.GluePath
      */
@@ -153,8 +152,8 @@ public final class Constants {
     /**
      * Property name to enable plugins: {@value}
      * <p>
-     * Registers one or more plugins. Using the format
-     * {@code [PLUGIN[:PATH_OR_URL]]} e.g: {@code json:target/cucumber.json}.
+     * A comma separated list of {@code [PLUGIN[:PATH_OR_URL]]} e.g:
+     * {@code json:target/cucumber.json}.
      * <p>
      * Built-in formatter PLUGIN types:
      * <ul>
@@ -171,8 +170,6 @@ public final class Constants {
      * <p>
      * {@code PLUGIN} can also be a fully qualified class name, allowing registration
      * of 3rd party plugins.
-     * <p>
-     * <p>
      */
     public static final String PLUGIN_PROPERTY_NAME = "cucumber.plugin";
 

core/src/main/java/io/cucumber/core/options/CucumberPropertiesParser.java

@@ -4,7 +4,6 @@
 import io.cucumber.core.feature.FeatureWithLines;
 import io.cucumber.core.feature.GluePath;
 
-import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collection;
@@ -32,9 +31,19 @@
 import static io.cucumber.core.options.Constants.SNIPPET_TYPE_PROPERTY_NAME;
 import static io.cucumber.core.options.Constants.WIP_PROPERTY_NAME;
 import static io.cucumber.core.options.OptionsFileParser.parseFeatureWithLinesFile;
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.toList;
 
 public final class CucumberPropertiesParser {
 
+    private static <T> Function<String, Collection<T>> splitAndThen(Function<String, T> parse) {
+        return combined -> stream(combined.split(","))
+            .map(String::trim)
+            .filter(part -> !part.isEmpty())
+            .map(parse)
+            .collect(toList());
+    }
+
     public RuntimeOptionsBuilder parse(Map<String, String> properties) {
         final RuntimeOptionsBuilder builder;
         String cucumberOptions = properties.get(OPTIONS_PROPERTY_NAME);
@@ -80,9 +89,9 @@ public RuntimeOptionsBuilder parse(Map<String, String> properties) {
             builder::setStrict
         );
 
-        parse(properties,
+        parseAll(properties,
             FEATURES_PROPERTY_NAME,
-            FeatureWithLines::parse,
+            splitAndThen(FeatureWithLines::parse),
             builder::addFeature
         );
 
@@ -104,9 +113,9 @@ public RuntimeOptionsBuilder parse(Map<String, String> properties) {
             builder::addTagFilter
         );
 
-        parse(properties,
+        parseAll(properties,
             GLUE_PROPERTY_NAME,
-            GluePath::parse,
+            splitAndThen(GluePath::parse),
             builder::addGlue
         );
 
@@ -116,9 +125,9 @@ public RuntimeOptionsBuilder parse(Map<String, String> properties) {
             builder::setObjectFactoryClass
         );
 
-        parse(properties,
+        parseAll(properties,
             PLUGIN_PROPERTY_NAME,
-            Function.identity(),
+            splitAndThen(Function.identity()),
             plugin -> builder.addPluginName(plugin, true)
         );
 
@@ -136,11 +145,6 @@ public RuntimeOptionsBuilder parse(Map<String, String> properties) {
         return builder;
     }
 
-    private Collection<URI> parseGlueFile(String property) {
-        Path glueFile = Paths.get(property);
-        return OptionsFileParser.parseGlueFile(glueFile);
-    }
-
     private Collection<FeatureWithLines> parseRerunFile(RuntimeOptionsBuilder builder, String property) {
         builder.setIsRerun(true);
         Path rerunFile = Paths.get(property);

core/src/test/java/io/cucumber/core/options/CucumberPropertiesParserTest.java

@@ -83,6 +83,16 @@ void should_parse_features() {
         ));
     }
 
+    @Test
+    void should_parse_features_list() {
+        properties.put(Constants.FEATURES_PROPERTY_NAME, "com/example/app.feature, com/example/other.feature");
+        RuntimeOptions options = cucumberPropertiesParser.parse(properties).build();
+        assertThat(options.getFeaturePaths(), contains(
+            URI.create("file:com/example/app.feature"),
+            URI.create("file:com/example/other.feature")
+        ));
+    }
+
     @Test
     void should_parse_filter_name() {
         properties.put(Constants.FILTER_NAME_PROPERTY_NAME, "Test.*");
@@ -110,6 +120,16 @@ void should_parse_glue() {
         ));
     }
 
+    @Test
+    void should_parse_glue_list() {
+        properties.put(Constants.GLUE_PROPERTY_NAME, "com.example.app.steps, com.example.other.steps");
+        RuntimeOptions options = cucumberPropertiesParser.parse(properties).build();
+        assertThat(options.getGlue(), contains(
+            URI.create("classpath:com/example/app/steps"),
+            URI.create("classpath:com/example/other/steps")
+        ));
+    }
+
     @Test
     void should_parse_object_factory() {
         properties.put(Constants.OBJECT_FACTORY_PROPERTY_NAME, CustomObjectFactory.class.getName());
@@ -119,9 +139,10 @@ void should_parse_object_factory() {
 
     @Test
     void should_parse_plugin() {
-        properties.put(Constants.PLUGIN_PROPERTY_NAME, "json:target/cucumber.json");
+        properties.put(Constants.PLUGIN_PROPERTY_NAME, "json:target/cucumber.json, html:target/cucumber.html");
         RuntimeOptions options = cucumberPropertiesParser.parse(properties).build();
         assertThat(options.plugins().get(0).pluginString(), equalTo("json:target/cucumber.json"));
+        assertThat(options.plugins().get(1).pluginString(), equalTo("html:target/cucumber.html"));
     }
 
     @Test