Skip to content

Commit 75fb725

Browse files
committed
Only make post-processed test instances available in ExtensionContext
Issue: #910
1 parent 7c00dfb commit 75fb725

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.Collections;
2323
import java.util.List;
2424
import java.util.Set;
25-
import java.util.function.Consumer;
2625
import java.util.function.Function;
2726

2827
import org.junit.jupiter.api.TestInstance;
@@ -176,23 +175,20 @@ private TestInstanceProvider testInstanceProvider(JupiterEngineExecutionContext
176175
if (this.lifecycle == Lifecycle.PER_CLASS) {
177176
// Eagerly load test instance for BeforeAllCallbacks, if necessary,
178177
// and store the instance in the ExtensionContext.
179-
Object instance = instantiateAndPostProcessTestInstance(parentExecutionContext, extensionContext, registry,
180-
extensionContext::setTestInstance);
178+
Object instance = instantiateAndPostProcessTestInstance(parentExecutionContext, extensionContext, registry);
179+
extensionContext.setTestInstance(instance);
181180
return childRegistry -> instance;
182181
}
183182

184183
// else Lifecycle.PER_METHOD
185184
return childRegistry -> instantiateAndPostProcessTestInstance(parentExecutionContext, extensionContext,
186-
childRegistry.orElse(registry), instance -> {
187-
// no extension context update required
188-
});
185+
childRegistry.orElse(registry));
189186
}
190187

191188
private Object instantiateAndPostProcessTestInstance(JupiterEngineExecutionContext context,
192-
ExtensionContext extensionContext, ExtensionRegistry registry, Consumer<Object> testInstanceConsumer) {
189+
ExtensionContext extensionContext, ExtensionRegistry registry) {
193190

194191
Object instance = instantiateTestClass(context, registry, extensionContext);
195-
testInstanceConsumer.accept(instance);
196192
invokeTestInstancePostProcessors(instance, registry, extensionContext);
197193
return instance;
198194
}

0 commit comments

Comments
 (0)