Skip to content

Commit 4170597

Browse files
committed
Restore compatibility with Java 8
1 parent a866c01 commit 4170597

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import static org.junit.platform.commons.support.AnnotationSupport.findAnnotation;
1515
import static org.junit.platform.commons.support.AnnotationSupport.isAnnotated;
1616

17+
import java.util.Comparator;
1718
import java.util.List;
1819
import java.util.Optional;
1920
import java.util.function.Consumer;
@@ -98,7 +99,7 @@ private void orderContainedMethods(ClassBasedTestDescriptor classBasedTestDescri
9899
DefaultMethodDescriptor::new, //
99100
descriptorWrapperOrderer);
100101

101-
if (methodOrderer.isEmpty()) {
102+
if (!methodOrderer.isPresent()) {
102103
// If there is an orderer, this is ensured by the call above
103104
classBasedTestDescriptor.orderChildren(methodsBeforeNestedClassesOrderer);
104105
}
@@ -143,7 +144,7 @@ private Optional<Consumer<MethodBasedTestDescriptor>> toValidationAction(Optiona
143144
}
144145

145146
private static UnaryOperator<List<TestDescriptor>> createMethodsBeforeNestedClassesOrderer() {
146-
var methodsFirst = comparing(MethodBasedTestDescriptor.class::isInstance).reversed();
147+
Comparator<Object> methodsFirst = comparing(MethodBasedTestDescriptor.class::isInstance).reversed();
147148
return children -> {
148149
children.sort(methodsFirst);
149150
return children;

0 commit comments

Comments
 (0)