From 30588dc3c889c31e29097baf3e26f83c41f3fc01 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 +- ...lientServerHazelcastIndexedSessionRepositoryITests.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index ca612e28..6fe0ca2d 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -5,7 +5,7 @@ dependencyManagement { mavenBom 'org.springframework:spring-framework-bom:5.2.0.RELEASE' mavenBom 'org.springframework.data:spring-data-releasetrain:Moore-RELEASE' mavenBom 'org.springframework.security:spring-security-bom:5.2.0.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/ClientServerHazelcastIndexedSessionRepositoryITests.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java index 0b4cc65c..8f43a1cc 100644 --- a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java +++ b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java @@ -22,8 +22,8 @@ import com.hazelcast.core.HazelcastInstance; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.extension.ExtendWith; -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; @@ -47,9 +47,8 @@ import org.springframework.test.context.web.WebAppConfiguration; class ClientServerHazelcastIndexedSessionRepositoryITests extends AbstractHazelcastIndexedSessionRepositoryITests { private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:3.12.3") - .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); + .withExposedPorts(5701).withCopyFileToContainer(MountableFile.forClasspathResource("/hazelcast-server.xml"), + "/opt/hazelcast/hazelcast.xml"); @BeforeAll static void setUpClass() {