Skip to content

Commit

Permalink
#190 Removed TestEngine.discover(request)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlink
jlink committed Mar 18, 2016
1 parent 0ffade0 commit f05e947
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 36 deletions.
8 changes: 1 addition & 7 deletions junit-engine-api/src/main/java/org/junit/gen5/engine/TestEngine.java
View file
Expand Up @@ -20,13 +20,7 @@
@API(Experimental) @API(Experimental)
public interface TestEngine { public interface TestEngine {


default String getId() { String getId();
return getClass().getCanonicalName();
}

default TestDescriptor discover(EngineDiscoveryRequest discoveryRequest) {
return discover(discoveryRequest, UniqueId.forEngine(getId()));
}


TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId); TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId);


Expand Down
3 changes: 2 additions & 1 deletion junit-tests/src/test/java/org/junit/gen5/engine/ExecutionEventRecorder.java
View file
Expand Up @@ -38,7 +38,8 @@
public class ExecutionEventRecorder implements EngineExecutionListener { public class ExecutionEventRecorder implements EngineExecutionListener {


public static List<ExecutionEvent> execute(TestEngine testEngine, EngineDiscoveryRequest discoveryRequest) { public static List<ExecutionEvent> execute(TestEngine testEngine, EngineDiscoveryRequest discoveryRequest) {
TestDescriptor engineTestDescriptor = testEngine.discover(discoveryRequest); TestDescriptor engineTestDescriptor = testEngine.discover(discoveryRequest,
UniqueId.forEngine(testEngine.getId()));
ExecutionEventRecorder listener = new ExecutionEventRecorder(); ExecutionEventRecorder listener = new ExecutionEventRecorder();
testEngine.execute(new ExecutionRequest(engineTestDescriptor, listener)); testEngine.execute(new ExecutionRequest(engineTestDescriptor, listener));
return listener.getExecutionEvents(); return listener.getExecutionEvents();
Expand Down
58 changes: 31 additions & 27 deletions junit-tests/src/test/java/org/junit/gen5/engine/junit4/JUnit4TestEngineDiscoveryTests.java
View file
Expand Up @@ -71,7 +71,7 @@ void resolvesSimpleJUnit4TestClass() throws Exception {
Class<?> testClass = PlainJUnit4TestCaseWithSingleTestWhichFails.class; Class<?> testClass = PlainJUnit4TestCaseWithSingleTestWhichFails.class;
TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass); TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand All @@ -85,7 +85,7 @@ void resolvesIgnoredJUnit4TestClass() {
Class<?> testClass = IgnoredJUnit4TestCase.class; Class<?> testClass = IgnoredJUnit4TestCase.class;
TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass); TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertFalse(runnerDescriptor.isContainer()); assertFalse(runnerDescriptor.isContainer());
Expand All @@ -100,7 +100,7 @@ void resolvesJUnit4TestClassWithCustomRunner() throws Exception {
Class<?> testClass = SingleFailingTheoryTestCase.class; Class<?> testClass = SingleFailingTheoryTestCase.class;
TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass); TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand All @@ -114,7 +114,7 @@ void resolvesJUnit3TestCase() throws Exception {
Class<?> testClass = PlainJUnit3TestCaseWithSingleTestWhichFails.class; Class<?> testClass = PlainJUnit3TestCaseWithSingleTestWhichFails.class;
TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass); TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand All @@ -129,7 +129,7 @@ void resolvesJUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails() throws Exce
Class<?> testClass = PlainJUnit3TestCaseWithSingleTestWhichFails.class; Class<?> testClass = PlainJUnit3TestCaseWithSingleTestWhichFails.class;
TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(suiteClass); TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(suiteClass);


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor suiteDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(suiteDescriptor, suiteClass); assertRunnerTestDescriptor(suiteDescriptor, suiteClass);
Expand All @@ -147,7 +147,7 @@ void resolvesJUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored() th
Class<?> testClass = PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.class; Class<?> testClass = PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.class;
TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(suiteClass); TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(suiteClass);


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor suiteDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(suiteDescriptor, suiteClass); assertRunnerTestDescriptor(suiteDescriptor, suiteClass);
Expand All @@ -165,7 +165,7 @@ void resolvesJUnit4TestCaseWithOverloadedMethod() {
Class<?> testClass = JUnit4TestCaseWithOverloadedMethod.class; Class<?> testClass = JUnit4TestCaseWithOverloadedMethod.class;
TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass); TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand Down Expand Up @@ -198,7 +198,7 @@ void doesNotResolveClassRunWithJUnit5() {
void resolvesClasspathSelector() throws Exception { void resolvesClasspathSelector() throws Exception {
File root = getClasspathRoot(PlainJUnit4TestCaseWithSingleTestWhichFails.class); File root = getClasspathRoot(PlainJUnit4TestCaseWithSingleTestWhichFails.class);
TestDiscoveryRequest discoveryRequest = request().select(forPaths(singleton(root))).build(); TestDiscoveryRequest discoveryRequest = request().select(forPaths(singleton(root))).build();
TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


// @formatter:off // @formatter:off
assertThat(engineDescriptor.getChildren()) assertThat(engineDescriptor.getChildren())
Expand All @@ -216,7 +216,7 @@ void resolvesApplyingClassFilters() throws Exception {
TestDiscoveryRequest discoveryRequest = request().select(forPaths(singleton(root))).filter( TestDiscoveryRequest discoveryRequest = request().select(forPaths(singleton(root))).filter(
ClassFilter.byNamePattern(".*JUnit4.*"), ClassFilter.byNamePattern(".*Plain.*")).build(); ClassFilter.byNamePattern(".*JUnit4.*"), ClassFilter.byNamePattern(".*Plain.*")).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


// @formatter:off // @formatter:off
assertThat(engineDescriptor.getChildren()) assertThat(engineDescriptor.getChildren())
Expand All @@ -234,7 +234,7 @@ void resolvesPackageSelectorForJUnit4SamplesPackage() {
TestDiscoveryRequest discoveryRequest = request().select( TestDiscoveryRequest discoveryRequest = request().select(
forPackageName(testClass.getPackage().getName())).build(); forPackageName(testClass.getPackage().getName())).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


// @formatter:off // @formatter:off
assertThat(engineDescriptor.getChildren()) assertThat(engineDescriptor.getChildren())
Expand All @@ -251,7 +251,7 @@ void resolvesPackageSelectorForJUnit3SamplesPackage() {
TestDiscoveryRequest discoveryRequest = request().select( TestDiscoveryRequest discoveryRequest = request().select(
forPackageName(testClass.getPackage().getName())).build(); forPackageName(testClass.getPackage().getName())).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


// @formatter:off // @formatter:off
assertThat(engineDescriptor.getChildren()) assertThat(engineDescriptor.getChildren())
Expand All @@ -267,7 +267,7 @@ void resolvesClassesWithInheritedMethods() throws Exception {
Class<?> testClass = PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.class; Class<?> testClass = PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.class;
TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass); TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertEquals(testClass.getName(), runnerDescriptor.getDisplayName()); assertEquals(testClass.getName(), runnerDescriptor.getDisplayName());
Expand All @@ -283,7 +283,7 @@ void resolvesCategoriesIntoTags() {
Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class; Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass); TestDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertThat(runnerDescriptor.getTags()).containsOnly(new TestTag(Plain.class.getName())); assertThat(runnerDescriptor.getTags()).containsOnly(new TestTag(Plain.class.getName()));
Expand Down Expand Up @@ -311,7 +311,7 @@ void resolvesMethodSelectorForSingleMethod() throws Exception {
TestDiscoveryRequest discoveryRequest = request().select( TestDiscoveryRequest discoveryRequest = request().select(
MethodSelector.forMethod(testClass, testClass.getMethod("failingTest"))).build(); MethodSelector.forMethod(testClass, testClass.getMethod("failingTest"))).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand All @@ -327,7 +327,7 @@ void resolvesMethodSelectorForTwoMethodsOfSameClass() throws Exception {
MethodSelector.forMethod(testClass, testClass.getMethod("failingTest")), MethodSelector.forMethod(testClass, testClass.getMethod("failingTest")),
MethodSelector.forMethod(testClass, testClass.getMethod("successfulTest"))).build(); MethodSelector.forMethod(testClass, testClass.getMethod("successfulTest"))).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand All @@ -348,7 +348,7 @@ void resolvesUniqueIdSelectorForSingleMethod() throws Exception {
TestDiscoveryRequest discoveryRequest = request().select( TestDiscoveryRequest discoveryRequest = request().select(
forUniqueId(uniqueIdForMethod(testClass, "failingTest"))).build(); forUniqueId(uniqueIdForMethod(testClass, "failingTest"))).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand All @@ -362,7 +362,7 @@ void resolvesUniqueIdSelectorForSingleClass() throws Exception {
Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class; Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
TestDiscoveryRequest discoveryRequest = request().select(forUniqueId(uniqueIdForClass(testClass))).build(); TestDiscoveryRequest discoveryRequest = request().select(forUniqueId(uniqueIdForClass(testClass))).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand All @@ -377,7 +377,7 @@ void resolvesUniqueIdSelectorOfSingleClassWithinSuite() throws Exception {
TestDiscoveryRequest discoveryRequest = request().select( TestDiscoveryRequest discoveryRequest = request().select(
forUniqueId(uniqueIdForClasses(suiteClass, testClass))).build(); forUniqueId(uniqueIdForClasses(suiteClass, testClass))).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor suiteDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(suiteDescriptor, suiteClass); assertRunnerTestDescriptor(suiteDescriptor, suiteClass);
Expand All @@ -397,7 +397,7 @@ void resolvesUniqueIdSelectorOfSingleMethodWithinSuite() throws Exception {
TestDiscoveryRequest discoveryRequest = request().select(forUniqueId( TestDiscoveryRequest discoveryRequest = request().select(forUniqueId(
uniqueIdForMethod(uniqueIdForClasses(suiteClass, testClass), testClass, "successfulTest"))).build(); uniqueIdForMethod(uniqueIdForClasses(suiteClass, testClass), testClass, "successfulTest"))).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor suiteDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(suiteDescriptor, suiteClass); assertRunnerTestDescriptor(suiteDescriptor, suiteClass);
Expand All @@ -417,7 +417,7 @@ void resolvesMultipleUniqueIdSelectorsForMethodsOfSameClass() throws Exception {
forUniqueId(uniqueIdForMethod(testClass, "successfulTest")), forUniqueId(uniqueIdForMethod(testClass, "successfulTest")),
forUniqueId(uniqueIdForMethod(testClass, "failingTest"))).build(); forUniqueId(uniqueIdForMethod(testClass, "failingTest"))).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand All @@ -435,7 +435,7 @@ void doesNotResolveMissingUniqueIdSelectorForSingleClass() throws Exception {
TestDiscoveryRequest discoveryRequest = request().select( TestDiscoveryRequest discoveryRequest = request().select(
forUniqueId(uniqueIdForClass(testClass) + "/[test:doesNotExist]")).build(); forUniqueId(uniqueIdForClass(testClass) + "/[test:doesNotExist]")).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand All @@ -452,7 +452,7 @@ void ignoresMoreFineGrainedSelectorsWhenClassIsSelectedAsWell() throws Exception
forUniqueId(uniqueIdForMethod(testClass, "abortedTest")), forClass(testClass) // forUniqueId(uniqueIdForMethod(testClass, "abortedTest")), forClass(testClass) //
).build(); ).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand All @@ -468,7 +468,7 @@ void resolvesCombinationOfMethodAndUniqueIdSelector() throws Exception {
forUniqueId(uniqueIdForMethod(testClass, "abortedTest") // forUniqueId(uniqueIdForMethod(testClass, "abortedTest") //
)).build(); )).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand All @@ -487,7 +487,7 @@ void ignoresRedundantSelector() throws Exception {
forUniqueId(uniqueIdForMethod(testClass, "failingTest") // forUniqueId(uniqueIdForMethod(testClass, "failingTest") //
)).build(); )).build();


TestDescriptor engineDescriptor = engine.discover(discoveryRequest); TestDescriptor engineDescriptor = discoverTests(discoveryRequest);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand Down Expand Up @@ -518,7 +518,7 @@ void resolvesClassForMethodSelectorForClassWithNonFilterableRunner() throws Exce
.build(); .build();
// @formatter:on // @formatter:on


TestDescriptor engineDescriptor = engine.discover(request); TestDescriptor engineDescriptor = discoverTests(request);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertEquals(testClass.getName(), runnerDescriptor.getDisplayName()); assertEquals(testClass.getName(), runnerDescriptor.getDisplayName());
Expand All @@ -531,7 +531,7 @@ void usesCustomUniqueIdsWhenPresent() throws Exception {
Class<?> testClass = JUnit4TestCaseWithRunnerWithCustomUniqueIds.class; Class<?> testClass = JUnit4TestCaseWithRunnerWithCustomUniqueIds.class;
TestDiscoveryRequest request = request().select(forClass(testClass)).build(); TestDiscoveryRequest request = request().select(forClass(testClass)).build();


TestDescriptor engineDescriptor = engine.discover(request); TestDescriptor engineDescriptor = discoverTests(request);


TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
assertRunnerTestDescriptor(runnerDescriptor, testClass); assertRunnerTestDescriptor(runnerDescriptor, testClass);
Expand All @@ -558,6 +558,10 @@ private TestDescriptor findChildByDisplayName(TestDescriptor runnerDescriptor, S
// @formatter:on // @formatter:on
} }


private TestDescriptor discoverTests(TestDiscoveryRequest discoveryRequest) {
return engine.discover(discoveryRequest, UniqueId.forEngine(engine.getId()));
}

private File getClasspathRoot(Class<?> testClass) throws Exception { private File getClasspathRoot(Class<?> testClass) throws Exception {
URL location = testClass.getProtectionDomain().getCodeSource().getLocation(); URL location = testClass.getProtectionDomain().getCodeSource().getLocation();
return new File(location.toURI()); return new File(location.toURI());
Expand All @@ -570,7 +574,7 @@ private void assertYieldsNoDescriptors(Class<?> testClass) {
} }


private void assertYieldsNoDescriptors(TestDiscoveryRequest request) { private void assertYieldsNoDescriptors(TestDiscoveryRequest request) {
TestDescriptor engineDescriptor = engine.discover(request); TestDescriptor engineDescriptor = discoverTests(request);


assertThat(engineDescriptor.getChildren()).isEmpty(); assertThat(engineDescriptor.getChildren()).isEmpty();
} }
Expand Down
3 changes: 2 additions & 1 deletion junit-tests/src/test/java/org/junit/gen5/engine/junit5/AbstractJUnit5TestEngineTests.java
View file
Expand Up @@ -16,6 +16,7 @@
import org.junit.gen5.engine.ExecutionEventRecorder; import org.junit.gen5.engine.ExecutionEventRecorder;
import org.junit.gen5.engine.ExecutionRequest; import org.junit.gen5.engine.ExecutionRequest;
import org.junit.gen5.engine.TestDescriptor; import org.junit.gen5.engine.TestDescriptor;
import org.junit.gen5.engine.UniqueId;
import org.junit.gen5.launcher.TestDiscoveryRequest; import org.junit.gen5.launcher.TestDiscoveryRequest;


/** /**
Expand All @@ -39,7 +40,7 @@ protected ExecutionEventRecorder executeTests(TestDiscoveryRequest request) {
} }


protected TestDescriptor discoverTests(TestDiscoveryRequest request) { protected TestDescriptor discoverTests(TestDiscoveryRequest request) {
return engine.discover(request); return engine.discover(request, UniqueId.forEngine(engine.getId()));
} }


} }

0 comments on commit f05e947

Please sign in to comment.