From 7874de40620731d6d0a5061f83f5e49359cd1903 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 5 Aug 2019 20:25:40 +0200 Subject: [PATCH] Restore tests that were failing with Java 13 Closes gh-17607 --- .../hazelcast/HazelcastAutoConfigurationClientTests.java | 5 ----- .../hazelcast/HazelcastAutoConfigurationServerTests.java | 5 ----- 2 files changed, 10 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java index 66e12d68d9..87d15d0a02 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java @@ -25,8 +25,6 @@ import org.assertj.core.api.Condition; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnJre; -import org.junit.jupiter.api.condition.JRE; import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -75,7 +73,6 @@ class HazelcastAutoConfigurationClientTests { } @Test - @DisabledOnJre(JRE.JAVA_13) void systemPropertyWithYaml() { this.contextRunner .withSystemProperties(HazelcastClientConfiguration.CONFIG_SYSTEM_PROPERTY @@ -90,7 +87,6 @@ class HazelcastAutoConfigurationClientTests { } @Test - @DisabledOnJre(JRE.JAVA_13) void explicitConfigFileWithYaml() { this.contextRunner .withPropertyValues("spring.hazelcast.config=org/springframework/boot/autoconfigure/" @@ -107,7 +103,6 @@ class HazelcastAutoConfigurationClientTests { } @Test - @DisabledOnJre(JRE.JAVA_13) void explicitConfigUrlWithYaml() { this.contextRunner .withPropertyValues("spring.hazelcast.config=classpath:org/springframework/" diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java index 4275f7adcb..25e8c4271d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java @@ -23,8 +23,6 @@ import com.hazelcast.config.QueueConfig; import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnJre; -import org.junit.jupiter.api.condition.JRE; import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -70,7 +68,6 @@ class HazelcastAutoConfigurationServerTests { } @Test - @DisabledOnJre(JRE.JAVA_13) void systemPropertyWithYaml() { this.contextRunner .withSystemProperties(HazelcastServerConfiguration.CONFIG_SYSTEM_PROPERTY @@ -91,7 +88,6 @@ class HazelcastAutoConfigurationServerTests { } @Test - @DisabledOnJre(JRE.JAVA_13) void explicitConfigFileWithYaml() { this.contextRunner .withPropertyValues("spring.hazelcast.config=org/springframework/boot/autoconfigure/hazelcast/" @@ -110,7 +106,6 @@ class HazelcastAutoConfigurationServerTests { } @Test - @DisabledOnJre(JRE.JAVA_13) void explicitConfigUrlWithYaml() { this.contextRunner .withPropertyValues("spring.hazelcast.config=classpath:org/springframework/"