Commit 7874de40 authored by Stephane Nicoll's avatar Stephane Nicoll

Restore tests that were failing with Java 13

Closes gh-17607
parent 9a16a505
...@@ -25,8 +25,6 @@ import org.assertj.core.api.Condition; ...@@ -25,8 +25,6 @@ import org.assertj.core.api.Condition;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; 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.beans.factory.BeanCreationException;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
...@@ -75,7 +73,6 @@ class HazelcastAutoConfigurationClientTests { ...@@ -75,7 +73,6 @@ class HazelcastAutoConfigurationClientTests {
} }
@Test @Test
@DisabledOnJre(JRE.JAVA_13)
void systemPropertyWithYaml() { void systemPropertyWithYaml() {
this.contextRunner this.contextRunner
.withSystemProperties(HazelcastClientConfiguration.CONFIG_SYSTEM_PROPERTY .withSystemProperties(HazelcastClientConfiguration.CONFIG_SYSTEM_PROPERTY
...@@ -90,7 +87,6 @@ class HazelcastAutoConfigurationClientTests { ...@@ -90,7 +87,6 @@ class HazelcastAutoConfigurationClientTests {
} }
@Test @Test
@DisabledOnJre(JRE.JAVA_13)
void explicitConfigFileWithYaml() { void explicitConfigFileWithYaml() {
this.contextRunner this.contextRunner
.withPropertyValues("spring.hazelcast.config=org/springframework/boot/autoconfigure/" .withPropertyValues("spring.hazelcast.config=org/springframework/boot/autoconfigure/"
...@@ -107,7 +103,6 @@ class HazelcastAutoConfigurationClientTests { ...@@ -107,7 +103,6 @@ class HazelcastAutoConfigurationClientTests {
} }
@Test @Test
@DisabledOnJre(JRE.JAVA_13)
void explicitConfigUrlWithYaml() { void explicitConfigUrlWithYaml() {
this.contextRunner this.contextRunner
.withPropertyValues("spring.hazelcast.config=classpath:org/springframework/" .withPropertyValues("spring.hazelcast.config=classpath:org/springframework/"
......
...@@ -23,8 +23,6 @@ import com.hazelcast.config.QueueConfig; ...@@ -23,8 +23,6 @@ import com.hazelcast.config.QueueConfig;
import com.hazelcast.core.Hazelcast; import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.HazelcastInstance;
import org.junit.jupiter.api.Test; 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.beans.factory.BeanCreationException;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
...@@ -70,7 +68,6 @@ class HazelcastAutoConfigurationServerTests { ...@@ -70,7 +68,6 @@ class HazelcastAutoConfigurationServerTests {
} }
@Test @Test
@DisabledOnJre(JRE.JAVA_13)
void systemPropertyWithYaml() { void systemPropertyWithYaml() {
this.contextRunner this.contextRunner
.withSystemProperties(HazelcastServerConfiguration.CONFIG_SYSTEM_PROPERTY .withSystemProperties(HazelcastServerConfiguration.CONFIG_SYSTEM_PROPERTY
...@@ -91,7 +88,6 @@ class HazelcastAutoConfigurationServerTests { ...@@ -91,7 +88,6 @@ class HazelcastAutoConfigurationServerTests {
} }
@Test @Test
@DisabledOnJre(JRE.JAVA_13)
void explicitConfigFileWithYaml() { void explicitConfigFileWithYaml() {
this.contextRunner this.contextRunner
.withPropertyValues("spring.hazelcast.config=org/springframework/boot/autoconfigure/hazelcast/" .withPropertyValues("spring.hazelcast.config=org/springframework/boot/autoconfigure/hazelcast/"
...@@ -110,7 +106,6 @@ class HazelcastAutoConfigurationServerTests { ...@@ -110,7 +106,6 @@ class HazelcastAutoConfigurationServerTests {
} }
@Test @Test
@DisabledOnJre(JRE.JAVA_13)
void explicitConfigUrlWithYaml() { void explicitConfigUrlWithYaml() {
this.contextRunner this.contextRunner
.withPropertyValues("spring.hazelcast.config=classpath:org/springframework/" .withPropertyValues("spring.hazelcast.config=classpath:org/springframework/"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment