Skip to content

Commit c29dbb2

Browse files
committed
Improve readability by renaming/extracting methods
1 parent 8491772 commit c29dbb2

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,21 @@ public JupiterEngineExecutionContext execute(JupiterEngineExecutionContext conte
102102
context.getExtensionRegistry());
103103
AtomicInteger invocationIndex = new AtomicInteger();
104104
for (TestTemplateInvocationContextProvider provider : providers) {
105-
try (Stream<TestTemplateInvocationContext> stream = provider.provideTestTemplateInvocationContexts(
106-
extensionContext)) {
107-
stream.forEach(invocationContext -> createInvocationTestDescriptor(invocationContext,
108-
invocationIndex.incrementAndGet()).ifPresent(
109-
invocationTestDescriptor -> execute(dynamicTestExecutor, invocationTestDescriptor)));
105+
try (Stream<TestTemplateInvocationContext> stream = invocationContexts(provider, extensionContext)) {
106+
stream.forEach(
107+
invocationContext -> toTestDescriptor(invocationContext, invocationIndex.incrementAndGet()) //
108+
.ifPresent(testDescriptor -> execute(dynamicTestExecutor, testDescriptor)));
110109
}
111110
}
112111
validateWasAtLeastInvokedOnce(invocationIndex.get(), providers);
113112
return context;
114113
}
115114

115+
private static Stream<TestTemplateInvocationContext> invocationContexts(
116+
TestTemplateInvocationContextProvider provider, ExtensionContext extensionContext) {
117+
return provider.provideTestTemplateInvocationContexts(extensionContext);
118+
}
119+
116120
private List<TestTemplateInvocationContextProvider> validateProviders(ExtensionContext extensionContext,
117121
ExtensionRegistry extensionRegistry) {
118122

@@ -127,8 +131,7 @@ private List<TestTemplateInvocationContextProvider> validateProviders(ExtensionC
127131
TestTemplateInvocationContextProvider.class.getSimpleName(), getTestMethod()));
128132
}
129133

130-
private Optional<TestDescriptor> createInvocationTestDescriptor(TestTemplateInvocationContext invocationContext,
131-
int index) {
134+
private Optional<TestDescriptor> toTestDescriptor(TestTemplateInvocationContext invocationContext, int index) {
132135
UniqueId uniqueId = getUniqueId().append(TestTemplateInvocationTestDescriptor.SEGMENT_TYPE, "#" + index);
133136
if (getDynamicDescendantFilter().test(uniqueId, index - 1)) {
134137
return Optional.of(new TestTemplateInvocationTestDescriptor(uniqueId, getTestClass(), getTestMethod(),

0 commit comments

Comments
 (0)