From cf3ed229de774eb02c3fa7a11ae0df064a864941 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Tue, 20 Jan 2026 11:43:22 +0100 Subject: [PATCH] Fix test parameterization in CaffeineReactiveCachingTests Prior to this commit, test methods in CaffeineReactiveCachingTests were parameterized twice with the same configuration class. See gh-31637 See gh-35833 (cherry picked from commit 9ebfdb8b6a360295603ebd2f1483a83817af6d64) --- .../cache/caffeine/CaffeineReactiveCachingTests.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineReactiveCachingTests.java b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineReactiveCachingTests.java index cd26be375cc..ca2ef7c5812 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineReactiveCachingTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineReactiveCachingTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; class CaffeineReactiveCachingTests { @ParameterizedTest - @ValueSource(classes = {AsyncCacheModeConfig.class, AsyncCacheModeConfig.class}) + @ValueSource(classes = {AsyncCacheModeConfig.class, AsyncCacheModeWithoutNullValuesConfig.class}) void cacheHitDetermination(Class configClass) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(configClass, ReactiveCacheableService.class); ReactiveCacheableService service = ctx.getBean(ReactiveCacheableService.class); @@ -106,9 +106,8 @@ class CaffeineReactiveCachingTests { ctx.close(); } - @ParameterizedTest - @ValueSource(classes = {AsyncCacheModeConfig.class, AsyncCacheModeConfig.class}) + @ValueSource(classes = {AsyncCacheModeConfig.class, AsyncCacheModeWithoutNullValuesConfig.class}) void fluxCacheDoesntDependOnFirstRequest(Class configClass) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(configClass, ReactiveCacheableService.class); ReactiveCacheableService service = ctx.getBean(ReactiveCacheableService.class);