Skip to content

Commit 7874de4

Browse files
committed
Restore tests that were failing with Java 13
Closes gh-17607
1 parent 9a16a50 commit 7874de4

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import org.junit.jupiter.api.AfterAll;
2626
import org.junit.jupiter.api.BeforeAll;
2727
import org.junit.jupiter.api.Test;
28-
import org.junit.jupiter.api.condition.DisabledOnJre;
29-
import org.junit.jupiter.api.condition.JRE;
3028

3129
import org.springframework.beans.factory.BeanCreationException;
3230
import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -75,7 +73,6 @@ void systemPropertyWithXml() {
7573
}
7674

7775
@Test
78-
@DisabledOnJre(JRE.JAVA_13)
7976
void systemPropertyWithYaml() {
8077
this.contextRunner
8178
.withSystemProperties(HazelcastClientConfiguration.CONFIG_SYSTEM_PROPERTY
@@ -90,7 +87,6 @@ void explicitConfigFileWithXml() {
9087
}
9188

9289
@Test
93-
@DisabledOnJre(JRE.JAVA_13)
9490
void explicitConfigFileWithYaml() {
9591
this.contextRunner
9692
.withPropertyValues("spring.hazelcast.config=org/springframework/boot/autoconfigure/"
@@ -107,7 +103,6 @@ void explicitConfigUrlWithXml() {
107103
}
108104

109105
@Test
110-
@DisabledOnJre(JRE.JAVA_13)
111106
void explicitConfigUrlWithYaml() {
112107
this.contextRunner
113108
.withPropertyValues("spring.hazelcast.config=classpath:org/springframework/"

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import com.hazelcast.core.Hazelcast;
2424
import com.hazelcast.core.HazelcastInstance;
2525
import org.junit.jupiter.api.Test;
26-
import org.junit.jupiter.api.condition.DisabledOnJre;
27-
import org.junit.jupiter.api.condition.JRE;
2826

2927
import org.springframework.beans.factory.BeanCreationException;
3028
import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -70,7 +68,6 @@ void systemPropertyWithXml() {
7068
}
7169

7270
@Test
73-
@DisabledOnJre(JRE.JAVA_13)
7471
void systemPropertyWithYaml() {
7572
this.contextRunner
7673
.withSystemProperties(HazelcastServerConfiguration.CONFIG_SYSTEM_PROPERTY
@@ -91,7 +88,6 @@ void explicitConfigFileWithXml() {
9188
}
9289

9390
@Test
94-
@DisabledOnJre(JRE.JAVA_13)
9591
void explicitConfigFileWithYaml() {
9692
this.contextRunner
9793
.withPropertyValues("spring.hazelcast.config=org/springframework/boot/autoconfigure/hazelcast/"
@@ -110,7 +106,6 @@ void explicitConfigUrlWithXml() {
110106
}
111107

112108
@Test
113-
@DisabledOnJre(JRE.JAVA_13)
114109
void explicitConfigUrlWithYaml() {
115110
this.contextRunner
116111
.withPropertyValues("spring.hazelcast.config=classpath:org/springframework/"

0 commit comments

Comments
 (0)