@@ -69,7 +69,7 @@ * @see ParameterResolver * @see BeforeEachCallback */ -public class JedisExtension implements ParameterResolver { +public class JedisExtension extends RedisTestExtensionSupport implements ParameterResolver { private final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create(JedisExtension.class); @@ -80,31 +80,16 @@ public class JedisExtension implements ParameterResolver { JedisClusterSupplier.INSTANCE); @Override - public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) + public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext context) throws ParameterResolutionException { return SUPPORTED_INJECTABLE_TYPES.contains(parameterContext.getParameter().getType()); } - /** - * Attempt to resolve the {@code requestedResourceType}. - * - * @param extensionContext - * @param requestedResourceType - * @param - * @return - */ - public T resolve(ExtensionContext extensionContext, Class requestedResourceType) { - - ExtensionContext.Store store = getStore(extensionContext); - - return (T) store.getOrComputeIfAbsent(requestedResourceType, it -> findSupplier(requestedResourceType).get()); - } - @Override - public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) + public Object resolveParameter(ParameterContext parameterContext, ExtensionContext context) throws ParameterResolutionException { - ExtensionContext.Store store = getStore(extensionContext); + ExtensionContext.Store store = getStore(context); Parameter parameter = parameterContext.getParameter(); Type parameterizedType = parameter.getParameterizedType(); @@ -133,21 +118,8 @@ private Object doGetInstance(Type parameterizedType) { return findSupplier(parameterizedType).get(); } - private ExtensionContext.Store getStore(ExtensionContext extensionContext) { - return extensionContext.getStore(NAMESPACE); - } - - static class ResourceFunction { - - final ResolvableType dependsOn; - final ResolvableType provides; - final Function function; - - public ResourceFunction(ResolvableType dependsOn, ResolvableType provides, Function function) { - this.dependsOn = dependsOn; - this.provides = provides; - this.function = (Function) function; - } + private ExtensionContext.Store getStore(ExtensionContext context) { + return getSessionStore(context, NAMESPACE); } enum JedisSupplier implements Supplier { @@ -155,6 +127,7 @@ enum JedisSupplier implements Supplier { INSTANCE; final Lazy lazy = Lazy.of(() -> { + Jedis client = new Jedis(SettingsUtils.getHost(), SettingsUtils.getPort()); ShutdownQueue.INSTANCE.register(client); @@ -172,6 +145,7 @@ enum JedisClusterSupplier implements Supplier { INSTANCE; final Lazy lazy = Lazy.of(() -> { + JedisCluster client = new JedisCluster(new HostAndPort(SettingsUtils.getHost(), SettingsUtils.getClusterPort())); ShutdownQueue.INSTANCE.register(client); diff --git a/src/test/java/org/springframework/data/redis/test/extension/LettuceExtension.java b/src/test/java/org/springframework/data/redis/test/extension/LettuceExtension.java index 949a0fba7c..d4c14158f5 100644 --- a/src/test/java/org/springframework/data/redis/test/extension/LettuceExtension.java +++ b/src/test/java/org/springframework/data/redis/test/extension/LettuceExtension.java @@ -53,6 +53,7 @@ import org.junit.jupiter.api.extension.ParameterResolver; import org.springframework.core.ResolvableType; import org.springframework.data.redis.SettingsUtils; +import org.springframework.data.redis.test.RedisTestExtensionSupport; import org.springframework.data.util.Lazy; /** @@ -91,7 +92,8 @@ * @see AfterEachCallback * @see AfterAllCallback */ -public class LettuceExtension implements ParameterResolver, AfterAllCallback, AfterEachCallback { +public class LettuceExtension extends RedisTestExtensionSupport + implements ParameterResolver, AfterAllCallback, AfterEachCallback { private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create(LettuceExtension.class); @@ -113,7 +115,7 @@ public class LettuceExtension implements ParameterResolver, AfterAllCallback, Af .singletonList(RedisCommandsFunction.INSTANCE); @Override - public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) + public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext context) throws ParameterResolutionException { return SUPPORTED_INJECTABLE_TYPES.contains(parameterContext.getParameter().getType()); } @@ -121,23 +123,23 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon /** * Attempt to resolve the {@code requestedResourceType}. * - * @param extensionContext + * @param context * @param requestedResourceType * @param * @return */ - public T resolve(ExtensionContext extensionContext, Class requestedResourceType) { + public T resolve(ExtensionContext context, Class requestedResourceType) { - ExtensionContext.Store store = getStore(extensionContext); + ExtensionContext.Store store = getStore(context); return (T) store.getOrComputeIfAbsent(requestedResourceType, it -> findSupplier(requestedResourceType).get()); } @Override - public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) + public Object resolveParameter(ParameterContext parameterContext, ExtensionContext context) throws ParameterResolutionException { - ExtensionContext.Store store = getStore(extensionContext); + ExtensionContext.Store store = getStore(context); Parameter parameter = parameterContext.getParameter(); Type parameterizedType = parameter.getParameterizedType(); @@ -200,8 +202,8 @@ private Object doGetInstance(Type parameterizedType) { .orElseGet(() -> findSupplier(parameterizedType).get()); } - private ExtensionContext.Store getStore(ExtensionContext extensionContext) { - return extensionContext.getStore(NAMESPACE); + private ExtensionContext.Store getStore(ExtensionContext context) { + return getSessionStore(context, NAMESPACE); } private static Optional findFunction(Type type) { diff --git a/src/test/java/org/springframework/data/redis/test/extension/RedisStanalone.java b/src/test/java/org/springframework/data/redis/test/extension/RedisStandalone.java similarity index 97% rename from src/test/java/org/springframework/data/redis/test/extension/RedisStanalone.java rename to src/test/java/org/springframework/data/redis/test/extension/RedisStandalone.java index e04679eb94..06a652fb12 100644 --- a/src/test/java/org/springframework/data/redis/test/extension/RedisStanalone.java +++ b/src/test/java/org/springframework/data/redis/test/extension/RedisStandalone.java @@ -34,5 +34,5 @@ @Retention(RetentionPolicy.RUNTIME) @Inherited @Documented -public @interface RedisStanalone { +public @interface RedisStandalone { } diff --git a/src/test/java/org/springframework/data/redis/test/extension/ShutdownQueue.java b/src/test/java/org/springframework/data/redis/test/extension/ShutdownQueue.java index f818e17e55..ca1debf4f7 100644 --- a/src/test/java/org/springframework/data/redis/test/extension/ShutdownQueue.java +++ b/src/test/java/org/springframework/data/redis/test/extension/ShutdownQueue.java @@ -54,6 +54,10 @@ private static void close() { private final LinkedList closeables = new LinkedList<>(); + public static void register(ShutdownCloseable closeable) { + INSTANCE.closeables.add(closeable::close); + } + public static void register(Closeable closeable) { INSTANCE.closeables.add(closeable); } @@ -62,4 +66,9 @@ public static void register(AutoCloseable closeable) { INSTANCE.closeables.add(() -> IOUtils.closeQuietly(closeable)); } + public interface ShutdownCloseable { + + void close(); + } + } diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/MethodArgumentsProvider.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/MethodArgumentsProvider.java deleted file mode 100644 index 896192fc83..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/MethodArgumentsProvider.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import static java.lang.String.*; -import static org.junit.jupiter.params.provider.Arguments.*; - -import java.io.Closeable; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.stream.Stream; - -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.api.extension.ExtensionContext.Namespace; -import org.junit.jupiter.api.extension.ExtensionContext.Store; -import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.ArgumentsProvider; -import org.junit.jupiter.params.support.AnnotationConsumer; -import org.junit.platform.commons.JUnitException; -import org.junit.platform.commons.util.CollectionUtils; -import org.junit.platform.commons.util.Preconditions; -import org.junit.platform.commons.util.ReflectionUtils; -import org.junit.platform.commons.util.StringUtils; -import org.springframework.data.redis.ConnectionFactoryTracker.Managed; - -/** - * Copy of {@code org.junit.jupiter.params.provider.MethodArgumentsProvider}. - */ -class MethodArgumentsProvider implements ArgumentsProvider, AnnotationConsumer { - - private static final Namespace NAMESPACE = Namespace.create(MethodArgumentsProvider.class); - - private String[] methodNames = new String[0]; - - @Override - public void accept(MethodSource annotation) { - this.methodNames = annotation.value(); - } - - @Override - public Stream provideArguments(ExtensionContext context) { - - Store store = context.getRoot().getStore(NAMESPACE); - Object testInstance = context.getTestInstance().orElse(null); - - return Arrays.stream(this.methodNames).map(factoryMethodName -> getMethod(context, factoryMethodName)) - .map(method -> (CloseablePararmeters) store.getOrComputeIfAbsent(new SourceKey(method, testInstance), - key -> new CloseablePararmeters(ReflectionUtils.invokeMethod(method, testInstance), context))) - .map(CloseablePararmeters::parameters).flatMap(CollectionUtils::toStream) - .map(MethodArgumentsProvider::toArguments); - } - - private Method getMethod(ExtensionContext context, String factoryMethodName) { - - if (StringUtils.isNotBlank(factoryMethodName)) { - if (factoryMethodName.contains("#")) { - return getMethodByFullyQualifiedName(factoryMethodName); - } else { - return ReflectionUtils.getRequiredMethod(context.getRequiredTestClass(), factoryMethodName); - } - } - return ReflectionUtils.getRequiredMethod(context.getRequiredTestClass(), context.getRequiredTestMethod().getName()); - } - - private Method getMethodByFullyQualifiedName(String fullyQualifiedMethodName) { - - String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName); - String className = methodParts[0]; - String methodName = methodParts[1]; - String methodParameters = methodParts[2]; - - Preconditions.condition(StringUtils.isBlank(methodParameters), - () -> format("factory method [%s] must not declare formal parameters", fullyQualifiedMethodName)); - - return ReflectionUtils.getRequiredMethod(loadRequiredClass(className), methodName); - } - - private Class loadRequiredClass(String className) { - return ReflectionUtils.tryToLoadClass(className) - .getOrThrow(cause -> new JUnitException(format("Could not load class [%s]", className), cause)); - } - - private static Arguments toArguments(Object item) { - - // Nothing to do except cast. - if (item instanceof Arguments arguments) { - return arguments; - } - - // Pass all multidimensional arrays "as is", in contrast to Object[]. - // See https://github.com/junit-team/junit5/issues/1665 - if (ReflectionUtils.isMultidimensionalArray(item)) { - return arguments(item); - } - - // Special treatment for one-dimensional reference arrays. - // See https://github.com/junit-team/junit5/issues/1665 - if (item instanceof Object[] array) { - return arguments(array); - } - - // Pass everything else "as is". - return arguments(item); - } - - /** - * Key type for a method associated with a test instance. - * - * @param method - * @param instance - */ - record SourceKey(Method method, Object instance) { - } - - /** - * Holder for parameters that can be closed using JUnit's built-in cleanup mechanism. - * - * @param parameters - * @param context - */ - record CloseablePararmeters(Object parameters, Object context) implements Store.CloseableResource { - - @Override - public void close() { - close0(parameters); - } - - private void close0(Object object) { - - if (object instanceof Managed) { - return; - } - - if (object instanceof CloseableResource closeableResource) { - try { - closeableResource.close(); - return; - } catch (Throwable cause) { - throw new RuntimeException(cause); - } - } - - if (object instanceof Closeable closeable) { - try { - closeable.close(); - return; - } catch (Throwable cause) { - throw new RuntimeException(cause); - } - } - - if (object instanceof Arguments arguments) { - close0(arguments.get()); - } - - if (object instanceof Object[] array) { - Arrays.asList(array).forEach(this::close0); - } - - if (object instanceof Iterable iterableObject) { - iterableObject.forEach(this::close0); - } - } - } -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/MethodSource.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/MethodSource.java deleted file mode 100644 index 38e4477242..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/MethodSource.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.junit.jupiter.params.provider.ArgumentsSource; - -/** - * {@code @MethodSource} is an {@link ArgumentsSource} which provides access to values returned from - * {@linkplain #value() factory methods} of the class in which this annotation is declared or from static factory - * methods in external classes referenced by fully qualified method name. - * - * This variant can be used only on type level. - * - * Copy of {@code org.junit.jupiter.params.provider.MethodSource}. - */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@ArgumentsSource(MethodArgumentsProvider.class) -public @interface MethodSource { - - /** - * The names of factory methods within the test class or in external classes to use as sources for arguments. - * - * Factory methods in external classes must be referenced by fully qualified method name — for example, - * {@code com.example.StringsProviders#blankStrings}. - * - * If no factory method names are declared, a method within the test class that has the same name as the test method - * will be used as the factory method by default. - * - * For further information, see the {@linkplain MethodSource class-level Javadoc}. - */ - String[] value() default ""; - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedRedisTest.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedRedisTest.java deleted file mode 100644 index efdef385d3..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedRedisTest.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.junit.jupiter.api.TestTemplate; -import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.api.extension.ExtensionContext; - -/** - * {@code @ParameterizedRedisTest} is used to signal that the annotated method is a parameterized test method - * within a potentially parametrized test class. - * - * Such methods must not be {@code private} or {@code static}. - * Argument Providers and Sources - * - * Test classes defining {@code @ParameterizedRedisTest} methods must specify at least one - * {@link org.junit.jupiter.params.provider.ArgumentsProvider ArgumentsProvider} via - * {@link org.junit.jupiter.params.provider.ArgumentsSource @ArgumentsSource} or a corresponding composed annotation - * (e.g., {@code @ValueSource}, {@code @CsvSource}, etc.). The provider is responsible for providing a - * {@link java.util.stream.Stream Stream} of {@link org.junit.jupiter.params.provider.Arguments Arguments} that will be - * used to invoke the parameterized test method. - * Method Parameter List - * - * A {@code @ParameterizedRedisTest} method may declare parameters that are resolved from the class-level - * {@link org.junit.jupiter.params.provider.ArgumentsSource}. Additional parameters that exceed the parameter index by - * the class argument source can be resolved by additional {@link org.junit.jupiter.api.extension.ParameterResolver - * ParameterResolvers} (e.g., {@code TestInfo}, {@code TestReporter}, etc). Specifically, a parameterized test method - * must declare formal parameters according to the following rules. - * - * Zero or more indexed arguments must be declared first. - * Zero or more aggregators must be declared next. - * Zero or more arguments supplied by other {@code ParameterResolver} implementations must be declared last. - * - * - * In this context, an indexed argument is an argument for a given index in the {@code Arguments} provided by - * an {@code ArgumentsProvider} that is passed as an argument to the parameterized method at the same index in the - * method's formal parameter list. An aggregator is any parameter of type - * {@link org.junit.jupiter.params.aggregator.ArgumentsAccessor ArgumentsAccessor} or any parameter annotated with - * {@link org.junit.jupiter.params.aggregator.AggregateWith @AggregateWith}. - * - * Constructor Parameter List - * - * A class defining {@code @ParameterizedRedisTest} may declare a constructor accepting arguments. Constructor arguments - * are resolved from the same class-level {@link org.junit.jupiter.params.provider.ArgumentsSource} as method arguments. - * Therefore, constructor arguments follow the same index/aggregator semantics as method arguments. - * Test Class Lifecycle - * - * Using parameterized tests requires instance creation per test method ({@code TestInstance(PER_METHOD)} to ensure that - * both, test method and test instance share the same arguments. This limitation is driven by the execution tree as test - * argument sources are activated per test method. See - * {@link org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider#provideTestTemplateInvocationContexts(ExtensionContext)}. - * - * Adaption of {@code org.junit.jupiter.params.ParameterizedTest}. - */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@TestTemplate -@ExtendWith(ParameterizedRedisTestExtension.class) -public @interface ParameterizedRedisTest { - - /** - * Placeholder for the {@linkplain org.junit.jupiter.api.TestInfo#getDisplayName display name} of a - * {@code @ParameterizedTest} method: {displayName} - * - * @see #name - */ - String DISPLAY_NAME_PLACEHOLDER = "{displayName}"; - - /** - * Placeholder for the current invocation index of a {@code @ParameterizedTest} method (1-based): {index} - * - * @see #name - */ - String INDEX_PLACEHOLDER = "{index}"; - - /** - * Placeholder for the complete, comma-separated arguments list of the current invocation of a - * {@code @ParameterizedTest} method: {arguments} - * - * @see #name - */ - String ARGUMENTS_PLACEHOLDER = "{arguments}"; - - /** - * Placeholder for the complete, comma-separated named arguments list of the current invocation of a - * {@code @ParameterizedTest} method: {argumentsWithNames} - * - * @see #name - */ - String ARGUMENTS_WITH_NAMES_PLACEHOLDER = "{argumentsWithNames}"; - - /** - * Default display name pattern for the current invocation of a {@code @ParameterizedTest} method: {@value} - * - * Note that the default pattern does not include the {@linkplain #DISPLAY_NAME_PLACEHOLDER display name} of - * the {@code @ParameterizedTest} method. - * - * @see #name - * @see #DISPLAY_NAME_PLACEHOLDER - * @see #INDEX_PLACEHOLDER - * @see #ARGUMENTS_WITH_NAMES_PLACEHOLDER - */ - String DEFAULT_DISPLAY_NAME = "[" + INDEX_PLACEHOLDER + "] " + ARGUMENTS_WITH_NAMES_PLACEHOLDER; - - /** - * The display name to be used for individual invocations of the parameterized test; never blank or consisting solely - * of whitespace. - * - * Defaults to {@link #DEFAULT_DISPLAY_NAME}. - * Supported placeholders - * - * {@link #DISPLAY_NAME_PLACEHOLDER} - * {@link #INDEX_PLACEHOLDER} - * {@link #ARGUMENTS_PLACEHOLDER} - * {0}, {1}, etc.: an individual argument (0-based) - * - * - * For the latter, you may use {@link java.text.MessageFormat} patterns to customize formatting. Please note that the - * original arguments are passed when formatting, regardless of any implicit or explicit argument conversions. - * - * @see java.text.MessageFormat - */ - String name() default DEFAULT_DISPLAY_NAME; - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedRedisTestExtension.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedRedisTestExtension.java deleted file mode 100644 index 0e295527ed..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedRedisTestExtension.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import static org.junit.platform.commons.util.AnnotationUtils.*; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.Stream; - -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.api.extension.ExtensionContext.Namespace; -import org.junit.jupiter.api.extension.TestTemplateInvocationContext; -import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.ArgumentsProvider; -import org.junit.jupiter.params.provider.ArgumentsSource; -import org.junit.jupiter.params.support.AnnotationConsumerInitializer; -import org.junit.platform.commons.JUnitException; -import org.junit.platform.commons.util.ExceptionUtils; -import org.junit.platform.commons.util.Preconditions; -import org.junit.platform.commons.util.ReflectionUtils; - -/** - * Copy of {@code org.junit.jupiter.params.ParameterizedTestExtension}. - */ -class ParameterizedRedisTestExtension implements TestTemplateInvocationContextProvider { - - private static final String METHOD_CONTEXT_KEY = "method-context"; - private static final String CONSTRUCTOR_CONTEXT_KEY = "constructor-context"; - static final String ARGUMENT_MAX_LENGTH_KEY = "junit.jupiter.params.displayname.argument.maxlength"; - - @Override - public boolean supportsTestTemplate(ExtensionContext context) { - if (!context.getTestMethod().isPresent()) { - return false; - } - - Method testMethod = context.getTestMethod().get(); - if (!isAnnotated(testMethod, ParameterizedRedisTest.class)) { - return false; - } - - Constructor declaredConstructor = ReflectionUtils.getDeclaredConstructor(context.getRequiredTestClass()); - ParameterizedTestContext methodContext = new ParameterizedTestContext(testMethod); - ParameterizedTestContext constructorContext = new ParameterizedTestContext(declaredConstructor); - - Preconditions.condition(methodContext.hasPotentiallyValidSignature(), () -> - ("@ParameterizedRedisTest method [%s] declares formal parameters in an invalid order: " - + "argument aggregators must be declared after any indexed arguments " - + "and before any arguments resolved by another ParameterResolver.") - .formatted(testMethod.toGenericString())); - - getStore(context).put(METHOD_CONTEXT_KEY, methodContext); - getStore(context).put(CONSTRUCTOR_CONTEXT_KEY, constructorContext); - - return true; - } - - @Override - public Stream provideTestTemplateInvocationContexts( - ExtensionContext extensionContext) { - - Method templateMethod = extensionContext.getRequiredTestMethod(); - String displayName = extensionContext.getDisplayName(); - ParameterizedTestContext methodContext = getStore(extensionContext)// - .get(METHOD_CONTEXT_KEY, ParameterizedTestContext.class); - - ParameterizedTestContext constructorContext = getStore(extensionContext)// - .get(CONSTRUCTOR_CONTEXT_KEY, ParameterizedTestContext.class); - int argumentMaxLength = extensionContext.getConfigurationParameter(ARGUMENT_MAX_LENGTH_KEY, Integer::parseInt) - .orElse(512); - ParameterizedTestNameFormatter formatter = createNameFormatter(templateMethod, methodContext, displayName, - argumentMaxLength); - AtomicLong invocationCount = new AtomicLong(0); - - List> hierarchy = new ArrayList<>(); - Class type = extensionContext.getRequiredTestClass(); - while (type != Object.class) { - hierarchy.add(type); - type = type.getSuperclass(); - } - - // @formatter:off - return hierarchy.stream().flatMap(it -> findRepeatableAnnotations(it, ArgumentsSource.class).stream() - .map(ArgumentsSource::value).map(this::instantiateArgumentsProvider) - .map(provider -> AnnotationConsumerInitializer.initialize(it, provider))) - .flatMap(provider -> arguments(provider, extensionContext)).map(Arguments::get) - .map(arguments -> consumedArguments(arguments, methodContext)) - .map(arguments -> createInvocationContext(formatter, constructorContext, methodContext, arguments)) - .peek(invocationContext -> invocationCount.incrementAndGet()) - .onClose(() -> Preconditions.condition(invocationCount.get() > 0, - "Configuration error: You must configure at least one set of arguments for this @ParameterizedRedisTest class")); - // @formatter:on - } - - @SuppressWarnings("ConstantConditions") - private ArgumentsProvider instantiateArgumentsProvider(Class clazz) { - try { - return ReflectionUtils.newInstance(clazz); - } catch (Exception ex) { - if (ex instanceof NoSuchMethodException) { - throw new JUnitException(("Failed to find a no-argument constructor for ArgumentsProvider [%s];" - + " Please ensure that a no-argument constructor exists and that the class is either" - + " a top-level class or a static nested class").formatted(clazz.getName()), ex); - } - throw ex; - } - } - - private ExtensionContext.Store getStore(ExtensionContext context) { - return context.getStore(Namespace.create(ParameterizedRedisTestExtension.class, context.getRequiredTestMethod())); - } - - private TestTemplateInvocationContext createInvocationContext(ParameterizedTestNameFormatter formatter, - ParameterizedTestContext constructorContext, ParameterizedTestContext methodContext, Object[] arguments) { - return new ParameterizedTestInvocationContext(formatter, constructorContext, methodContext, arguments); - } - - private ParameterizedTestNameFormatter createNameFormatter(Method templateMethod, - ParameterizedTestContext methodContext, String displayName, int argumentMaxLength) { - - ParameterizedRedisTest parameterizedTest = findAnnotation(templateMethod, ParameterizedRedisTest.class).get(); - - String pattern = Preconditions.notBlank(parameterizedTest.name().trim(), () -> - "Configuration error: @ParameterizedRedisTest on method [%s] must be declared with a non-empty name" - .formatted(templateMethod)); - - return new ParameterizedTestNameFormatter(pattern, displayName, methodContext, argumentMaxLength); - } - - protected static Stream arguments(ArgumentsProvider provider, ExtensionContext context) { - try { - return provider.provideArguments(context); - } catch (Exception ex) { - throw ExceptionUtils.throwAsUncheckedException(ex); - } - } - - private Object[] consumedArguments(Object[] arguments, ParameterizedTestContext methodContext) { - return arguments; - } - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestContext.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestContext.java deleted file mode 100644 index 6d1dd069f1..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestContext.java +++ /dev/null @@ -1,267 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import static org.junit.platform.commons.util.AnnotationUtils.*; -import static org.springframework.data.redis.test.extension.parametrized.ParameterizedTestContext.ResolverType.*; - -import java.lang.reflect.Executable; -import java.lang.reflect.Method; -import java.lang.reflect.Parameter; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import org.junit.jupiter.api.extension.ParameterContext; -import org.junit.jupiter.api.extension.ParameterResolutionException; -import org.junit.jupiter.params.aggregator.AggregateWith; -import org.junit.jupiter.params.aggregator.ArgumentsAccessor; -import org.junit.jupiter.params.aggregator.ArgumentsAggregator; -import org.junit.jupiter.params.aggregator.DefaultArgumentsAccessor; -import org.junit.jupiter.params.converter.ArgumentConverter; -import org.junit.jupiter.params.converter.ConvertWith; -import org.junit.jupiter.params.converter.DefaultArgumentConverter; -import org.junit.jupiter.params.support.AnnotationConsumerInitializer; -import org.junit.platform.commons.support.ReflectionSupport; -import org.junit.platform.commons.util.AnnotationUtils; -import org.junit.platform.commons.util.ReflectionUtils; -import org.junit.platform.commons.util.StringUtils; - -/** - * Encapsulates access to the parameters of a parameterized test method and caches the converters and aggregators used - * to resolve them. - * - * Copy of {@code org.junit.jupiter.params.ParameterizedTestContext}. - */ -class ParameterizedTestContext { - - private final Parameter[] parameters; - private final Resolver[] resolvers; - private final List resolverTypes; - - ParameterizedTestContext(Executable testMethod) { - this.parameters = testMethod.getParameters(); - this.resolvers = new Resolver[this.parameters.length]; - this.resolverTypes = new ArrayList<>(this.parameters.length); - for (Parameter parameter : this.parameters) { - this.resolverTypes.add(isAggregator(parameter) ? AGGREGATOR : CONVERTER); - } - } - - /** - * Determine if the supplied {@link Parameter} is an aggregator (i.e., of type {@link ArgumentsAccessor} or annotated - * with {@link AggregateWith}). - * - * @return {@code true} if the parameter is an aggregator - */ - private static boolean isAggregator(Parameter parameter) { - return ArgumentsAccessor.class.isAssignableFrom(parameter.getType()) || isAnnotated(parameter, AggregateWith.class); - } - - /** - * Determine if the {@link Method} represented by this context has a potentially valid signature (i.e., - * formal parameter declarations) with regard to aggregators. - * - * This method takes a best-effort approach at enforcing the following policy for parameterized test methods that - * accept aggregators as arguments. - * - * zero or more indexed arguments come first. - * zero or more aggregators come next. - * zero or more arguments supplied by other {@code ParameterResolver} implementations come last. - * - * - * @return {@code true} if the method has a potentially valid signature - */ - boolean hasPotentiallyValidSignature() { - int indexOfPreviousAggregator = -1; - for (int i = 0; i < getParameterCount(); i++) { - if (isAggregator(i)) { - if ((indexOfPreviousAggregator != -1) && (i != indexOfPreviousAggregator + 1)) { - return false; - } - indexOfPreviousAggregator = i; - } - } - return true; - } - - /** - * Get the number of parameters of the {@link Method} represented by this context. - */ - int getParameterCount() { - return parameters.length; - } - - /** - * Get the name of the {@link Parameter} with the supplied index, if it is present and declared before the - * aggregators. - * - * @return an {@code Optional} containing the name of the parameter - */ - Optional getParameterName(int parameterIndex) { - if (parameterIndex >= getParameterCount()) { - return Optional.empty(); - } - Parameter parameter = this.parameters[parameterIndex]; - if (!parameter.isNamePresent()) { - return Optional.empty(); - } - if (hasAggregator() && parameterIndex >= indexOfFirstAggregator()) { - return Optional.empty(); - } - return Optional.of(parameter.getName()); - } - - /** - * Determine if the {@link Method} represented by this context declares at least one {@link Parameter} that is an - * {@linkplain #isAggregator aggregator}. - * - * @return {@code true} if the method has an aggregator - */ - boolean hasAggregator() { - return resolverTypes.contains(AGGREGATOR); - } - - /** - * Determine if the {@link Parameter} with the supplied index is an aggregator (i.e., of type - * {@link ArgumentsAccessor} or annotated with {@link AggregateWith}). - * - * @return {@code true} if the parameter is an aggregator - */ - boolean isAggregator(int parameterIndex) { - return resolverTypes.size() > parameterIndex && resolverTypes.get(parameterIndex) == AGGREGATOR; - } - - /** - * Find the index of the first {@linkplain #isAggregator aggregator} {@link Parameter} in the {@link Method} - * represented by this context. - * - * @return the index of the first aggregator, or {@code -1} if not found - */ - int indexOfFirstAggregator() { - return resolverTypes.indexOf(AGGREGATOR); - } - - /** - * Resolve the parameter for the supplied context using the supplied arguments. - */ - Object resolve(ParameterContext parameterContext, Object[] arguments) { - return getResolver(parameterContext).resolve(parameterContext, arguments); - } - - private Resolver getResolver(ParameterContext parameterContext) { - int index = parameterContext.getIndex(); - if (resolvers[index] == null) { - resolvers[index] = resolverTypes.get(index).createResolver(parameterContext); - } - return resolvers[index]; - } - - enum ResolverType { - - CONVERTER { - @Override - Resolver createResolver(ParameterContext parameterContext) { - try { // @formatter:off - return AnnotationUtils.findAnnotation(parameterContext.getParameter(), ConvertWith.class) - .map(ConvertWith::value).map(clazz -> (ArgumentConverter) ReflectionUtils.newInstance(clazz)) - .map(converter -> AnnotationConsumerInitializer.initialize(parameterContext.getParameter(), converter)) - .map(Converter::new).orElse(Converter.DEFAULT); - } // @formatter:on - catch (Exception ex) { - throw parameterResolutionException("Error creating ArgumentConverter", ex, parameterContext); - } - } - }, - - AGGREGATOR { - @Override - Resolver createResolver(ParameterContext parameterContext) { - try { // @formatter:off - return AnnotationUtils.findAnnotation(parameterContext.getParameter(), AggregateWith.class) - .map(AggregateWith::value).map(clazz -> (ArgumentsAggregator) ReflectionSupport.newInstance(clazz)) - .map(Aggregator::new).orElse(Aggregator.DEFAULT); - } // @formatter:on - catch (Exception ex) { - throw parameterResolutionException("Error creating ArgumentsAggregator", ex, parameterContext); - } - } - }; - - abstract Resolver createResolver(ParameterContext parameterContext); - - } - - interface Resolver { - - Object resolve(ParameterContext parameterContext, Object[] arguments); - - } - - static class Converter implements Resolver { - - private static final Converter DEFAULT = new Converter(DefaultArgumentConverter.INSTANCE); - - private final ArgumentConverter argumentConverter; - - Converter(ArgumentConverter argumentConverter) { - this.argumentConverter = argumentConverter; - } - - @Override - public Object resolve(ParameterContext parameterContext, Object[] arguments) { - Object argument = arguments[parameterContext.getIndex()]; - try { - return this.argumentConverter.convert(argument, parameterContext); - } catch (Exception ex) { - throw parameterResolutionException("Error converting parameter", ex, parameterContext); - } - } - - } - - static class Aggregator implements Resolver { - - private static final Aggregator DEFAULT = new Aggregator((accessor, context) -> accessor); - - private final ArgumentsAggregator argumentsAggregator; - - Aggregator(ArgumentsAggregator argumentsAggregator) { - this.argumentsAggregator = argumentsAggregator; - } - - @Override - public Object resolve(ParameterContext parameterContext, Object[] arguments) { - ArgumentsAccessor accessor = new DefaultArgumentsAccessor(parameterContext, 1, arguments); - try { - return this.argumentsAggregator.aggregateArguments(accessor, parameterContext); - } catch (Exception ex) { - throw parameterResolutionException("Error aggregating arguments for parameter", ex, parameterContext); - } - } - - } - - private static ParameterResolutionException parameterResolutionException(String message, Exception cause, - ParameterContext parameterContext) { - String fullMessage = message + " at index " + parameterContext.getIndex(); - if (StringUtils.isNotBlank(cause.getMessage())) { - fullMessage += ": " + cause.getMessage(); - } - return new ParameterResolutionException(fullMessage, cause); - } - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestInvocationContext.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestInvocationContext.java deleted file mode 100644 index 658cd29b20..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestInvocationContext.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import java.util.Collections; -import java.util.List; - -import org.junit.jupiter.api.extension.Extension; -import org.junit.jupiter.api.extension.TestTemplateInvocationContext; - -/** - * Copy of {@code org.junit.jupiter.params.ParameterizedTestInvocationContext}. - */ -class ParameterizedTestInvocationContext implements TestTemplateInvocationContext { - - private final ParameterizedTestNameFormatter formatter; - private final ParameterizedTestContext constructorContext; - private final ParameterizedTestContext methodContext; - private final Object[] arguments; - - ParameterizedTestInvocationContext(ParameterizedTestNameFormatter formatter, - ParameterizedTestContext constructorContext, ParameterizedTestContext methodContext, Object[] arguments) { - this.formatter = formatter; - this.constructorContext = constructorContext; - this.methodContext = methodContext; - this.arguments = arguments; - } - - @Override - public String getDisplayName(int invocationIndex) { - return this.formatter.format(invocationIndex, this.arguments); - } - - @Override - public List getAdditionalExtensions() { - return Collections.singletonList( - new ParameterizedTestParameterResolver(this.constructorContext, this.methodContext, this.arguments)); - } - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestNameFormatter.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestNameFormatter.java deleted file mode 100644 index 7c02a0171f..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestNameFormatter.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import static java.util.stream.Collectors.joining; -import static org.junit.jupiter.params.ParameterizedTest.ARGUMENTS_PLACEHOLDER; -import static org.junit.jupiter.params.ParameterizedTest.ARGUMENTS_WITH_NAMES_PLACEHOLDER; -import static org.junit.jupiter.params.ParameterizedTest.DISPLAY_NAME_PLACEHOLDER; -import static org.junit.jupiter.params.ParameterizedTest.INDEX_PLACEHOLDER; - -import java.text.Format; -import java.text.MessageFormat; -import java.util.Arrays; -import java.util.stream.IntStream; - -import org.junit.platform.commons.JUnitException; -import org.junit.platform.commons.util.StringUtils; - -/** - * Copy of {@code org.junit.jupiter.params.ParameterizedTestNameFormatter}. - */ -class ParameterizedTestNameFormatter { - - private static final char ELLIPSIS = '\u2026'; - - private final String pattern; - private final String displayName; - private final ParameterizedTestContext methodContext; - private final int argumentMaxLength; - - ParameterizedTestNameFormatter(String pattern, String displayName, ParameterizedTestContext methodContext, - int argumentMaxLength) { - this.pattern = pattern; - this.displayName = displayName; - this.methodContext = methodContext; - this.argumentMaxLength = argumentMaxLength; - } - - String format(int invocationIndex, Object... arguments) { - try { - return formatSafely(invocationIndex, arguments); - } catch (Exception ex) { - throw new JUnitException("The display name pattern defined for the parameterized test is invalid;" - + " See nested exception for further details.", ex); - } - } - - private String formatSafely(int invocationIndex, Object[] arguments) { - String pattern = prepareMessageFormatPattern(invocationIndex, arguments); - MessageFormat format = new MessageFormat(pattern); - Object[] humanReadableArguments = makeReadable(format, arguments); - return format.format(humanReadableArguments); - } - - private String prepareMessageFormatPattern(int invocationIndex, Object[] arguments) { - String result = pattern// - .replace(DISPLAY_NAME_PLACEHOLDER, this.displayName)// - .replace(INDEX_PLACEHOLDER, String.valueOf(invocationIndex)); - - if (result.contains(ARGUMENTS_WITH_NAMES_PLACEHOLDER)) { - result = result.replace(ARGUMENTS_WITH_NAMES_PLACEHOLDER, argumentsWithNamesPattern(arguments)); - } - - if (result.contains(ARGUMENTS_PLACEHOLDER)) { - result = result.replace(ARGUMENTS_PLACEHOLDER, argumentsPattern(arguments)); - } - - return result; - } - - private String argumentsWithNamesPattern(Object[] arguments) { - return IntStream.range(0, arguments.length) // - .mapToObj(index -> methodContext.getParameterName(index).map(name -> name + "=").orElse("") + "{" + index + "}") // - .collect(joining(", ")); - } - - private String argumentsPattern(Object[] arguments) { - return IntStream.range(0, arguments.length) // - .mapToObj(index -> "{" + index + "}") // - .collect(joining(", ")); - } - - private Object[] makeReadable(MessageFormat format, Object[] arguments) { - Format[] formats = format.getFormatsByArgumentIndex(); - Object[] result = Arrays.copyOf(arguments, Math.min(arguments.length, formats.length), Object[].class); - for (int i = 0; i < result.length; i++) { - if (formats[i] == null) { - result[i] = truncateIfExceedsMaxLength(StringUtils.nullSafeToString(arguments[i])); - } - } - return result; - } - - private String truncateIfExceedsMaxLength(String argument) { - if (argument.length() > argumentMaxLength) { - return argument.substring(0, argumentMaxLength - 1) + ELLIPSIS; - } - return argument; - } - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestParameterResolver.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestParameterResolver.java deleted file mode 100644 index adcff56f32..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestParameterResolver.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Executable; -import java.lang.reflect.Method; - -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.api.extension.ParameterContext; -import org.junit.jupiter.api.extension.ParameterResolutionException; -import org.junit.jupiter.api.extension.ParameterResolver; - -/** - * Copy of {@code org.junit.jupiter.params.ParameterizedTestParameterResolver}. - */ -class ParameterizedTestParameterResolver implements ParameterResolver { - - private final ParameterizedTestContext constructorContext; - private final ParameterizedTestContext methodContext; - private final Object[] arguments; - - ParameterizedTestParameterResolver(ParameterizedTestContext constructorContext, - ParameterizedTestContext methodContext, Object[] arguments) { - this.constructorContext = constructorContext; - this.methodContext = methodContext; - this.arguments = arguments; - } - - @Override - public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { - - Executable declaringExecutable = parameterContext.getDeclaringExecutable(); - int parameterIndex = parameterContext.getIndex(); - ParameterizedTestContext testContext; - - if (declaringExecutable instanceof Constructor) { - testContext = this.constructorContext; - } else { - - Method testMethod = extensionContext.getTestMethod().orElse(null); - - // Not a parameterized method? - if (parameterContext.getDeclaringExecutable() instanceof Method && !declaringExecutable.equals(testMethod)) { - return false; - } - testContext = this.methodContext; - } - - // Current parameter is an aggregator? - if (testContext.isAggregator(parameterIndex)) { - return true; - } - - // Ensure that the current parameter is declared before aggregators. - // Otherwise, a different ParameterResolver should handle it. - if (testContext.hasAggregator()) { - return parameterIndex < testContext.indexOfFirstAggregator(); - } - - // Else fallback to behavior for parameterized test methods without aggregators. - return parameterIndex < this.arguments.length; - } - - @Override - public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) - throws ParameterResolutionException { - - if (parameterContext.getDeclaringExecutable() instanceof Constructor) { - return this.constructorContext.resolve(parameterContext, this.arguments); - } - - return this.methodContext.resolve(parameterContext, this.arguments); - } - -}
- * This variant can be used only on type level. - *
- * Copy of {@code org.junit.jupiter.params.provider.MethodSource}. - */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@ArgumentsSource(MethodArgumentsProvider.class) -public @interface MethodSource { - - /** - * The names of factory methods within the test class or in external classes to use as sources for arguments. - *
- * Factory methods in external classes must be referenced by fully qualified method name — for example, - * {@code com.example.StringsProviders#blankStrings}. - *
- * If no factory method names are declared, a method within the test class that has the same name as the test method - * will be used as the factory method by default. - *
- * For further information, see the {@linkplain MethodSource class-level Javadoc}. - */ - String[] value() default ""; - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedRedisTest.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedRedisTest.java deleted file mode 100644 index efdef385d3..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedRedisTest.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.junit.jupiter.api.TestTemplate; -import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.api.extension.ExtensionContext; - -/** - * {@code @ParameterizedRedisTest} is used to signal that the annotated method is a parameterized test method - * within a potentially parametrized test class. - *
- * Such methods must not be {@code private} or {@code static}. - *
- * Test classes defining {@code @ParameterizedRedisTest} methods must specify at least one - * {@link org.junit.jupiter.params.provider.ArgumentsProvider ArgumentsProvider} via - * {@link org.junit.jupiter.params.provider.ArgumentsSource @ArgumentsSource} or a corresponding composed annotation - * (e.g., {@code @ValueSource}, {@code @CsvSource}, etc.). The provider is responsible for providing a - * {@link java.util.stream.Stream Stream} of {@link org.junit.jupiter.params.provider.Arguments Arguments} that will be - * used to invoke the parameterized test method. - *
- * A {@code @ParameterizedRedisTest} method may declare parameters that are resolved from the class-level - * {@link org.junit.jupiter.params.provider.ArgumentsSource}. Additional parameters that exceed the parameter index by - * the class argument source can be resolved by additional {@link org.junit.jupiter.api.extension.ParameterResolver - * ParameterResolvers} (e.g., {@code TestInfo}, {@code TestReporter}, etc). Specifically, a parameterized test method - * must declare formal parameters according to the following rules. - *
- * In this context, an indexed argument is an argument for a given index in the {@code Arguments} provided by - * an {@code ArgumentsProvider} that is passed as an argument to the parameterized method at the same index in the - * method's formal parameter list. An aggregator is any parameter of type - * {@link org.junit.jupiter.params.aggregator.ArgumentsAccessor ArgumentsAccessor} or any parameter annotated with - * {@link org.junit.jupiter.params.aggregator.AggregateWith @AggregateWith}. - *
- *
- * A class defining {@code @ParameterizedRedisTest} may declare a constructor accepting arguments. Constructor arguments - * are resolved from the same class-level {@link org.junit.jupiter.params.provider.ArgumentsSource} as method arguments. - * Therefore, constructor arguments follow the same index/aggregator semantics as method arguments. - *
- * Using parameterized tests requires instance creation per test method ({@code TestInstance(PER_METHOD)} to ensure that - * both, test method and test instance share the same arguments. This limitation is driven by the execution tree as test - * argument sources are activated per test method. See - * {@link org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider#provideTestTemplateInvocationContexts(ExtensionContext)}. - *
- * Adaption of {@code org.junit.jupiter.params.ParameterizedTest}. - */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@TestTemplate -@ExtendWith(ParameterizedRedisTestExtension.class) -public @interface ParameterizedRedisTest { - - /** - * Placeholder for the {@linkplain org.junit.jupiter.api.TestInfo#getDisplayName display name} of a - * {@code @ParameterizedTest} method: {displayName} - * - * @see #name - */ - String DISPLAY_NAME_PLACEHOLDER = "{displayName}"; - - /** - * Placeholder for the current invocation index of a {@code @ParameterizedTest} method (1-based): {index} - * - * @see #name - */ - String INDEX_PLACEHOLDER = "{index}"; - - /** - * Placeholder for the complete, comma-separated arguments list of the current invocation of a - * {@code @ParameterizedTest} method: {arguments} - * - * @see #name - */ - String ARGUMENTS_PLACEHOLDER = "{arguments}"; - - /** - * Placeholder for the complete, comma-separated named arguments list of the current invocation of a - * {@code @ParameterizedTest} method: {argumentsWithNames} - * - * @see #name - */ - String ARGUMENTS_WITH_NAMES_PLACEHOLDER = "{argumentsWithNames}"; - - /** - * Default display name pattern for the current invocation of a {@code @ParameterizedTest} method: {@value} - *
{displayName}
{index}
{arguments}
{argumentsWithNames}
- * Note that the default pattern does not include the {@linkplain #DISPLAY_NAME_PLACEHOLDER display name} of - * the {@code @ParameterizedTest} method. - * - * @see #name - * @see #DISPLAY_NAME_PLACEHOLDER - * @see #INDEX_PLACEHOLDER - * @see #ARGUMENTS_WITH_NAMES_PLACEHOLDER - */ - String DEFAULT_DISPLAY_NAME = "[" + INDEX_PLACEHOLDER + "] " + ARGUMENTS_WITH_NAMES_PLACEHOLDER; - - /** - * The display name to be used for individual invocations of the parameterized test; never blank or consisting solely - * of whitespace. - *
- * Defaults to {@link #DEFAULT_DISPLAY_NAME}. - *
{0}
{1}
- * For the latter, you may use {@link java.text.MessageFormat} patterns to customize formatting. Please note that the - * original arguments are passed when formatting, regardless of any implicit or explicit argument conversions. - * - * @see java.text.MessageFormat - */ - String name() default DEFAULT_DISPLAY_NAME; - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedRedisTestExtension.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedRedisTestExtension.java deleted file mode 100644 index 0e295527ed..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedRedisTestExtension.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import static org.junit.platform.commons.util.AnnotationUtils.*; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.Stream; - -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.api.extension.ExtensionContext.Namespace; -import org.junit.jupiter.api.extension.TestTemplateInvocationContext; -import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.ArgumentsProvider; -import org.junit.jupiter.params.provider.ArgumentsSource; -import org.junit.jupiter.params.support.AnnotationConsumerInitializer; -import org.junit.platform.commons.JUnitException; -import org.junit.platform.commons.util.ExceptionUtils; -import org.junit.platform.commons.util.Preconditions; -import org.junit.platform.commons.util.ReflectionUtils; - -/** - * Copy of {@code org.junit.jupiter.params.ParameterizedTestExtension}. - */ -class ParameterizedRedisTestExtension implements TestTemplateInvocationContextProvider { - - private static final String METHOD_CONTEXT_KEY = "method-context"; - private static final String CONSTRUCTOR_CONTEXT_KEY = "constructor-context"; - static final String ARGUMENT_MAX_LENGTH_KEY = "junit.jupiter.params.displayname.argument.maxlength"; - - @Override - public boolean supportsTestTemplate(ExtensionContext context) { - if (!context.getTestMethod().isPresent()) { - return false; - } - - Method testMethod = context.getTestMethod().get(); - if (!isAnnotated(testMethod, ParameterizedRedisTest.class)) { - return false; - } - - Constructor declaredConstructor = ReflectionUtils.getDeclaredConstructor(context.getRequiredTestClass()); - ParameterizedTestContext methodContext = new ParameterizedTestContext(testMethod); - ParameterizedTestContext constructorContext = new ParameterizedTestContext(declaredConstructor); - - Preconditions.condition(methodContext.hasPotentiallyValidSignature(), () -> - ("@ParameterizedRedisTest method [%s] declares formal parameters in an invalid order: " - + "argument aggregators must be declared after any indexed arguments " - + "and before any arguments resolved by another ParameterResolver.") - .formatted(testMethod.toGenericString())); - - getStore(context).put(METHOD_CONTEXT_KEY, methodContext); - getStore(context).put(CONSTRUCTOR_CONTEXT_KEY, constructorContext); - - return true; - } - - @Override - public Stream provideTestTemplateInvocationContexts( - ExtensionContext extensionContext) { - - Method templateMethod = extensionContext.getRequiredTestMethod(); - String displayName = extensionContext.getDisplayName(); - ParameterizedTestContext methodContext = getStore(extensionContext)// - .get(METHOD_CONTEXT_KEY, ParameterizedTestContext.class); - - ParameterizedTestContext constructorContext = getStore(extensionContext)// - .get(CONSTRUCTOR_CONTEXT_KEY, ParameterizedTestContext.class); - int argumentMaxLength = extensionContext.getConfigurationParameter(ARGUMENT_MAX_LENGTH_KEY, Integer::parseInt) - .orElse(512); - ParameterizedTestNameFormatter formatter = createNameFormatter(templateMethod, methodContext, displayName, - argumentMaxLength); - AtomicLong invocationCount = new AtomicLong(0); - - List> hierarchy = new ArrayList<>(); - Class type = extensionContext.getRequiredTestClass(); - while (type != Object.class) { - hierarchy.add(type); - type = type.getSuperclass(); - } - - // @formatter:off - return hierarchy.stream().flatMap(it -> findRepeatableAnnotations(it, ArgumentsSource.class).stream() - .map(ArgumentsSource::value).map(this::instantiateArgumentsProvider) - .map(provider -> AnnotationConsumerInitializer.initialize(it, provider))) - .flatMap(provider -> arguments(provider, extensionContext)).map(Arguments::get) - .map(arguments -> consumedArguments(arguments, methodContext)) - .map(arguments -> createInvocationContext(formatter, constructorContext, methodContext, arguments)) - .peek(invocationContext -> invocationCount.incrementAndGet()) - .onClose(() -> Preconditions.condition(invocationCount.get() > 0, - "Configuration error: You must configure at least one set of arguments for this @ParameterizedRedisTest class")); - // @formatter:on - } - - @SuppressWarnings("ConstantConditions") - private ArgumentsProvider instantiateArgumentsProvider(Class clazz) { - try { - return ReflectionUtils.newInstance(clazz); - } catch (Exception ex) { - if (ex instanceof NoSuchMethodException) { - throw new JUnitException(("Failed to find a no-argument constructor for ArgumentsProvider [%s];" - + " Please ensure that a no-argument constructor exists and that the class is either" - + " a top-level class or a static nested class").formatted(clazz.getName()), ex); - } - throw ex; - } - } - - private ExtensionContext.Store getStore(ExtensionContext context) { - return context.getStore(Namespace.create(ParameterizedRedisTestExtension.class, context.getRequiredTestMethod())); - } - - private TestTemplateInvocationContext createInvocationContext(ParameterizedTestNameFormatter formatter, - ParameterizedTestContext constructorContext, ParameterizedTestContext methodContext, Object[] arguments) { - return new ParameterizedTestInvocationContext(formatter, constructorContext, methodContext, arguments); - } - - private ParameterizedTestNameFormatter createNameFormatter(Method templateMethod, - ParameterizedTestContext methodContext, String displayName, int argumentMaxLength) { - - ParameterizedRedisTest parameterizedTest = findAnnotation(templateMethod, ParameterizedRedisTest.class).get(); - - String pattern = Preconditions.notBlank(parameterizedTest.name().trim(), () -> - "Configuration error: @ParameterizedRedisTest on method [%s] must be declared with a non-empty name" - .formatted(templateMethod)); - - return new ParameterizedTestNameFormatter(pattern, displayName, methodContext, argumentMaxLength); - } - - protected static Stream arguments(ArgumentsProvider provider, ExtensionContext context) { - try { - return provider.provideArguments(context); - } catch (Exception ex) { - throw ExceptionUtils.throwAsUncheckedException(ex); - } - } - - private Object[] consumedArguments(Object[] arguments, ParameterizedTestContext methodContext) { - return arguments; - } - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestContext.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestContext.java deleted file mode 100644 index 6d1dd069f1..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestContext.java +++ /dev/null @@ -1,267 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import static org.junit.platform.commons.util.AnnotationUtils.*; -import static org.springframework.data.redis.test.extension.parametrized.ParameterizedTestContext.ResolverType.*; - -import java.lang.reflect.Executable; -import java.lang.reflect.Method; -import java.lang.reflect.Parameter; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import org.junit.jupiter.api.extension.ParameterContext; -import org.junit.jupiter.api.extension.ParameterResolutionException; -import org.junit.jupiter.params.aggregator.AggregateWith; -import org.junit.jupiter.params.aggregator.ArgumentsAccessor; -import org.junit.jupiter.params.aggregator.ArgumentsAggregator; -import org.junit.jupiter.params.aggregator.DefaultArgumentsAccessor; -import org.junit.jupiter.params.converter.ArgumentConverter; -import org.junit.jupiter.params.converter.ConvertWith; -import org.junit.jupiter.params.converter.DefaultArgumentConverter; -import org.junit.jupiter.params.support.AnnotationConsumerInitializer; -import org.junit.platform.commons.support.ReflectionSupport; -import org.junit.platform.commons.util.AnnotationUtils; -import org.junit.platform.commons.util.ReflectionUtils; -import org.junit.platform.commons.util.StringUtils; - -/** - * Encapsulates access to the parameters of a parameterized test method and caches the converters and aggregators used - * to resolve them. - * - * Copy of {@code org.junit.jupiter.params.ParameterizedTestContext}. - */ -class ParameterizedTestContext { - - private final Parameter[] parameters; - private final Resolver[] resolvers; - private final List resolverTypes; - - ParameterizedTestContext(Executable testMethod) { - this.parameters = testMethod.getParameters(); - this.resolvers = new Resolver[this.parameters.length]; - this.resolverTypes = new ArrayList<>(this.parameters.length); - for (Parameter parameter : this.parameters) { - this.resolverTypes.add(isAggregator(parameter) ? AGGREGATOR : CONVERTER); - } - } - - /** - * Determine if the supplied {@link Parameter} is an aggregator (i.e., of type {@link ArgumentsAccessor} or annotated - * with {@link AggregateWith}). - * - * @return {@code true} if the parameter is an aggregator - */ - private static boolean isAggregator(Parameter parameter) { - return ArgumentsAccessor.class.isAssignableFrom(parameter.getType()) || isAnnotated(parameter, AggregateWith.class); - } - - /** - * Determine if the {@link Method} represented by this context has a potentially valid signature (i.e., - * formal parameter declarations) with regard to aggregators. - * - * This method takes a best-effort approach at enforcing the following policy for parameterized test methods that - * accept aggregators as arguments. - * - * zero or more indexed arguments come first. - * zero or more aggregators come next. - * zero or more arguments supplied by other {@code ParameterResolver} implementations come last. - * - * - * @return {@code true} if the method has a potentially valid signature - */ - boolean hasPotentiallyValidSignature() { - int indexOfPreviousAggregator = -1; - for (int i = 0; i < getParameterCount(); i++) { - if (isAggregator(i)) { - if ((indexOfPreviousAggregator != -1) && (i != indexOfPreviousAggregator + 1)) { - return false; - } - indexOfPreviousAggregator = i; - } - } - return true; - } - - /** - * Get the number of parameters of the {@link Method} represented by this context. - */ - int getParameterCount() { - return parameters.length; - } - - /** - * Get the name of the {@link Parameter} with the supplied index, if it is present and declared before the - * aggregators. - * - * @return an {@code Optional} containing the name of the parameter - */ - Optional getParameterName(int parameterIndex) { - if (parameterIndex >= getParameterCount()) { - return Optional.empty(); - } - Parameter parameter = this.parameters[parameterIndex]; - if (!parameter.isNamePresent()) { - return Optional.empty(); - } - if (hasAggregator() && parameterIndex >= indexOfFirstAggregator()) { - return Optional.empty(); - } - return Optional.of(parameter.getName()); - } - - /** - * Determine if the {@link Method} represented by this context declares at least one {@link Parameter} that is an - * {@linkplain #isAggregator aggregator}. - * - * @return {@code true} if the method has an aggregator - */ - boolean hasAggregator() { - return resolverTypes.contains(AGGREGATOR); - } - - /** - * Determine if the {@link Parameter} with the supplied index is an aggregator (i.e., of type - * {@link ArgumentsAccessor} or annotated with {@link AggregateWith}). - * - * @return {@code true} if the parameter is an aggregator - */ - boolean isAggregator(int parameterIndex) { - return resolverTypes.size() > parameterIndex && resolverTypes.get(parameterIndex) == AGGREGATOR; - } - - /** - * Find the index of the first {@linkplain #isAggregator aggregator} {@link Parameter} in the {@link Method} - * represented by this context. - * - * @return the index of the first aggregator, or {@code -1} if not found - */ - int indexOfFirstAggregator() { - return resolverTypes.indexOf(AGGREGATOR); - } - - /** - * Resolve the parameter for the supplied context using the supplied arguments. - */ - Object resolve(ParameterContext parameterContext, Object[] arguments) { - return getResolver(parameterContext).resolve(parameterContext, arguments); - } - - private Resolver getResolver(ParameterContext parameterContext) { - int index = parameterContext.getIndex(); - if (resolvers[index] == null) { - resolvers[index] = resolverTypes.get(index).createResolver(parameterContext); - } - return resolvers[index]; - } - - enum ResolverType { - - CONVERTER { - @Override - Resolver createResolver(ParameterContext parameterContext) { - try { // @formatter:off - return AnnotationUtils.findAnnotation(parameterContext.getParameter(), ConvertWith.class) - .map(ConvertWith::value).map(clazz -> (ArgumentConverter) ReflectionUtils.newInstance(clazz)) - .map(converter -> AnnotationConsumerInitializer.initialize(parameterContext.getParameter(), converter)) - .map(Converter::new).orElse(Converter.DEFAULT); - } // @formatter:on - catch (Exception ex) { - throw parameterResolutionException("Error creating ArgumentConverter", ex, parameterContext); - } - } - }, - - AGGREGATOR { - @Override - Resolver createResolver(ParameterContext parameterContext) { - try { // @formatter:off - return AnnotationUtils.findAnnotation(parameterContext.getParameter(), AggregateWith.class) - .map(AggregateWith::value).map(clazz -> (ArgumentsAggregator) ReflectionSupport.newInstance(clazz)) - .map(Aggregator::new).orElse(Aggregator.DEFAULT); - } // @formatter:on - catch (Exception ex) { - throw parameterResolutionException("Error creating ArgumentsAggregator", ex, parameterContext); - } - } - }; - - abstract Resolver createResolver(ParameterContext parameterContext); - - } - - interface Resolver { - - Object resolve(ParameterContext parameterContext, Object[] arguments); - - } - - static class Converter implements Resolver { - - private static final Converter DEFAULT = new Converter(DefaultArgumentConverter.INSTANCE); - - private final ArgumentConverter argumentConverter; - - Converter(ArgumentConverter argumentConverter) { - this.argumentConverter = argumentConverter; - } - - @Override - public Object resolve(ParameterContext parameterContext, Object[] arguments) { - Object argument = arguments[parameterContext.getIndex()]; - try { - return this.argumentConverter.convert(argument, parameterContext); - } catch (Exception ex) { - throw parameterResolutionException("Error converting parameter", ex, parameterContext); - } - } - - } - - static class Aggregator implements Resolver { - - private static final Aggregator DEFAULT = new Aggregator((accessor, context) -> accessor); - - private final ArgumentsAggregator argumentsAggregator; - - Aggregator(ArgumentsAggregator argumentsAggregator) { - this.argumentsAggregator = argumentsAggregator; - } - - @Override - public Object resolve(ParameterContext parameterContext, Object[] arguments) { - ArgumentsAccessor accessor = new DefaultArgumentsAccessor(parameterContext, 1, arguments); - try { - return this.argumentsAggregator.aggregateArguments(accessor, parameterContext); - } catch (Exception ex) { - throw parameterResolutionException("Error aggregating arguments for parameter", ex, parameterContext); - } - } - - } - - private static ParameterResolutionException parameterResolutionException(String message, Exception cause, - ParameterContext parameterContext) { - String fullMessage = message + " at index " + parameterContext.getIndex(); - if (StringUtils.isNotBlank(cause.getMessage())) { - fullMessage += ": " + cause.getMessage(); - } - return new ParameterResolutionException(fullMessage, cause); - } - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestInvocationContext.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestInvocationContext.java deleted file mode 100644 index 658cd29b20..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestInvocationContext.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import java.util.Collections; -import java.util.List; - -import org.junit.jupiter.api.extension.Extension; -import org.junit.jupiter.api.extension.TestTemplateInvocationContext; - -/** - * Copy of {@code org.junit.jupiter.params.ParameterizedTestInvocationContext}. - */ -class ParameterizedTestInvocationContext implements TestTemplateInvocationContext { - - private final ParameterizedTestNameFormatter formatter; - private final ParameterizedTestContext constructorContext; - private final ParameterizedTestContext methodContext; - private final Object[] arguments; - - ParameterizedTestInvocationContext(ParameterizedTestNameFormatter formatter, - ParameterizedTestContext constructorContext, ParameterizedTestContext methodContext, Object[] arguments) { - this.formatter = formatter; - this.constructorContext = constructorContext; - this.methodContext = methodContext; - this.arguments = arguments; - } - - @Override - public String getDisplayName(int invocationIndex) { - return this.formatter.format(invocationIndex, this.arguments); - } - - @Override - public List getAdditionalExtensions() { - return Collections.singletonList( - new ParameterizedTestParameterResolver(this.constructorContext, this.methodContext, this.arguments)); - } - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestNameFormatter.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestNameFormatter.java deleted file mode 100644 index 7c02a0171f..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestNameFormatter.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import static java.util.stream.Collectors.joining; -import static org.junit.jupiter.params.ParameterizedTest.ARGUMENTS_PLACEHOLDER; -import static org.junit.jupiter.params.ParameterizedTest.ARGUMENTS_WITH_NAMES_PLACEHOLDER; -import static org.junit.jupiter.params.ParameterizedTest.DISPLAY_NAME_PLACEHOLDER; -import static org.junit.jupiter.params.ParameterizedTest.INDEX_PLACEHOLDER; - -import java.text.Format; -import java.text.MessageFormat; -import java.util.Arrays; -import java.util.stream.IntStream; - -import org.junit.platform.commons.JUnitException; -import org.junit.platform.commons.util.StringUtils; - -/** - * Copy of {@code org.junit.jupiter.params.ParameterizedTestNameFormatter}. - */ -class ParameterizedTestNameFormatter { - - private static final char ELLIPSIS = '\u2026'; - - private final String pattern; - private final String displayName; - private final ParameterizedTestContext methodContext; - private final int argumentMaxLength; - - ParameterizedTestNameFormatter(String pattern, String displayName, ParameterizedTestContext methodContext, - int argumentMaxLength) { - this.pattern = pattern; - this.displayName = displayName; - this.methodContext = methodContext; - this.argumentMaxLength = argumentMaxLength; - } - - String format(int invocationIndex, Object... arguments) { - try { - return formatSafely(invocationIndex, arguments); - } catch (Exception ex) { - throw new JUnitException("The display name pattern defined for the parameterized test is invalid;" - + " See nested exception for further details.", ex); - } - } - - private String formatSafely(int invocationIndex, Object[] arguments) { - String pattern = prepareMessageFormatPattern(invocationIndex, arguments); - MessageFormat format = new MessageFormat(pattern); - Object[] humanReadableArguments = makeReadable(format, arguments); - return format.format(humanReadableArguments); - } - - private String prepareMessageFormatPattern(int invocationIndex, Object[] arguments) { - String result = pattern// - .replace(DISPLAY_NAME_PLACEHOLDER, this.displayName)// - .replace(INDEX_PLACEHOLDER, String.valueOf(invocationIndex)); - - if (result.contains(ARGUMENTS_WITH_NAMES_PLACEHOLDER)) { - result = result.replace(ARGUMENTS_WITH_NAMES_PLACEHOLDER, argumentsWithNamesPattern(arguments)); - } - - if (result.contains(ARGUMENTS_PLACEHOLDER)) { - result = result.replace(ARGUMENTS_PLACEHOLDER, argumentsPattern(arguments)); - } - - return result; - } - - private String argumentsWithNamesPattern(Object[] arguments) { - return IntStream.range(0, arguments.length) // - .mapToObj(index -> methodContext.getParameterName(index).map(name -> name + "=").orElse("") + "{" + index + "}") // - .collect(joining(", ")); - } - - private String argumentsPattern(Object[] arguments) { - return IntStream.range(0, arguments.length) // - .mapToObj(index -> "{" + index + "}") // - .collect(joining(", ")); - } - - private Object[] makeReadable(MessageFormat format, Object[] arguments) { - Format[] formats = format.getFormatsByArgumentIndex(); - Object[] result = Arrays.copyOf(arguments, Math.min(arguments.length, formats.length), Object[].class); - for (int i = 0; i < result.length; i++) { - if (formats[i] == null) { - result[i] = truncateIfExceedsMaxLength(StringUtils.nullSafeToString(arguments[i])); - } - } - return result; - } - - private String truncateIfExceedsMaxLength(String argument) { - if (argument.length() > argumentMaxLength) { - return argument.substring(0, argumentMaxLength - 1) + ELLIPSIS; - } - return argument; - } - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestParameterResolver.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestParameterResolver.java deleted file mode 100644 index adcff56f32..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestParameterResolver.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Executable; -import java.lang.reflect.Method; - -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.api.extension.ParameterContext; -import org.junit.jupiter.api.extension.ParameterResolutionException; -import org.junit.jupiter.api.extension.ParameterResolver; - -/** - * Copy of {@code org.junit.jupiter.params.ParameterizedTestParameterResolver}. - */ -class ParameterizedTestParameterResolver implements ParameterResolver { - - private final ParameterizedTestContext constructorContext; - private final ParameterizedTestContext methodContext; - private final Object[] arguments; - - ParameterizedTestParameterResolver(ParameterizedTestContext constructorContext, - ParameterizedTestContext methodContext, Object[] arguments) { - this.constructorContext = constructorContext; - this.methodContext = methodContext; - this.arguments = arguments; - } - - @Override - public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { - - Executable declaringExecutable = parameterContext.getDeclaringExecutable(); - int parameterIndex = parameterContext.getIndex(); - ParameterizedTestContext testContext; - - if (declaringExecutable instanceof Constructor) { - testContext = this.constructorContext; - } else { - - Method testMethod = extensionContext.getTestMethod().orElse(null); - - // Not a parameterized method? - if (parameterContext.getDeclaringExecutable() instanceof Method && !declaringExecutable.equals(testMethod)) { - return false; - } - testContext = this.methodContext; - } - - // Current parameter is an aggregator? - if (testContext.isAggregator(parameterIndex)) { - return true; - } - - // Ensure that the current parameter is declared before aggregators. - // Otherwise, a different ParameterResolver should handle it. - if (testContext.hasAggregator()) { - return parameterIndex < testContext.indexOfFirstAggregator(); - } - - // Else fallback to behavior for parameterized test methods without aggregators. - return parameterIndex < this.arguments.length; - } - - @Override - public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) - throws ParameterResolutionException { - - if (parameterContext.getDeclaringExecutable() instanceof Constructor) { - return this.constructorContext.resolve(parameterContext, this.arguments); - } - - return this.methodContext.resolve(parameterContext, this.arguments); - } - -}
- * Copy of {@code org.junit.jupiter.params.ParameterizedTestContext}. - */ -class ParameterizedTestContext { - - private final Parameter[] parameters; - private final Resolver[] resolvers; - private final List resolverTypes; - - ParameterizedTestContext(Executable testMethod) { - this.parameters = testMethod.getParameters(); - this.resolvers = new Resolver[this.parameters.length]; - this.resolverTypes = new ArrayList<>(this.parameters.length); - for (Parameter parameter : this.parameters) { - this.resolverTypes.add(isAggregator(parameter) ? AGGREGATOR : CONVERTER); - } - } - - /** - * Determine if the supplied {@link Parameter} is an aggregator (i.e., of type {@link ArgumentsAccessor} or annotated - * with {@link AggregateWith}). - * - * @return {@code true} if the parameter is an aggregator - */ - private static boolean isAggregator(Parameter parameter) { - return ArgumentsAccessor.class.isAssignableFrom(parameter.getType()) || isAnnotated(parameter, AggregateWith.class); - } - - /** - * Determine if the {@link Method} represented by this context has a potentially valid signature (i.e., - * formal parameter declarations) with regard to aggregators. - * - * This method takes a best-effort approach at enforcing the following policy for parameterized test methods that - * accept aggregators as arguments. - * - * zero or more indexed arguments come first. - * zero or more aggregators come next. - * zero or more arguments supplied by other {@code ParameterResolver} implementations come last. - * - * - * @return {@code true} if the method has a potentially valid signature - */ - boolean hasPotentiallyValidSignature() { - int indexOfPreviousAggregator = -1; - for (int i = 0; i < getParameterCount(); i++) { - if (isAggregator(i)) { - if ((indexOfPreviousAggregator != -1) && (i != indexOfPreviousAggregator + 1)) { - return false; - } - indexOfPreviousAggregator = i; - } - } - return true; - } - - /** - * Get the number of parameters of the {@link Method} represented by this context. - */ - int getParameterCount() { - return parameters.length; - } - - /** - * Get the name of the {@link Parameter} with the supplied index, if it is present and declared before the - * aggregators. - * - * @return an {@code Optional} containing the name of the parameter - */ - Optional getParameterName(int parameterIndex) { - if (parameterIndex >= getParameterCount()) { - return Optional.empty(); - } - Parameter parameter = this.parameters[parameterIndex]; - if (!parameter.isNamePresent()) { - return Optional.empty(); - } - if (hasAggregator() && parameterIndex >= indexOfFirstAggregator()) { - return Optional.empty(); - } - return Optional.of(parameter.getName()); - } - - /** - * Determine if the {@link Method} represented by this context declares at least one {@link Parameter} that is an - * {@linkplain #isAggregator aggregator}. - * - * @return {@code true} if the method has an aggregator - */ - boolean hasAggregator() { - return resolverTypes.contains(AGGREGATOR); - } - - /** - * Determine if the {@link Parameter} with the supplied index is an aggregator (i.e., of type - * {@link ArgumentsAccessor} or annotated with {@link AggregateWith}). - * - * @return {@code true} if the parameter is an aggregator - */ - boolean isAggregator(int parameterIndex) { - return resolverTypes.size() > parameterIndex && resolverTypes.get(parameterIndex) == AGGREGATOR; - } - - /** - * Find the index of the first {@linkplain #isAggregator aggregator} {@link Parameter} in the {@link Method} - * represented by this context. - * - * @return the index of the first aggregator, or {@code -1} if not found - */ - int indexOfFirstAggregator() { - return resolverTypes.indexOf(AGGREGATOR); - } - - /** - * Resolve the parameter for the supplied context using the supplied arguments. - */ - Object resolve(ParameterContext parameterContext, Object[] arguments) { - return getResolver(parameterContext).resolve(parameterContext, arguments); - } - - private Resolver getResolver(ParameterContext parameterContext) { - int index = parameterContext.getIndex(); - if (resolvers[index] == null) { - resolvers[index] = resolverTypes.get(index).createResolver(parameterContext); - } - return resolvers[index]; - } - - enum ResolverType { - - CONVERTER { - @Override - Resolver createResolver(ParameterContext parameterContext) { - try { // @formatter:off - return AnnotationUtils.findAnnotation(parameterContext.getParameter(), ConvertWith.class) - .map(ConvertWith::value).map(clazz -> (ArgumentConverter) ReflectionUtils.newInstance(clazz)) - .map(converter -> AnnotationConsumerInitializer.initialize(parameterContext.getParameter(), converter)) - .map(Converter::new).orElse(Converter.DEFAULT); - } // @formatter:on - catch (Exception ex) { - throw parameterResolutionException("Error creating ArgumentConverter", ex, parameterContext); - } - } - }, - - AGGREGATOR { - @Override - Resolver createResolver(ParameterContext parameterContext) { - try { // @formatter:off - return AnnotationUtils.findAnnotation(parameterContext.getParameter(), AggregateWith.class) - .map(AggregateWith::value).map(clazz -> (ArgumentsAggregator) ReflectionSupport.newInstance(clazz)) - .map(Aggregator::new).orElse(Aggregator.DEFAULT); - } // @formatter:on - catch (Exception ex) { - throw parameterResolutionException("Error creating ArgumentsAggregator", ex, parameterContext); - } - } - }; - - abstract Resolver createResolver(ParameterContext parameterContext); - - } - - interface Resolver { - - Object resolve(ParameterContext parameterContext, Object[] arguments); - - } - - static class Converter implements Resolver { - - private static final Converter DEFAULT = new Converter(DefaultArgumentConverter.INSTANCE); - - private final ArgumentConverter argumentConverter; - - Converter(ArgumentConverter argumentConverter) { - this.argumentConverter = argumentConverter; - } - - @Override - public Object resolve(ParameterContext parameterContext, Object[] arguments) { - Object argument = arguments[parameterContext.getIndex()]; - try { - return this.argumentConverter.convert(argument, parameterContext); - } catch (Exception ex) { - throw parameterResolutionException("Error converting parameter", ex, parameterContext); - } - } - - } - - static class Aggregator implements Resolver { - - private static final Aggregator DEFAULT = new Aggregator((accessor, context) -> accessor); - - private final ArgumentsAggregator argumentsAggregator; - - Aggregator(ArgumentsAggregator argumentsAggregator) { - this.argumentsAggregator = argumentsAggregator; - } - - @Override - public Object resolve(ParameterContext parameterContext, Object[] arguments) { - ArgumentsAccessor accessor = new DefaultArgumentsAccessor(parameterContext, 1, arguments); - try { - return this.argumentsAggregator.aggregateArguments(accessor, parameterContext); - } catch (Exception ex) { - throw parameterResolutionException("Error aggregating arguments for parameter", ex, parameterContext); - } - } - - } - - private static ParameterResolutionException parameterResolutionException(String message, Exception cause, - ParameterContext parameterContext) { - String fullMessage = message + " at index " + parameterContext.getIndex(); - if (StringUtils.isNotBlank(cause.getMessage())) { - fullMessage += ": " + cause.getMessage(); - } - return new ParameterResolutionException(fullMessage, cause); - } - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestInvocationContext.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestInvocationContext.java deleted file mode 100644 index 658cd29b20..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestInvocationContext.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import java.util.Collections; -import java.util.List; - -import org.junit.jupiter.api.extension.Extension; -import org.junit.jupiter.api.extension.TestTemplateInvocationContext; - -/** - * Copy of {@code org.junit.jupiter.params.ParameterizedTestInvocationContext}. - */ -class ParameterizedTestInvocationContext implements TestTemplateInvocationContext { - - private final ParameterizedTestNameFormatter formatter; - private final ParameterizedTestContext constructorContext; - private final ParameterizedTestContext methodContext; - private final Object[] arguments; - - ParameterizedTestInvocationContext(ParameterizedTestNameFormatter formatter, - ParameterizedTestContext constructorContext, ParameterizedTestContext methodContext, Object[] arguments) { - this.formatter = formatter; - this.constructorContext = constructorContext; - this.methodContext = methodContext; - this.arguments = arguments; - } - - @Override - public String getDisplayName(int invocationIndex) { - return this.formatter.format(invocationIndex, this.arguments); - } - - @Override - public List getAdditionalExtensions() { - return Collections.singletonList( - new ParameterizedTestParameterResolver(this.constructorContext, this.methodContext, this.arguments)); - } - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestNameFormatter.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestNameFormatter.java deleted file mode 100644 index 7c02a0171f..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestNameFormatter.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import static java.util.stream.Collectors.joining; -import static org.junit.jupiter.params.ParameterizedTest.ARGUMENTS_PLACEHOLDER; -import static org.junit.jupiter.params.ParameterizedTest.ARGUMENTS_WITH_NAMES_PLACEHOLDER; -import static org.junit.jupiter.params.ParameterizedTest.DISPLAY_NAME_PLACEHOLDER; -import static org.junit.jupiter.params.ParameterizedTest.INDEX_PLACEHOLDER; - -import java.text.Format; -import java.text.MessageFormat; -import java.util.Arrays; -import java.util.stream.IntStream; - -import org.junit.platform.commons.JUnitException; -import org.junit.platform.commons.util.StringUtils; - -/** - * Copy of {@code org.junit.jupiter.params.ParameterizedTestNameFormatter}. - */ -class ParameterizedTestNameFormatter { - - private static final char ELLIPSIS = '\u2026'; - - private final String pattern; - private final String displayName; - private final ParameterizedTestContext methodContext; - private final int argumentMaxLength; - - ParameterizedTestNameFormatter(String pattern, String displayName, ParameterizedTestContext methodContext, - int argumentMaxLength) { - this.pattern = pattern; - this.displayName = displayName; - this.methodContext = methodContext; - this.argumentMaxLength = argumentMaxLength; - } - - String format(int invocationIndex, Object... arguments) { - try { - return formatSafely(invocationIndex, arguments); - } catch (Exception ex) { - throw new JUnitException("The display name pattern defined for the parameterized test is invalid;" - + " See nested exception for further details.", ex); - } - } - - private String formatSafely(int invocationIndex, Object[] arguments) { - String pattern = prepareMessageFormatPattern(invocationIndex, arguments); - MessageFormat format = new MessageFormat(pattern); - Object[] humanReadableArguments = makeReadable(format, arguments); - return format.format(humanReadableArguments); - } - - private String prepareMessageFormatPattern(int invocationIndex, Object[] arguments) { - String result = pattern// - .replace(DISPLAY_NAME_PLACEHOLDER, this.displayName)// - .replace(INDEX_PLACEHOLDER, String.valueOf(invocationIndex)); - - if (result.contains(ARGUMENTS_WITH_NAMES_PLACEHOLDER)) { - result = result.replace(ARGUMENTS_WITH_NAMES_PLACEHOLDER, argumentsWithNamesPattern(arguments)); - } - - if (result.contains(ARGUMENTS_PLACEHOLDER)) { - result = result.replace(ARGUMENTS_PLACEHOLDER, argumentsPattern(arguments)); - } - - return result; - } - - private String argumentsWithNamesPattern(Object[] arguments) { - return IntStream.range(0, arguments.length) // - .mapToObj(index -> methodContext.getParameterName(index).map(name -> name + "=").orElse("") + "{" + index + "}") // - .collect(joining(", ")); - } - - private String argumentsPattern(Object[] arguments) { - return IntStream.range(0, arguments.length) // - .mapToObj(index -> "{" + index + "}") // - .collect(joining(", ")); - } - - private Object[] makeReadable(MessageFormat format, Object[] arguments) { - Format[] formats = format.getFormatsByArgumentIndex(); - Object[] result = Arrays.copyOf(arguments, Math.min(arguments.length, formats.length), Object[].class); - for (int i = 0; i < result.length; i++) { - if (formats[i] == null) { - result[i] = truncateIfExceedsMaxLength(StringUtils.nullSafeToString(arguments[i])); - } - } - return result; - } - - private String truncateIfExceedsMaxLength(String argument) { - if (argument.length() > argumentMaxLength) { - return argument.substring(0, argumentMaxLength - 1) + ELLIPSIS; - } - return argument; - } - -} diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestParameterResolver.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestParameterResolver.java deleted file mode 100644 index adcff56f32..0000000000 --- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/ParameterizedTestParameterResolver.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright 2020-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.extension.parametrized; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Executable; -import java.lang.reflect.Method; - -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.api.extension.ParameterContext; -import org.junit.jupiter.api.extension.ParameterResolutionException; -import org.junit.jupiter.api.extension.ParameterResolver; - -/** - * Copy of {@code org.junit.jupiter.params.ParameterizedTestParameterResolver}. - */ -class ParameterizedTestParameterResolver implements ParameterResolver { - - private final ParameterizedTestContext constructorContext; - private final ParameterizedTestContext methodContext; - private final Object[] arguments; - - ParameterizedTestParameterResolver(ParameterizedTestContext constructorContext, - ParameterizedTestContext methodContext, Object[] arguments) { - this.constructorContext = constructorContext; - this.methodContext = methodContext; - this.arguments = arguments; - } - - @Override - public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { - - Executable declaringExecutable = parameterContext.getDeclaringExecutable(); - int parameterIndex = parameterContext.getIndex(); - ParameterizedTestContext testContext; - - if (declaringExecutable instanceof Constructor) { - testContext = this.constructorContext; - } else { - - Method testMethod = extensionContext.getTestMethod().orElse(null); - - // Not a parameterized method? - if (parameterContext.getDeclaringExecutable() instanceof Method && !declaringExecutable.equals(testMethod)) { - return false; - } - testContext = this.methodContext; - } - - // Current parameter is an aggregator? - if (testContext.isAggregator(parameterIndex)) { - return true; - } - - // Ensure that the current parameter is declared before aggregators. - // Otherwise, a different ParameterResolver should handle it. - if (testContext.hasAggregator()) { - return parameterIndex < testContext.indexOfFirstAggregator(); - } - - // Else fallback to behavior for parameterized test methods without aggregators. - return parameterIndex < this.arguments.length; - } - - @Override - public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) - throws ParameterResolutionException { - - if (parameterContext.getDeclaringExecutable() instanceof Constructor) { - return this.constructorContext.resolve(parameterContext, this.arguments); - } - - return this.methodContext.resolve(parameterContext, this.arguments); - } - -}
- * This method takes a best-effort approach at enforcing the following policy for parameterized test methods that - * accept aggregators as arguments. - *