This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 4bb7ae0cfbf Upgrade junit 5.13.0
4bb7ae0cfbf is described below
commit 4bb7ae0cfbf5a39c5485a5b3c562ba2ecb03214f
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Jun 3 09:32:12 2025 +0200
Upgrade junit 5.13.0
---
.../test/junit5/params/ParameterizedExtension.java | 26 +++++++++-------------
parent/pom.xml | 2 +-
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/params/ParameterizedExtension.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/params/ParameterizedExtension.java
index 987a52ba406..ce27c03d497 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/params/ParameterizedExtension.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/params/ParameterizedExtension.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.test.junit5.params;
-import java.lang.reflect.Executable;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -27,20 +26,18 @@ import java.util.stream.Stream;
import org.junit.jupiter.api.extension.Extension;
import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.ParameterContext;
import org.junit.jupiter.api.extension.TestInstancePostProcessor;
import org.junit.jupiter.api.extension.TestInstantiationException;
import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider;
import org.junit.jupiter.params.converter.DefaultArgumentConverter;
import org.junit.jupiter.params.provider.Arguments;
+import org.junit.platform.commons.util.ClassLoaderUtils;
import org.junit.platform.commons.util.CollectionUtils;
import org.junit.platform.commons.util.ReflectionUtils;
import static org.junit.jupiter.params.provider.Arguments.arguments;
import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
public class ParameterizedExtension implements
TestTemplateInvocationContextProvider {
@@ -77,7 +74,7 @@ public class ParameterizedExtension implements
TestTemplateInvocationContextProv
.filter(m -> Modifier.isStatic(m.getModifiers()))
.filter(m -> m.getAnnotation(Parameters.class) != null)
.collect(Collectors.toList());
- if (parameters.isEmpty() && testClass != null) {
+ if (parameters.isEmpty()) {
return getParametersMethods(testClass.getSuperclass());
} else {
return parameters;
@@ -136,20 +133,17 @@ public class ParameterizedExtension implements
TestTemplateInvocationContextProv
"Expected " + fields.size() + " parameters bug got " +
params.length + " when instantiating "
+ clazz.getName());
}
- for (int i = 0; i < fields.size(); i++) {
- Field f = fields.get(i);
- f.setAccessible(true);
- f.set(testInstance,
DefaultArgumentConverter.INSTANCE.convert(params[i], f.getType(),
getContext()));
+ if (!fields.isEmpty()) {
+ ClassLoader classLoader =
ClassLoaderUtils.getClassLoader(context.getExecutionMode().getDeclaringClass());
+ DefaultArgumentConverter converter = new
DefaultArgumentConverter(context);
+ for (int i = 0; i < fields.size(); i++) {
+ Field f = fields.get(i);
+ f.setAccessible(true);
+ f.set(testInstance, converter.convert(params[i],
f.getType(), classLoader));
+ }
}
}
- private ParameterContext getContext() throws NoSuchMethodException {
- Executable executable =
this.getClass().getConstructor(Object[].class).getParameters()[0].getDeclaringExecutable();
- ParameterContext parameterContext = mock(ParameterContext.class);
-
when(parameterContext.getDeclaringExecutable()).thenReturn(executable);
- return parameterContext;
- }
-
protected Stream<Class<?>> hierarchy(Class<?> clazz) {
Class<?> superclass = clazz.getSuperclass();
return Stream.concat(Stream.of(clazz), superclass != null ?
hierarchy(superclass) : Stream.empty());
diff --git a/parent/pom.xml b/parent/pom.xml
index 2b4b203aafe..ab26b36ec12 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -319,7 +319,7 @@
<jt400-version>21.0.4</jt400-version>
<jte-version>3.2.1</jte-version>
<junit-toolbox-version>2.4</junit-toolbox-version>
- <junit-jupiter-version>5.12.2</junit-jupiter-version>
+ <junit-jupiter-version>5.13.0</junit-jupiter-version>
<junit-pioneer-version>2.3.0</junit-pioneer-version>
<juniversalchardet-version>1.0.3</juniversalchardet-version>
<jxmpp-version>1.1.0</jxmpp-version>
