|
22 | 22 | import java.util.Collections; |
23 | 23 | import java.util.List; |
24 | 24 | import java.util.Set; |
25 | | -import java.util.function.Consumer; |
26 | 25 | import java.util.function.Function; |
27 | 26 |
|
28 | 27 | import org.junit.jupiter.api.TestInstance; |
@@ -176,23 +175,20 @@ private TestInstanceProvider testInstanceProvider(JupiterEngineExecutionContext |
176 | 175 | if (this.lifecycle == Lifecycle.PER_CLASS) { |
177 | 176 | // Eagerly load test instance for BeforeAllCallbacks, if necessary, |
178 | 177 | // 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); |
181 | 180 | return childRegistry -> instance; |
182 | 181 | } |
183 | 182 |
|
184 | 183 | // else Lifecycle.PER_METHOD |
185 | 184 | return childRegistry -> instantiateAndPostProcessTestInstance(parentExecutionContext, extensionContext, |
186 | | - childRegistry.orElse(registry), instance -> { |
187 | | - // no extension context update required |
188 | | - }); |
| 185 | + childRegistry.orElse(registry)); |
189 | 186 | } |
190 | 187 |
|
191 | 188 | private Object instantiateAndPostProcessTestInstance(JupiterEngineExecutionContext context, |
192 | | - ExtensionContext extensionContext, ExtensionRegistry registry, Consumer<Object> testInstanceConsumer) { |
| 189 | + ExtensionContext extensionContext, ExtensionRegistry registry) { |
193 | 190 |
|
194 | 191 | Object instance = instantiateTestClass(context, registry, extensionContext); |
195 | | - testInstanceConsumer.accept(instance); |
196 | 192 | invokeTestInstancePostProcessors(instance, registry, extensionContext); |
197 | 193 | return instance; |
198 | 194 | } |
|
0 commit comments