From 4a3f0d5f346eb47f94ef8e19341aafa9634b51fb Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Sun, 6 Oct 2019 13:31:21 +0200 Subject: [PATCH] Improve Hazelcast client-server topology integration tests Resolves: #1527 --- gradle/dependency-management.gradle | 2 +- .../hazelcast/HazelcastClientRepositoryITests.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index d9b740ab..f9a01d1e 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -4,7 +4,7 @@ dependencyManagement { mavenBom 'org.springframework:spring-framework-bom:5.1.10.RELEASE' mavenBom 'org.springframework.data:spring-data-releasetrain:Lovelace-SR11' mavenBom 'org.springframework.security:spring-security-bom:5.1.5.RELEASE' - mavenBom 'org.testcontainers:testcontainers-bom:1.12.0' + mavenBom 'org.testcontainers:testcontainers-bom:1.12.2' } dependencies { diff --git a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java index 2f3be3b0..4b327adb 100644 --- a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java +++ b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java @@ -22,8 +22,8 @@ import com.hazelcast.core.HazelcastInstance; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.testcontainers.containers.BindMode; import org.testcontainers.containers.GenericContainer; +import org.testcontainers.utility.MountableFile; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -50,11 +50,9 @@ public class HazelcastClientRepositoryITests extends AbstractHazelcastRepository private static GenericContainer container = new GenericContainer<>( "hazelcast/hazelcast:3.11.4") .withExposedPorts(5701) - .withEnv("JAVA_OPTS", - "-Dhazelcast.config=/opt/hazelcast/config_ext/hazelcast.xml") - .withClasspathResourceMapping("/hazelcast-server.xml", - "/opt/hazelcast/config_ext/hazelcast.xml", - BindMode.READ_ONLY); + .withCopyFileToContainer( + MountableFile.forClasspathResource("/hazelcast-server.xml"), + "/opt/hazelcast/hazelcast.xml"); @BeforeClass public static void setUpClass() {