Merge pull request #28362 from avillalain

* pr/28362:
  Polish "Add smoke tests for Spring Session Redis/Mongo"
  Add smoke tests for Spring Session Redis/Mongo

Closes gh-28362

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

@@ -0,0 +1,19 @@
+plugins {
+    id "java"
+    id "org.springframework.boot.conventions"
+}
+
+description = "Spring Boot Session Mongodb smoke test"
+
+dependencies {
+    implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
+    implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security"))
+    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")
+    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-mongo/src/main/java/smoketest/session/mongodb/SampleSessionMongoApplication.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package smoketest.session.mongodb;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession;
+
+@SpringBootApplication
+@EnableMongoHttpSession
+public class SampleSessionMongoApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(SampleSessionMongoApplication.class);
+	}
+
+}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/src/main/resources/application.properties

@@ -0,0 +1,3 @@
+management.endpoints.web.exposure.include=*
+spring.security.user.name=user
+spring.security.user.password=password

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

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+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.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;
+
+/**
+ * Tests for {@link SampleSessionMongoApplication}.
+ *
+ * @author Angel L. Villalain
+ */
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Testcontainers(disabledWithoutDocker = true)
+public class SampleSessionMongoApplicationTests {
+
+	private static final String USERNAME = "user";
+
+	private static final String PASSWORD = "password";
+
+	@Autowired
+	private TestRestTemplate restTemplate;
+
+	@Container
+	static MongoDBContainer mongo = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(3)
+			.withStartupTimeout(Duration.ofMinutes(2));
+
+	@DynamicPropertySource
+	static void applicationProperties(DynamicPropertyRegistry registry) {
+		registry.add("spring.data.mongodb.uri", mongo::getReplicaSetUrl);
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	void sessionsEndpointShouldReturnUserSessions() {
+		createSession();
+		ResponseEntity<Map<String, Object>> response = getSessions();
+		assertThat(response).isNotNull();
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		List<Map<String, Object>> sessions = (List<Map<String, Object>>) response.getBody().get("sessions");
+		assertThat(sessions.size()).isEqualTo(1);
+	}
+
+	private void createSession() {
+		URI uri = URI.create("/");
+		HttpHeaders headers = new HttpHeaders();
+		headers.setBasicAuth(USERNAME, PASSWORD);
+		RequestEntity<Object> request = new RequestEntity<>(headers, HttpMethod.GET, uri);
+		this.restTemplate.exchange(request, String.class);
+	}
+
+	@SuppressWarnings("unchecked")
+	private ResponseEntity<Map<String, Object>> getSessions() {
+		return (ResponseEntity<Map<String, Object>>) (ResponseEntity) this.restTemplate
+				.withBasicAuth(USERNAME, PASSWORD).getForEntity("/actuator/sessions?username=" + USERNAME, Map.class);
+	}
+
+}

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

@@ -0,0 +1,18 @@
+plugins {
+    id "java"
+    id "org.springframework.boot.conventions"
+}
+
+description = "Spring Boot Session Mongodb smoke test"
+
+dependencies {
+    implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
+    implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security"))
+    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("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-redis/src/main/java/smoketest/session/redis/SampleSessionRedisApplication.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package smoketest.session.redis;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+
+@SpringBootApplication
+@EnableRedisHttpSession
+public class SampleSessionRedisApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(SampleSessionRedisApplication.class);
+	}
+
+}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/main/resources/application.properties

@@ -0,0 +1,3 @@
+management.endpoints.web.exposure.include=*
+spring.security.user.name=user
+spring.security.user.password=password

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

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package smoketest.session.redis;
+
+import java.net.URI;
+import java.util.List;
+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.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;
+
+/**
+ * Tests for {@link SampleSessionRedisApplication}.
+ *
+ * @author Angel L. Villalain
+ */
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Testcontainers(disabledWithoutDocker = true)
+public class SampleSessionRedisApplicationTests {
+
+	private static final String USERNAME = "user";
+
+	private static final String PASSWORD = "password";
+
+	@Container
+	static RedisContainer redis = new RedisContainer();
+
+	@Autowired
+	private TestRestTemplate restTemplate;
+
+	@DynamicPropertySource
+	static void applicationProperties(DynamicPropertyRegistry registry) {
+		registry.add("spring.redis.host", redis::getHost);
+		registry.add("spring.redis.port", redis::getFirstMappedPort);
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	void sessionsEndpointShouldReturnUserSessions() {
+		createSession();
+		ResponseEntity<Map<String, Object>> response = this.getSessions();
+		assertThat(response).isNotNull();
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		List<Map<String, Object>> sessions = (List<Map<String, Object>>) response.getBody().get("sessions");
+		assertThat(sessions.size()).isEqualTo(1);
+	}
+
+	private void createSession() {
+		URI uri = URI.create("/");
+		HttpHeaders headers = new HttpHeaders();
+		headers.setBasicAuth(USERNAME, PASSWORD);
+		RequestEntity<Object> request = new RequestEntity<>(headers, HttpMethod.GET, uri);
+		this.restTemplate.exchange(request, String.class);
+	}
+
+	@SuppressWarnings("unchecked")
+	private ResponseEntity<Map<String, Object>> getSessions() {
+		return (ResponseEntity<Map<String, Object>>) (ResponseEntity) this.restTemplate
+				.withBasicAuth(USERNAME, PASSWORD).getForEntity("/actuator/sessions?username=" + USERNAME, Map.class);
+	}
+
+}