Polishing

Author: mpkorstanje

CHANGELOG.md

@@ -10,6 +10,13 @@ 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] Added 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] Added option order features and scenarios ([#2835](https://github.com/cucumber/cucumber-jvm/pull/2835) M.P. Korstanje)
+- [JUnit Platform Engine] Log warnings 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)
 
 ## [7.22.0] - 2025-04-05
 ### Changed
@@ -18,11 +25,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Java, Java8] Significantly reduced number of emitted step- and hook-definition messages ([#2971](https://github.com/cucumber/cucumber-jvm/pull/2971) M.P. Korstanje & Julien Kronegg)
 - [Core] Removed workarounds to limit size of html report ([#2971](https://github.com/cucumber/cucumber-jvm/pull/2971) M.P. Korstanje & Julien Kronegg)
 - [JUnit Platform Engine] Use JUnit Platform 1.12.0 (JUnit Jupiter 5.12.0)
-- [JUnit Platform Engine] Use JUnit's `EngineDiscoveryRequestResolver` to resolve classpath based resources. ([#2835](https://github.com/cucumber/cucumber-jvm/pull/2835) M.P. Korstanje)
-
-### Added
-- [JUnit Platform Engine] Added 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] Log warnings 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)
 
 ### Deprecated
 - [Core] Deprecated `ScenarioScoped` glue ([#2971](https://github.com/cucumber/cucumber-jvm/pull/2971) M.P. Korstanje & Julien Kronegg)

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

@@ -4,8 +4,6 @@
 import io.cucumber.core.eventbus.UuidGenerator;
 import io.cucumber.core.feature.FeatureWithLines;
 import io.cucumber.core.feature.GluePath;
-import io.cucumber.core.logging.Logger;
-import io.cucumber.core.logging.LoggerFactory;
 import io.cucumber.core.options.ObjectFactoryParser;
 import io.cucumber.core.options.PluginOption;
 import io.cucumber.core.options.SnippetTypeParser;
@@ -27,10 +25,8 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
-import java.util.Random;
 import java.util.Set;
 import java.util.function.UnaryOperator;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -61,7 +57,6 @@ class CucumberConfiguration implements
         io.cucumber.core.backend.Options,
         io.cucumber.core.eventbus.Options {
 
-    private static final Logger log = LoggerFactory.getLogger(CucumberConfiguration.class);
     private final ConfigurationParameters configurationParameters;
 
     CucumberConfiguration(ConfigurationParameters configurationParameters) {
@@ -216,29 +211,7 @@ ExclusiveResourceConfiguration getExclusiveResourceConfiguration(String tag) {
     }
 
     UnaryOperator<List<AbstractCucumberTestDescriptor>> getOrderer() {
-        return configurationParameters.get(EXECUTION_ORDER_PROPERTY_NAME, order -> {
-            if (order.equals("lexical")) {
-                return StandardDescriptorOrders.lexicalUriOrder();
-            }
-            if (order.equals("reverse")) {
-                return StandardDescriptorOrders.reverseLexicalUriOrder();
-            }
-            Pattern randomAndSeedPattern = Pattern.compile("random(?::(\\d+))?");
-            Matcher matcher = randomAndSeedPattern.matcher(order);
-            if (!matcher.matches()) {
-                throw new IllegalArgumentException("Invalid order. Must be either reverse, random or random:<long>");
-            }
-            final long seed;
-            String seedString = matcher.group(1);
-            if (seedString != null) {
-                seed = Long.parseLong(seedString);
-                return StandardDescriptorOrders.random(seed);
-            } else {
-                seed = Math.abs(new Random().nextLong());
-                log.info(() -> "Using random test descriptor order. Seed: " + seed);
-                return StandardDescriptorOrders.random(seed);
-            }
-        })
+        return configurationParameters.get(EXECUTION_ORDER_PROPERTY_NAME, StandardDescriptorOrders::parseOrderer)
                 .orElseGet(StandardDescriptorOrders::lexicalUriOrder);
     }
 }

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

@@ -1,12 +1,18 @@
 package io.cucumber.junit.platform.engine;
 
+import io.cucumber.core.logging.Logger;
+import io.cucumber.core.logging.LoggerFactory;
+
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Random;
 import java.util.function.UnaryOperator;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 final class StandardDescriptorOrders {
+    private static final Logger log = LoggerFactory.getLogger(StandardDescriptorOrders.class);
 
     private static final Comparator<AbstractCucumberTestDescriptor> lexical = Comparator
             .comparing(AbstractCucumberTestDescriptor::getUri)
@@ -39,4 +45,26 @@ static UnaryOperator<List<AbstractCucumberTestDescriptor>> random(final long see
         };
     }
 
+    static UnaryOperator<List<AbstractCucumberTestDescriptor>> parseOrderer(String order) {
+        if (order.equals("lexical")) {
+            return StandardDescriptorOrders.lexicalUriOrder();
+        }
+        if (order.equals("reverse")) {
+            return StandardDescriptorOrders.reverseLexicalUriOrder();
+        }
+        Pattern randomAndSeedPattern = Pattern.compile("random(?::(\\d+))?");
+        Matcher matcher = randomAndSeedPattern.matcher(order);
+        if (!matcher.matches()) {
+            throw new IllegalArgumentException("Invalid order. Must be either reverse, random or random:<long>");
+        }
+        final long seed;
+        String seedString = matcher.group(1);
+        if (seedString != null) {
+            seed = Long.parseLong(seedString);
+        } else {
+            seed = Math.abs(new Random().nextLong());
+            log.info(() -> "Using random test descriptor order. Seed: " + seed);
+        }
+        return StandardDescriptorOrders.random(seed);
+    }
 }