Refactor test cases to account for feedback

Remove the usage of embedded mongo and redis in favor
of test containers

Author: Angel L. Villalain Garcia

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-http-mongo/build.gradle

@@ -11,8 +11,9 @@ dependencies {
     implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb"))
     implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
     implementation("org.springframework.session:spring-session-data-mongodb")
-
-    runtimeOnly("de.flapdoodle.embed:de.flapdoodle.embed.mongo")
-
+    testImplementation("org.testcontainers:mongodb")
+    testImplementation("org.testcontainers:testcontainers")
+    testImplementation("org.testcontainers:junit-jupiter")
+    testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
     testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-http-mongo/src/test/java/smoketest/session/mongodb/SampleHttpSessionMongoApplicationTests.java

@@ -17,36 +17,50 @@
 package smoketest.session.mongodb;
 
 import java.net.URI;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.MongoDBContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		properties = { "spring.security.user.name=" + SampleHttpSessionMongoApplicationTests.USERNAME,
-				"spring.security.user.password=" + SampleHttpSessionMongoApplicationTests.PASSWORD })
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Testcontainers(disabledWithoutDocker = true)
 public class SampleHttpSessionMongoApplicationTests {
 
 	static final String USERNAME = "user";
 	static final String PASSWORD = "password";
+	static final String ROOT = "/";
+
+	@Container
+	static MongoDBContainer mongo = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(3)
+			.withStartupTimeout(Duration.ofMinutes(2));
 
 	@Autowired
 	private TestRestTemplate template;
 
-	@LocalServerPort
-	private int port;
+	@DynamicPropertySource
+	static void applicationProperties(DynamicPropertyRegistry registry) {
+		registry.add("spring.security.user.name", () -> USERNAME);
+		registry.add("spring.security.user.password", () -> PASSWORD);
+		registry.add("spring.data.mongodb.uri", mongo::getReplicaSetUrl);
+	}
 
 	@Test
 	@SuppressWarnings("unchecked")
@@ -60,7 +74,7 @@ void sessionsEndpointShouldReturnUserSessions() {
 	}
 
 	private void createSession() {
-		URI uri = URI.create("http://localhost:" + this.port + "/");
+		URI uri = URI.create(ROOT);
 		HttpHeaders headers = new HttpHeaders();
 		headers.setBasicAuth(USERNAME, PASSWORD);
 		RequestEntity<Object> request = new RequestEntity<>(headers, HttpMethod.GET, uri);

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-http-redis/build.gradle

@@ -11,9 +11,8 @@ dependencies {
     implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis"))
     implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
     implementation("org.springframework.session:spring-session-data-redis")
-
-    testImplementation("it.ozimov:embedded-redis:0.7.3") {
-        exclude group: "org.slf4j", module: "slf4j-simple"
-    }
+    testImplementation("org.testcontainers:testcontainers")
+    testImplementation("org.testcontainers:junit-jupiter")
+    testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
     testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-http-redis/src/test/java/smoketest/session/redis/SampleHttpSessionRedisApplicationTests.java

@@ -21,34 +21,44 @@
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.testsupport.testcontainers.RedisContainer;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		properties = { "spring.security.user.name=" + SampleHttpSessionRedisApplicationTests.USERNAME,
-				"spring.security.user.password=" + SampleHttpSessionRedisApplicationTests.PASSWORD,
-				"spring.redis.host=localhost", "spring.redis.port=6379" },
-		classes = TestRedisConfiguration.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Testcontainers(disabledWithoutDocker = true)
 public class SampleHttpSessionRedisApplicationTests {
 
 	static final String USERNAME = "user";
 	static final String PASSWORD = "password";
+	static final String ROOT = "/";
+
+	@Container
+	static RedisContainer redis = new RedisContainer();
 
 	@Autowired
 	private TestRestTemplate template;
 
-	@LocalServerPort
-	private int port;
+	@DynamicPropertySource
+	static void applicationProperties(DynamicPropertyRegistry registry) {
+		registry.add("spring.security.user.name", () -> USERNAME);
+		registry.add("spring.security.user.password", () -> PASSWORD);
+		registry.add("spring.redis.host", redis::getHost);
+		registry.add("spring.redis.port", redis::getFirstMappedPort);
+	}
 
 	@Test
 	@SuppressWarnings("unchecked")
@@ -62,7 +72,7 @@ void sessionsEndpointShouldReturnUserSessions() {
 	}
 
 	private void createSession() {
-		URI uri = URI.create("http://localhost:" + this.port + "/");
+		URI uri = URI.create(ROOT);
 		HttpHeaders headers = new HttpHeaders();
 		headers.setBasicAuth(USERNAME, PASSWORD);
 		RequestEntity<Object> request = new RequestEntity<>(headers, HttpMethod.GET, uri);