Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preliminary support for specifying run order in JUnit5 #3

Draft
wants to merge 1 commit into
base: modifiedRunOrder
Choose a base branch
from
Draft

Preliminary support for specifying run order in JUnit5 #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 40 additions & 2 deletions ...platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,25 @@
import static org.apache.maven.surefire.api.util.TestsToRun.fromClass;
import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;

import java.io.IOException;
import java.io.StringReader;
import java.io.UncheckedIOException;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.logging.Logger;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;
import java.util.logging.Logger;
import java.util.stream.Collectors;

import org.apache.maven.surefire.api.provider.AbstractProvider;
import org.apache.maven.surefire.api.provider.ProviderParameters;
Expand Down Expand Up @@ -212,8 +217,41 @@ private void execute( TestsToRun testsToRun, RunListenerAdapter adapter )
if ( testsToRun.allowEagerReading() )
{
List<DiscoverySelector> selectors = new ArrayList<>();
Comparator<String> comparator = parameters.getRunOrderCalculator().comparatorForTestMethods();
testsToRun.iterator()
.forEachRemaining( c -> selectors.add( selectClass( c.getName() ) ) );
.forEachRemaining( c ->
{
List<Method> methods = stream( c.getMethods() )
.filter( m -> //Select methods with annotation @Test.
// The core problem unresolved to order test methods.
{
for ( Annotation a : m.getDeclaredAnnotations() )
{
if ( a.toString().contains( "Test" ) )//Temporarily hard-coded.
{
return true;
}
}
return false;
} )
.sorted( ( m1, m2 ) -> //Apply run order for methods
{
if ( comparator != null )
{
return comparator.compare( m1.getName() + "(" + c.getName() + ")",
m2.getName() + "(" + c.getName() + ")" );
}
else
{
return 0;
}
} )
.collect( Collectors.toList() );
for ( Method method : methods )
{
selectors.add( selectMethod( c.getName() + "#" + method.getName() ) );
}
} );

LauncherDiscoveryRequestBuilder builder = request()
.filters( filters )
Expand Down