Skip to content

junit-platform: Fix Sub-request to handle plain DiscoverySelector #3746

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

Merged
merged 3 commits into from
Jan 29, 2020
Merged

junit-platform: Fix Sub-request to handle plain DiscoverySelector #3746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5806d70
junit-platform: Fix Sub-request to handle plain DiscoverySelector
bjhargrave Jan 28, 2020
e53da05
tester: Rename test case to disambiguate test results
bjhargrave Jan 29, 2020
9719817
junit-platform: Some improvements to selector resolution
bjhargrave Jan 29, 2020
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
171 changes: 93 additions & 78 deletions ...ester.junit-platform/src/aQute/tester/bundle/engine/discovery/BundleSelectorResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;

import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
Expand Down Expand Up @@ -38,6 +36,7 @@
import org.junit.platform.engine.TestEngine;
import org.junit.platform.engine.UniqueId;
import org.junit.platform.engine.discovery.ClassSelector;
import org.junit.platform.engine.discovery.DiscoverySelectors;
import org.junit.platform.engine.discovery.MethodSelector;
import org.junit.platform.engine.support.descriptor.EngineDescriptor;
import org.osgi.framework.Bundle;
Expand All @@ -52,18 +51,21 @@

public class BundleSelectorResolver {

static final Set<String> JUNIT4_ANNOTATIONS;
static {
Set<String> annotations = new HashSet<>();
annotations.add("org.junit.Test");
annotations.add("org.junit.Before");
annotations.add("org.junit.BeforeClass");
annotations.add("org.junit.After");
annotations.add("org.junit.AfterClass");
annotations.add("org.junit.experimental.theories.Theory");
annotations.add("org.junit.runners.RunWith");
JUNIT4_ANNOTATIONS = Collections.unmodifiableSet(annotations);
}
static final Predicate<String> JUNIT4_ANNOTATIONS = //
name -> {
switch (name) {
case "org.junit.Test" :
case "org.junit.Before" :
case "org.junit.BeforeClass" :
case "org.junit.After" :
case "org.junit.AfterClass" :
case "org.junit.experimental.theories.Theory" :
case "org.junit.runners.RunWith" :
return true;
default :
return false;
}
};

final boolean testUnresolved;
final Map<Long, BundleDescriptor> bundleMap = new HashMap<>();
Expand Down Expand Up @@ -92,8 +94,8 @@ private static String uniqueIdOf(Bundle bundle) {
final Predicate<Bundle> isNotATestBundle;
final Bundle[] allBundles;
final Set<TestEngine> engines;
final Set<String> unresolvedClasses = new HashSet<>();
final Map<String, Set<String>> unresolvedMethods = new HashMap<>();
final Set<String> unresolvedClassNames = new HashSet<>();
final Map<String, Set<String>> unresolvedMethodNames = new HashMap<>();
final Set<Class<?>> resolvedClasses = new HashSet<>();
private boolean verbose = false;

Expand Down Expand Up @@ -121,7 +123,7 @@ private BundleSelectorResolver(BundleContext context, EngineDiscoveryRequest req

methodSelectors = request.getSelectorsByType(MethodSelector.class)
.stream()
.map(selector -> selectMethod(selector.getClassName(), selector.getMethodName(),
.map(selector -> DiscoverySelectors.selectMethod(selector.getClassName(), selector.getMethodName(),
selector.getMethodParameterTypes()))
.collect(toList());

Expand Down Expand Up @@ -155,11 +157,11 @@ private BundleSelectorResolver(BundleContext context, EngineDiscoveryRequest req

classSelectors.stream()
.map(ClassSelector::getClassName)
.forEach(unresolvedClasses::add);
.forEach(unresolvedClassNames::add);
methodSelectors.stream()
.forEach(selector -> {
unresolvedClasses.add(selector.getClassName());
unresolvedMethods.computeIfAbsent(selector.getClassName(), key -> new HashSet<>())
unresolvedClassNames.add(selector.getClassName());
unresolvedMethodNames.computeIfAbsent(selector.getClassName(), key -> new HashSet<>())
.add(selector.getMethodName());
});
}
Expand Down Expand Up @@ -310,24 +312,24 @@ private void resolve() {
}

if (testUnresolved) {
if (!unresolvedClasses.isEmpty()) {
if (!unresolvedClassNames.isEmpty()) {
StaticFailureDescriptor unresolvedClassesDescriptor = new StaticFailureDescriptor(
uniqueId.append("test", "unresolvedClasses"), "Unresolved classes");
for (String unresolvedClass : unresolvedClasses) {
for (String unresolvedClass : unresolvedClassNames) {
unresolvedClassesDescriptor.addChild(new StaticFailureDescriptor(
unresolvedClassesDescriptor.getUniqueId()
.append("test", unresolvedClass),
unresolvedClass,
new JUnitException("Couldn't find class " + unresolvedClass + " in any bundle")));
// Don't report unresolved methods of unresolved classes
unresolvedMethods.remove(unresolvedClass);
unresolvedMethodNames.remove(unresolvedClass);
}
descriptor.addChild(unresolvedClassesDescriptor);
}
if (!unresolvedMethods.isEmpty()) {
if (!unresolvedMethodNames.isEmpty()) {
StaticFailureDescriptor unresolvedMethodsDescriptor = new StaticFailureDescriptor(
uniqueId.append("test", "unresolvedMethods"), "Unresolved methods");
unresolvedMethods.forEach((className, methods) -> {
unresolvedMethodNames.forEach((className, methods) -> {
StaticFailureDescriptor classFailure = new StaticFailureDescriptor(
unresolvedMethodsDescriptor.getUniqueId()
.append("test", className),
Expand Down Expand Up @@ -366,7 +368,7 @@ private void markClassesResolved(Bundle bundle) {
int index = testcase.indexOf('#');
return (index < 0) ? testcase : testcase.substring(0, index);
})
.forEach(unresolvedClasses::remove);
.forEach(unresolvedClassNames::remove);
}

private List<DiscoverySelector> getSelectorsFromTestCasesHeader(BundleDescriptor bd) {
Expand All @@ -385,8 +387,7 @@ private List<DiscoverySelector> getSelectorsFromTestCasesHeader(BundleDescriptor
resolvedClasses.add(testClass);
return selectClass(testClass);
}
MethodSelector parsed = selectMethod(testcase);
return selectMethod(testClass, parsed.getMethodName(), parsed.getMethodParameterTypes());
return selectMethod(testClass, DiscoverySelectors.selectMethod(testcase));
}
} catch (ClassNotFoundException cnfe) {
StaticFailureDescriptor unresolvedClassDescriptor = new StaticFailureDescriptor(bd.getUniqueId()
Expand Down Expand Up @@ -414,6 +415,12 @@ private static Optional<Method> findMethod(Class<?> clazz, String method, String
}
}

private static MethodSelector selectMethod(Class<?> testClass, MethodSelector selector) {
return findMethod(testClass, selector.getMethodName(), selector.getMethodParameterTypes())
.map(method -> DiscoverySelectors.selectMethod(testClass, method))
.orElse(null);
}

private void checkForMixedJUnit34(BundleDescriptor bd, Class<?> testClass) {
try {
// Don't hardcode TestCase.class here as we don't want to introduce
Expand Down Expand Up @@ -453,59 +460,68 @@ private boolean elementHasJUnit4Annotations(AnnotatedElement element) {
return Stream.of(annotations)
.map(Annotation::annotationType)
.map(Class::getName)
.anyMatch(JUNIT4_ANNOTATIONS::contains);
.anyMatch(JUNIT4_ANNOTATIONS);
}

private List<DiscoverySelector> getSelectorsFromSuppliedSelectors(BundleDescriptor bd) {
List<DiscoverySelector> selectors = new ArrayList<>();
Bundle bundle = bd.getBundle();
Bundle host = BundleUtils.getHost(bundle)
.get();
Set<String> testCases = BundleUtils.testCases(bundle)
.collect(toSet());
classSelectors.stream()
.map(ClassSelector::getClassName)
.filter(testCases::contains)
.forEach(className -> {
try {
Class<?> testClass = host.loadClass(className);
unresolvedClasses.remove(className);
info(() -> "removing resolved class: " + testClass + ", that leaves: " + unresolvedClasses);
if (resolvedClasses.add(testClass)) {
checkForMixedJUnit34(bd, testClass);
selectors.add(selectClass(testClass));
List<DiscoverySelector> selectors = Stream.concat( //
classSelectors.stream()
.map(selector -> {
String className = selector.getClassName();
if (testCases.contains(className)) {
try {
Class<?> testClass = host.loadClass(className);
unresolvedClassNames.remove(className);
info(() -> "removing resolved class: " + testClass + ", that leaves: "
+ unresolvedClassNames);
if (resolvedClasses.add(testClass)) {
checkForMixedJUnit34(bd, testClass);
return selectClass(testClass);
}
} catch (ClassNotFoundException cnfe) {
info(() -> "Unresolved class: " + className + ", bundle: " + bundle.getSymbolicName(),
cnfe);
}
}
} catch (ClassNotFoundException cnfe) {
info(() -> "Unresolved class: " + className + ", bundle: " + bundle.getSymbolicName(), cnfe);
}
});
methodSelectors.stream()
.filter(selector -> testCases.contains(selector.getClassName()))
.forEach(selector -> {
final String className = selector.getClassName();
try {
Class<?> testClass = host.loadClass(className);
if (!resolvedClasses.contains(testClass)) {
checkForMixedJUnit34(bd, testClass);
unresolvedClasses.remove(className);
Optional<Method> method = findMethod(testClass, selector.getMethodName(),
selector.getMethodParameterTypes());
if (method.isPresent()) {
selectors.add(selectMethod(testClass, method.get()));

Set<String> methods = unresolvedMethods.get(className);
if (methods != null) {
methods.remove(selector.getMethodName());
if (methods.isEmpty()) {
unresolvedMethods.remove(className);
return null;
}), //
methodSelectors.stream()
.map(selector -> {
String className = selector.getClassName();
if (testCases.contains(className)) {
try {
Class<?> testClass = host.loadClass(className);
if (!resolvedClasses.contains(testClass)) {
checkForMixedJUnit34(bd, testClass);
unresolvedClassNames.remove(className);
MethodSelector methodSelector = selectMethod(testClass, selector);
if (methodSelector != null) {
unresolvedMethodNames.compute(className, (k, methods) -> {
if (methods != null) {
methods.remove(methodSelector.getMethodName());
if (!methods.isEmpty()) {
return methods;
}
}
return null;
});
}
return methodSelector;
}
} catch (ClassNotFoundException cnfe) {
info(() -> "Unresolved class: " + className + ", bundle: " + bundle.getSymbolicName(),
cnfe);
}
}
} catch (ClassNotFoundException cnfe) {
info(() -> "Unresolved class: " + className + ", bundle: " + bundle.getSymbolicName(), cnfe);
}
});
return null;
}))
.filter(Objects::nonNull)
.collect(toList());
info(() -> "Selectors: " + selectors);
return selectors;
}
Expand All @@ -520,16 +536,15 @@ public class SubDiscoveryRequest implements EngineDiscoveryRequest {
@Override
public <T extends DiscoverySelector> List<T> getSelectorsByType(Class<T> selectorType) {
info(() -> "Getting selectors from sub-request for: " + selectorType);
if (selectorType.equals(ClassSelector.class) || selectorType.equals(MethodSelector.class)) {
return selectors.stream()
.filter(selectorType::isInstance)
.map(selectorType::cast)
.collect(toList());
}
if (selectorType.equals(BundleSelector.class)) {
return new ArrayList<>();
}
return request.getSelectorsByType(selectorType);
return Stream.concat( //
request.getSelectorsByType(selectorType)
.stream()
.filter(selector -> !(selector instanceof ClassSelector || selector instanceof MethodSelector
|| selector instanceof BundleSelector)),
selectors.stream()
.filter(selectorType::isInstance))
.map(selectorType::cast)
.collect(toList());
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...er/junit/platform/test/ActivatorTest.java → ...form/test/ActivatorJUnitPlatformTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
import aQute.tester.testclasses.junit.platform.Mixed45Test;
import aQute.tester.testclasses.junit.platform.ParameterizedTesterNamesTest;

public class ActivatorTest extends AbstractActivatorTest {
public ActivatorTest() {
public class ActivatorJUnitPlatformTest extends AbstractActivatorTest {
public ActivatorJUnitPlatformTest() {
super("aQute.tester.junit.platform.Activator", "biz.aQute.tester.junit-platform");
}

Expand Down