Skip to content

Commit 5bd4feb

Browse files
committed
subtituted the Objects null checks with junits preconditions null checks
1 parent 6d3f966 commit 5bd4feb

File tree

1 file changed

+33
-0
lines changed

1 file changed

+33
-0
lines changed

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
* https://www.eclipse.org/legal/epl-v20.html
99
*/
1010

11+
<<<<<<< Updated upstream
1112
import java.util.Objects;
13+
=======
14+
import org.junit.platform.commons.util.Preconditions;
15+
import java.util.List;
16+
>>>>>>> Stashed changes
1217
package org.junit.jupiter.engine.descriptor;
1318

1419
import static org.junit.platform.commons.util.CollectionUtils.forEachInReverseOrder;
@@ -27,6 +32,7 @@ class CallbackSupport {
2732
static <T extends Extension> void invokeBeforeCallbacks(Class<T> type, JupiterEngineExecutionContext context,
2833
CallbackInvoker<T> callbackInvoker) {
2934

35+
<<<<<<< Updated upstream
3036
Objects.requireNonNull(type, "type must not be null");
3137
Objects.requireNonNull(context, "context must not be null");
3238
Objects.requireNonNull(callbackInvoker, "callbackInvoker must not be null");
@@ -41,14 +47,41 @@ static <T extends Extension> void invokeBeforeCallbacks(Class<T> type, JupiterEn
4147
break;
4248
}
4349
}
50+
=======
51+
Preconditions.notNull(type, "type must not be null");
52+
Preconditions.notNull(context, "context must not be null");
53+
Preconditions.notNull(callbackInvoker, "callbackInvoker must not be null");
54+
55+
invokeCallbacks(
56+
context.getExtensionRegistry().getExtensions(type),
57+
context.getExtensionContext(),
58+
context.getThrowableCollector(),
59+
false, // forward order on callbacks
60+
true //break out on any first exception encountered
61+
)
62+
>>>>>>> Stashed changes
4463
}
4564

4665
static <T extends Extension> void invokeAfterCallbacks(Class<T> type, JupiterEngineExecutionContext context,
4766
CallbackInvoker<T> callbackInvoker) {
4867

68+
<<<<<<< Updated upstream
4969
Objects.requireNonNull(type, "type must not be null");
5070
Objects.requireNonNull(context, "context must not be null");
5171
Objects.requireNonNull(callbackInvoker, "callbackInvoker must not be null");
72+
=======
73+
Preconditions.notNull(type, "type must not be null");
74+
Preconditions.notNull(context, "context must not be null");
75+
Preconditions.notNull(callbackInvoker, "callbackInvoker must not be null");
76+
77+
invokeCallbacks(
78+
context.getExtensionRegistry().getExtensions(type),
79+
context.getExtensionContext(),
80+
context.getThrowableCollector(),
81+
true, // reverse order on callbacks
82+
false, // allow all the callbacks to run.
83+
)
84+
>>>>>>> Stashed changes
5285

5386
ExtensionRegistry registry = context.getExtensionRegistry();
5487
ExtensionContext extensionContext = context.getExtensionContext();

0 commit comments

Comments
 (0)