Skip to content

Commit b8ab9f6

Browse files
committed
Remove duplication
1 parent 1e47b66 commit b8ab9f6

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ public EngineDiscoveryOrchestrator(Iterable<TestEngine> testEngines,
7575
* {@linkplain TestDescriptor#prune() prunes} the resulting test tree.
7676
*/
7777
public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, Phase phase) {
78-
Map<TestEngine, TestDescriptor> result = discover(request, phase, UniqueId::forEngine);
79-
return new LauncherDiscoveryResult(result, request.getConfigurationParameters(),
80-
request.getOutputDirectoryProvider());
78+
return discover(request, phase, UniqueId::forEngine);
8179
}
8280

8381
/**
@@ -95,18 +93,18 @@ public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, Phase
9593
* will not emit start or emit events for engines without tests.
9694
*/
9795
public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, Phase phase, UniqueId parentId) {
98-
Map<TestEngine, TestDescriptor> testEngines = discover(request, phase, parentId::appendEngine);
99-
LauncherDiscoveryResult result = new LauncherDiscoveryResult(testEngines, request.getConfigurationParameters(),
100-
request.getOutputDirectoryProvider());
96+
LauncherDiscoveryResult result = discover(request, phase, parentId::appendEngine);
10197
return result.withRetainedEngines(TestDescriptor::containsTests);
10298
}
10399

104-
private Map<TestEngine, TestDescriptor> discover(LauncherDiscoveryRequest request, Phase phase,
100+
private LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, Phase phase,
105101
Function<String, UniqueId> uniqueIdCreator) {
106102
LauncherDiscoveryListener listener = getLauncherDiscoveryListener(request);
107103
listener.launcherDiscoveryStarted(request);
108104
try {
109-
return discoverSafely(request, phase, listener, uniqueIdCreator);
105+
Map<TestEngine, TestDescriptor> testEngines = discoverSafely(request, phase, listener, uniqueIdCreator);
106+
return new LauncherDiscoveryResult(testEngines, request.getConfigurationParameters(),
107+
request.getOutputDirectoryProvider());
110108
}
111109
finally {
112110
listener.launcherDiscoveryFinished(request);

0 commit comments

Comments
 (0)