[JUnit Platform] Use EngineDiscoveryRequestResolver

.github/workflows/test-java.yml

@@ -33,8 +33,6 @@ jobs:
         run: ./mvnw install -Pinclude-extra-modules -DskipTests=true -DskipITs=true -D"archetype.test.skip=true" -D"maven.javadoc.skip=true" --batch-mode -D"style.color=always" --show-version
       - name: Test
         run: ./mvnw verify -Pinclude-extra-modules -D"style.color=always"
-        env:
-          CUCUMBER_PUBLISH_TOKEN: ${{ secrets.CUCUMBER_PUBLISH_TOKEN }}
 
   javadoc:
     name: 'Javadoc'

CHANGELOG.md

@@ -10,9 +10,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- [JUnit Platform Engine] Option to include a parameterized scenario name only if the scenario is parameterized ([#2835](https://github.com/cucumber/cucumber-jvm/pull/2835) M.P. Korstanje)
+- [JUnit Platform Engine] Option to order features and scenarios ([#2835](https://github.com/cucumber/cucumber-jvm/pull/2835) M.P. Korstanje)
+- [JUnit Platform Engine] Log discovery issues when a classpath resource selector is (e.g. `@SelectClasspathResource`) is used to select a directory. ([#2835](https://github.com/cucumber/cucumber-jvm/pull/2835) M.P. Korstanje)
+
 ### Changed
+- [JUnit Platform Engine] Use JUnit's `EngineDiscoveryRequestResolver` to resolve classpath based resources. ([#2835](https://github.com/cucumber/cucumber-jvm/pull/2835) M.P. Korstanje)
 - [JUnit Platform Engine] Use JUnit Platform 1.13.1 (JUnit Jupiter 5.13.1)
 
+### Fixed
+- [JUnit Platform Engine] Log discovery issues for feature files with parse errors. ([#2835](https://github.com/cucumber/cucumber-jvm/pull/2835) M.P. Korstanje)
+
+
 ## [7.23.0] - 2025-05-29
 ### Added
 - [JUnit Platform Engine, TestNG] Remove framework elements from `UndefinedStepException` stacktrace ([#3002](https://github.com/cucumber/cucumber-jvm/pull/3002) M.P. Korstanje)

cucumber-core/src/main/java/io/cucumber/core/feature/FeatureIdentifier.java

@@ -32,11 +32,15 @@ public static URI parse(URI featureIdentifier) {
     }
 
     public static boolean isFeature(URI featureIdentifier) {
-        return featureIdentifier.getSchemeSpecificPart().endsWith(FEATURE_FILE_SUFFIX);
+        return isFeature(featureIdentifier.getSchemeSpecificPart());
     }
 
     public static boolean isFeature(Path path) {
-        return path.getFileName().toString().endsWith(FEATURE_FILE_SUFFIX);
+        return isFeature(path.getFileName().toString());
+    }
+
+    public static boolean isFeature(String fileName) {
+        return fileName.endsWith(FEATURE_FILE_SUFFIX);
     }
 
 }

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

@@ -42,7 +42,8 @@ public final class Constants {
      * Valid values are {@code lexical}, {@code reverse}, {@code random} or
      * {@code random:[seed]}.
      * <p>
-     * By default features are executed in lexical file name order
+     * By default, features are executed in lexical file name order and
+     * scenarios in a feature from top to bottom.
      */
     public static final String EXECUTION_ORDER_PROPERTY_NAME = "cucumber.execution.order";
 

cucumber-core/src/main/java/io/cucumber/core/order/StandardPickleOrders.java

@@ -8,8 +8,9 @@
 
 public final class StandardPickleOrders {
 
-    private static final Comparator<Pickle> pickleUriComparator = Comparator.comparing(Pickle::getUri)
-            .thenComparing(pickle -> pickle.getLocation().getLine());
+    private static final Comparator<Pickle> pickleUriComparator = Comparator
+            .comparing(Pickle::getUri)
+            .thenComparing(Pickle::getLocation);
 
     private StandardPickleOrders() {
 

cucumber-core/src/main/java/io/cucumber/core/resource/PathScanner.java

@@ -2,6 +2,7 @@
 
 import io.cucumber.core.logging.Logger;
 import io.cucumber.core.logging.LoggerFactory;
+import org.apiguardian.api.API;
 
 import java.io.IOException;
 import java.net.URI;
@@ -20,8 +21,10 @@
 import static java.nio.file.FileVisitResult.CONTINUE;
 import static java.nio.file.Files.exists;
 import static java.nio.file.Files.walkFileTree;
+import static org.apiguardian.api.API.Status.INTERNAL;
 
-class PathScanner {
+@API(status = INTERNAL)
+public class PathScanner {
 
     private static final Logger log = LoggerFactory.getLogger(PathScanner.class);
 
@@ -48,10 +51,14 @@ void findResourcesForPath(Path path, Predicate<Path> filter, Function<Path, Cons
         if (!exists(path)) {
             throw new IllegalArgumentException("path must exist: " + path);
         }
+        findResourcesForPath(path, filter, consumer.apply(path));
+    }
 
+    public void findResourcesForPath(Path path, Predicate<Path> filter, Consumer<Path> consumer) {
         try {
-            walkFileTree(path, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE,
-                new ResourceFileVisitor(filter, consumer.apply(path)));
+            EnumSet<FileVisitOption> options = EnumSet.of(FileVisitOption.FOLLOW_LINKS);
+            ResourceFileVisitor visitor = new ResourceFileVisitor(filter, consumer);
+            walkFileTree(path, options, Integer.MAX_VALUE, visitor);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesExample.java

@@ -4,6 +4,7 @@
 import io.cucumber.plugin.event.Location;
 import io.cucumber.plugin.event.Node;
 
+import java.net.URI;
 import java.util.Optional;
 
 final class GherkinMessagesExample implements Node.Example {
@@ -20,6 +21,11 @@ final class GherkinMessagesExample implements Node.Example {
         this.rowIndex = rowIndex;
     }
 
+    @Override
+    public URI getUri() {
+        return parent.getUri();
+    }
+
     @Override
     public Location getLocation() {
         return GherkinMessagesLocation.from(tableRow.getLocation());

cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesExamples.java

@@ -3,6 +3,7 @@
 import io.cucumber.plugin.event.Location;
 import io.cucumber.plugin.event.Node;
 
+import java.net.URI;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -31,6 +32,11 @@ public Collection<Example> elements() {
         return children;
     }
 
+    @Override
+    public URI getUri() {
+        return parent.getUri();
+    }
+
     @Override
     public Location getLocation() {
         return location;

cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesRule.java

@@ -4,6 +4,7 @@
 import io.cucumber.plugin.event.Location;
 import io.cucumber.plugin.event.Node;
 
+import java.net.URI;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -42,6 +43,11 @@ public Collection<Node> elements() {
         return children;
     }
 
+    @Override
+    public URI getUri() {
+        return parent.getUri();
+    }
+
     @Override
     public Location getLocation() {
         return GherkinMessagesLocation.from(rule.getLocation());

cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesScenario.java

@@ -3,6 +3,7 @@
 import io.cucumber.plugin.event.Location;
 import io.cucumber.plugin.event.Node;
 
+import java.net.URI;
 import java.util.Optional;
 
 final class GherkinMessagesScenario implements Node.Scenario {
@@ -20,6 +21,11 @@ public Optional<Node> getParent() {
         return Optional.of(parent);
     }
 
+    @Override
+    public URI getUri() {
+        return parent.getUri();
+    }
+
     @Override
     public Location getLocation() {
         return GherkinMessagesLocation.from(scenario.getLocation());

cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesScenarioOutline.java

@@ -3,6 +3,7 @@
 import io.cucumber.plugin.event.Location;
 import io.cucumber.plugin.event.Node;
 
+import java.net.URI;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -34,6 +35,11 @@ public Collection<Examples> elements() {
         return children;
     }
 
+    @Override
+    public URI getUri() {
+        return parent.getUri();
+    }
+
     @Override
     public Location getLocation() {
         return GherkinMessagesLocation.from(scenario.getLocation());

cucumber-gherkin/src/main/java/io/cucumber/core/gherkin/Feature.java

@@ -2,7 +2,6 @@
 
 import io.cucumber.plugin.event.Node;
 
-import java.net.URI;
 import java.util.List;
 
 public interface Feature extends Node.Feature {
@@ -11,8 +10,6 @@ public interface Feature extends Node.Feature {
 
     List<Pickle> getPickles();
 
-    URI getUri();
-
     String getSource();
 
     Iterable<?> getParseEvents();

cucumber-junit-platform-engine/README.md

@@ -26,7 +26,8 @@ like this:
 
 ```mermaid
 erDiagram
-    "IDE, Maven, Gradle or Console Launcher" ||--|{ "JUnit Platform" : "requests discovery and execution"
+    "IDE" ||--|{ "JUnit Platform" : "requests discovery and execution"
+    "Maven or Gradle" ||--|{ "JUnit Platform" : "requests discovery and execution"
     "Console Launcher" ||--|{ "JUnit Platform" : "requests discovery and execution"
     "JUnit Platform" ||--|{ "Cucumber Test Engine": "forwards request"
     "JUnit Platform" ||--|{ "Jupiter Test Engine": "forwards request"
@@ -211,11 +212,12 @@ different configurations. Conceptually this looks like this:
 
 ```mermaid
 erDiagram
-    "IDE, Maven, Gradle or Console Launcher" ||--|{ "JUnit Platform" : "requests discovery and execution"
+    "IDE" ||--|{ "JUnit Platform" : "requests discovery and execution"
+    "Maven or Gradle" ||--|{ "JUnit Platform" : "requests discovery and execution"
+    "Console Launcher" ||--|{ "JUnit Platform" : "requests discovery and execution"
     "JUnit Platform" ||--|{ "Suite Test Engine": "forwards request"
     "Suite Test Engine" ||--|{ "@Suite annotated class A" : "discovers and executes"
     "Suite Test Engine" ||--|{ "@Suite annotated class B" : "discovers and executes"
-
     "@Suite annotated class A" ||--|{ "JUnit Platform (A)" :  "requests discovery and execution"
     "@Suite annotated class B" ||--|{ "JUnit Platform (B)" :  "requests discovery and execution"
     "JUnit Platform (A)" ||--|{ "Cucumber Test Engine (A)": "forwards request"
@@ -424,12 +426,12 @@ cucumber.junit-platform.naming-strategy=                       # long, short or
 
 cucumber.junit-platform.naming-strategy.short.example-name=    # number, number-and-pickle-if-parameterized or pickle.
                                                                # default: number-and-pickle-if-parameterized
-                                                               # Use example number or pickle name for examples when
+                                                               # Use example number and/or pickle name for examples when
                                                                # short naming strategy is used
 
 cucumber.junit-platform.naming-strategy.long.example-name=     # number, number-and-pickle-if-parameterized or pickle.
                                                                # default: number-and-pickle-if-parameterized
-                                                               # Use example number or pickle name for examples when
+                                                               # Use example number and/or pickle name for examples when
                                                                # long naming strategy is used
 
 cucumber.junit-platform.naming-strategy.surefire.example-name= # number or pickle.
@@ -471,6 +473,16 @@ cucumber.execution.execution-mode.feature=                     # same_thread or
                                                                # concurrent - executes scenarios concurrently on any
                                                                # available thread
 
+cucumber.execution.order=                                     # lexical, reverse or random
+                                                              # default: lexical
+                                                              # lexical - executes features in lexical uri order, scenarios and examples from top to bottom 
+                                                              # reverse - as lexical, but with the elements of each container reversed
+                                                              # random - executes scenarios and examples in a random order within their parent container 
+
+cucumber.execution.order.random.seed=                         # any long
+                                                              # example: 20090120
+                                                              # enables deterministic random execution  
+
 cucumber.execution.parallel.enabled=                           # true or false.
                                                                # default: false
 

cucumber-junit-platform-engine/pom.xml

@@ -65,6 +65,11 @@
             <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-testkit</artifactId>

cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/Constants.java

@@ -291,6 +291,27 @@ public final class Constants {
      */
     public static final String EXECUTION_MODE_FEATURE_PROPERTY_NAME = "cucumber.execution.execution-mode.feature";
 
+    /**
+     * Property name used to set execution order: {@value}
+     * <p>
+     * Valid values are {@code lexical}, {@code reverse} or {@code random}.
+     * <p>
+     * By default, features are executed in lexical file name order and
+     * scenarios in a feature from top to bottom.
+     */
+    public static final String EXECUTION_ORDER_PROPERTY_NAME = io.cucumber.core.options.Constants.EXECUTION_ORDER_PROPERTY_NAME;
+
+    /**
+     * Property name used to set the seed for random execution order: {@value}
+     * <p>
+     * Valid values are any value understood by {@link Long#decode(String)}. If
+     * omitted a random seed is used instead. The exact value can be obtained by
+     * <a
+     * href=https://junit.org/junit5/docs/snapshot/user-guide/#running-tests-discovery-issues>
+     * listening for discovery issues</a>.
+     */
+    public static final String EXECUTION_ORDER_RANDOM_SEED_PROPERTY_NAME = "cucumber.execution.order.random.seed";
+
     /**
      * Property name used to enable parallel test execution: {@value}
      * <p>

cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/Cucumber.java

@@ -24,7 +24,9 @@
  * <p>
  * 
  * @deprecated Please use the JUnit Platform Suite to run Cucumber in
- *             combination with Surefire or Gradle. E.g: <code><pre>{@code
+ *             combination with Surefire or Gradle. E.g:
+ * 
+ *             <pre>{@code
  *package com.example;
  *
  *import org.junit.platform.suite.api.ConfigurationParameter;
@@ -33,15 +35,15 @@
  *
  *import static io.cucumber.junit.platform.engine.Constants.GLUE_PROPERTY_NAME;
  *
- *&#64;Suite
- *&#64;SelectPackages("com.example")
- *&#64;ConfigurationParameter(
- *   key = GLUE_PROPERTY_NAME,
- *   value = "com.example"
- *)
- *public class RunCucumberTest {
- *}
- *}</pre></code>
+ *             @Suite
+ *             @SelectPackages("com.example")
+ *             @ConfigurationParameter(
+ *             key = GLUE_PROPERTY_NAME,
+ *             value = "com.example")
+ *             public class RunCucumberTest {
+ *             }
+ * }</pre>
+ * 
  * @see        CucumberTestEngine
  */
 @API(status = Status.DEPRECATED)