This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/master by this push:
     new 78309e90d Fix #3544: don't configure Jupiter's class orderer for 
runOrder=random (#3545)
78309e90d is described below

commit 78309e90d294c2b1622fc12b12f5ef107b3a351d
Author: Arturo Bernal <[email protected]>
AuthorDate: Thu Nov 12 12:34:18 2026 +0100

    Fix #3544: don't configure Jupiter's class orderer for runOrder=random 
(#3545)
    
    DefaultRunOrderCalculator already shuffles the discovered test classes
    with the Surefire seed before they reach JUnitPlatformProvider. Also
    configuring Jupiter's own ClassOrderer$Random applies that same
    permutation a second time, which restricts the final class order to
    permutation squares instead of a uniformly random order -- with two
    classes, they never swap.
    
    Jupiter has no other way to shuffle methods within a class, so its
    method orderer is still configured and still needs the seed. Its class
    orderer is simply left unset when runOrder=random, since Surefire
    already ordered the classes itself; the raw seed is passed through
    unchanged now that there's nothing left to decorrelate it from.
    
    Updated shouldPassSurefireRandomSeedToJupiter to assert both the raw
    seed and that the class orderer key is absent. Full
    surefire-junit-platform test suite, checkstyle and spotless pass
    locally.
---
 .../surefire/junitplatform/JUnitPlatformProvider.java      | 14 +++++++++++---
 .../surefire/junitplatform/JUnitPlatformProviderTest.java  |  5 ++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git 
a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
 
b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
index 59a6fe2f7..f0fe005a5 100644
--- 
a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
+++ 
b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
@@ -183,8 +183,12 @@ private void setupRunOrder() {
         String runOrder = 
parameters.getProviderProperties().get(RUN_ORDER_PROP);
         if (runOrder != null) {
             if (runOrder.equals("random")) {
-                setDefaultOrderers(
-                        "org.junit.jupiter.api.MethodOrderer$Random", 
"org.junit.jupiter.api.ClassOrderer$Random");
+                // DefaultRunOrderCalculator already shuffled the discovered 
test classes with this seed
+                // before they reached this provider, so only Jupiter's method 
orderer is configured here --
+                // configuring Jupiter's own class orderer too would shuffle 
the same classes a second time,
+                // which restricts the final class order to permutation 
squares instead of a uniformly random
+                // order (with two classes, they would never swap). See #3544.
+                
setDefaultOrderers("org.junit.jupiter.api.MethodOrderer$Random", null);
                 
Optional.ofNullable(parameters.getProviderProperties().get(RUN_ORDER_RANDOM_SEED_PROP))
                         .ifPresent(seed -> 
getConfigurationParameters().putIfAbsent(JUNIT_RANDOM_SEED, seed));
             } else if (runOrder.equals("alphabetical")) {
@@ -201,12 +205,16 @@ private void setupRunOrder() {
 
     /**
      * Sets the JUnit orderers for runOrder, unless one is already set 
(Quarkus sets its own, for example).
+     * A {@code null} classOrderer leaves Jupiter's class order alone, for 
when Surefire has already ordered
+     * the classes itself.
      */
     private void setDefaultOrderers(String methodOrderer, String classOrderer) 
{
         // what JUnit finds by itself: system properties and 
junit-platform.properties
         ConfigurationParameters configuredElsewhere = 
request().build().getConfigurationParameters();
         setOrdererIfMissing(METHOD_ORDER_DEFAULT, methodOrderer, 
configuredElsewhere);
-        setOrdererIfMissing(CLASS_ORDER_DEFAULT, classOrderer, 
configuredElsewhere);
+        if (classOrderer != null) {
+            setOrdererIfMissing(CLASS_ORDER_DEFAULT, classOrderer, 
configuredElsewhere);
+        }
     }
 
     private void setOrdererIfMissing(String key, String orderer, 
ConfigurationParameters configuredElsewhere) {
diff --git 
a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProviderTest.java
 
b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProviderTest.java
index 14cb708c3..54d0e049d 100644
--- 
a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProviderTest.java
+++ 
b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProviderTest.java
@@ -128,8 +128,11 @@ public void shouldPassSurefireRandomSeedToJupiter() {
 
         JUnitPlatformProvider provider = new 
JUnitPlatformProvider(providerParameters);
 
+        // DefaultRunOrderCalculator already shuffled the classes, so 
Jupiter's class orderer must stay unset (#3544)
         assertThat(provider.getConfigurationParameters())
-                .containsEntry("junit.jupiter.execution.order.random.seed", 
"1234");
+                .containsEntry("junit.jupiter.execution.order.random.seed", 
"1234")
+                .containsEntry(METHOD_ORDER_DEFAULT, 
"org.junit.jupiter.api.MethodOrderer$Random")
+                .doesNotContainKey(CLASS_ORDER_DEFAULT);
     }
 
     @Test

Reply via email to