From 6fd1f0f1f5b4dbef032566a9c4702ea77fdeb018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 19 Aug 2024 14:38:54 +0200 Subject: [PATCH] Avoid using JRE.OTHER for Infinispan tests See gh-41909 --- .../cache/CacheAutoConfigurationTests.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java index adecac29b75..ecd0ce8b047 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java @@ -38,7 +38,7 @@ import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.jcache.embedded.JCachingProvider; import org.infinispan.spring.embedded.provider.SpringEmbeddedCacheManager; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnJre; +import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.JRE; import org.springframework.beans.factory.BeanCreationException; @@ -569,7 +569,7 @@ class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationTests { } @Test - @DisabledOnJre(value = JRE.OTHER, disabledReason = "Infinispan 14 does not work on Java 23") + @EnabledForJreRange(min = JRE.JAVA_17, max = JRE.JAVA_22, disabledReason = "Infinispan 14 does not work on Java 23") void infinispanCacheWithConfig() { this.contextRunner.withUserConfiguration(DefaultCacheConfiguration.class) .withPropertyValues("spring.cache.type=infinispan", "spring.cache.infinispan.config=infinispan.xml") @@ -580,7 +580,7 @@ class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationTests { } @Test - @DisabledOnJre(value = JRE.OTHER, disabledReason = "Infinispan 14 does not work on Java 23") + @EnabledForJreRange(min = JRE.JAVA_17, max = JRE.JAVA_22, disabledReason = "Infinispan 14 does not work on Java 23") void infinispanCacheWithCustomizers() { this.contextRunner.withUserConfiguration(DefaultCacheAndCustomizersConfiguration.class) .withPropertyValues("spring.cache.type=infinispan") @@ -588,7 +588,7 @@ class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationTests { } @Test - @DisabledOnJre(value = JRE.OTHER, disabledReason = "Infinispan 14 does not work on Java 23") + @EnabledForJreRange(min = JRE.JAVA_17, max = JRE.JAVA_22, disabledReason = "Infinispan 14 does not work on Java 23") void infinispanCacheWithCaches() { this.contextRunner.withUserConfiguration(DefaultCacheConfiguration.class) .withPropertyValues("spring.cache.type=infinispan", "spring.cache.cacheNames[0]=foo", @@ -598,7 +598,7 @@ class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationTests { } @Test - @DisabledOnJre(value = JRE.OTHER, disabledReason = "Infinispan 14 does not work on Java 23") + @EnabledForJreRange(min = JRE.JAVA_17, max = JRE.JAVA_22, disabledReason = "Infinispan 14 does not work on Java 23") void infinispanCacheWithCachesAndCustomConfig() { this.contextRunner.withUserConfiguration(InfinispanCustomConfiguration.class) .withPropertyValues("spring.cache.type=infinispan", "spring.cache.cacheNames[0]=foo", @@ -611,7 +611,7 @@ class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationTests { } @Test - @DisabledOnJre(value = JRE.OTHER, disabledReason = "Infinispan 14 does not work on Java 23") + @EnabledForJreRange(min = JRE.JAVA_17, max = JRE.JAVA_22, disabledReason = "Infinispan 14 does not work on Java 23") void infinispanAsJCacheWithCaches() { String cachingProviderClassName = JCachingProvider.class.getName(); this.contextRunner.withUserConfiguration(DefaultCacheConfiguration.class) @@ -622,7 +622,7 @@ class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationTests { } @Test - @DisabledOnJre(value = JRE.OTHER, disabledReason = "Infinispan 14 does not work on Java 23") + @EnabledForJreRange(min = JRE.JAVA_17, max = JRE.JAVA_22, disabledReason = "Infinispan 14 does not work on Java 23") void infinispanAsJCacheWithConfig() { String cachingProviderClassName = JCachingProvider.class.getName(); String configLocation = "infinispan.xml";