Remove parameterization of session smoke tests

There are dedicated smoke tests for Hazelcast, MongoDB and Redis
that run on CI.
This commit also polishes some of the other smoke tests related to
Spring Session

Author: mbhave

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/test/java/smoketest/session/hazelcast/SampleSessionHazelcastApplicationTests.java

@@ -26,7 +26,6 @@
 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.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -36,7 +35,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link SampleSessionHazelcastApplication},
+ * Tests for {@link SampleSessionHazelcastApplication}.
  *
  * @author Susmitha Kandula
  * @author Madhura Bhave
@@ -47,28 +46,24 @@ class SampleSessionHazelcastApplicationTests {
 	@Autowired
 	private TestRestTemplate restTemplate;
 
-	@LocalServerPort
-	private int port;
-
 	@Test
 	@SuppressWarnings("unchecked")
 	void sessionsEndpointShouldReturnUserSession() {
-		URI uri = URI.create("http://localhost:" + this.port + "/");
-		ResponseEntity<String> firstResponse = performRequest(this.restTemplate, uri, null);
+		URI uri = URI.create("/");
+		ResponseEntity<String> firstResponse = performRequest(uri, null);
 		String cookie = firstResponse.getHeaders().getFirst("Set-Cookie");
-		performRequest(this.restTemplate, uri, cookie).getBody();
-		ResponseEntity<Map<String, Object>> entity = (ResponseEntity<Map<String, Object>>) (ResponseEntity) this.restTemplate
-				.withBasicAuth("user", "password").getForEntity("/actuator/sessions?username=user", Map.class);
+		performRequest(uri, cookie).getBody();
+		ResponseEntity<Map<String, Object>> entity = getSessions();
 		assertThat(entity).isNotNull();
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		List<Map<String, Object>> sessions = (List<Map<String, Object>>) entity.getBody().get("sessions");
 		assertThat(sessions.size()).isEqualTo(1);
 	}
 
-	private ResponseEntity<String> performRequest(TestRestTemplate restTemplate, URI uri, String cookie) {
+	private ResponseEntity<String> performRequest(URI uri, String cookie) {
 		HttpHeaders headers = getHeaders(cookie);
 		RequestEntity<Object> request = new RequestEntity<>(headers, HttpMethod.GET, uri);
-		return restTemplate.exchange(request, String.class);
+		return this.restTemplate.exchange(request, String.class);
 	}
 
 	private HttpHeaders getHeaders(String cookie) {
@@ -86,4 +81,12 @@ private String getBasicAuth() {
 		return "Basic " + Base64.getEncoder().encodeToString("user:password".getBytes());
 	}
 
+	@SuppressWarnings("unchecked")
+	private ResponseEntity<Map<String, Object>> getSessions() {
+		HttpHeaders headers = getHeaders(null);
+		RequestEntity<Object> request = new RequestEntity<>(headers, HttpMethod.GET,
+				URI.create("/actuator/sessions?username=user"));
+		return (ResponseEntity<Map<String, Object>>) (ResponseEntity) this.restTemplate.exchange(request, Map.class);
+	}
+
 }

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

@@ -0,0 +1,17 @@
+plugins {
+	id "java"
+	id "org.springframework.boot.conventions"
+}
+
+description = "Spring Boot Session JDBC 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-web"))
+	runtimeOnly(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc"))
+	runtimeOnly("org.springframework.session:spring-session-jdbc")
+	runtimeOnly("com.h2database:h2")
+
+	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
+}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/java/smoketest/session/HelloRestController.java renamed to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-jdbc/src/main/java/smoketest/session/HelloRestController.java

@@ -20,10 +20,10 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class SampleSessionApplication {
+public class SampleSessionJdbcApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(SampleSessionApplication.class);
+		SpringApplication.run(SampleSessionJdbcApplication.class);
 	}
 
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/java/smoketest/session/SampleSessionApplication.java renamed to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-jdbc/src/main/java/smoketest/session/SampleSessionJdbcApplication.java

@@ -0,0 +1,105 @@
+/*
+ * 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;
+
+import java.net.URI;
+import java.util.Base64;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+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.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link SampleSessionJdbcApplication}.
+ *
+ * @author Andy Wilkinson
+ * @author Vedran Pavic
+ * @author Madhura Bhave
+ */
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+		properties = "server.servlet.session.timeout:2")
+class SampleSessionJdbcApplicationTests {
+
+	@Autowired
+	private TestRestTemplate restTemplate;
+
+	private static final URI ROOT_URI = URI.create("/");
+
+	@Test
+	void sessionExpiry() throws Exception {
+		ResponseEntity<String> firstResponse = performRequest(ROOT_URI, null);
+		String sessionId1 = firstResponse.getBody();
+		String cookie = firstResponse.getHeaders().getFirst("Set-Cookie");
+		String sessionId2 = performRequest(ROOT_URI, cookie).getBody();
+		assertThat(sessionId1).isEqualTo(sessionId2);
+		Thread.sleep(2100);
+		String loginPage = performRequest(ROOT_URI, cookie).getBody();
+		assertThat(loginPage).containsIgnoringCase("login");
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	void sessionsEndpointShouldReturnUserSession() {
+		performRequest(ROOT_URI, null);
+		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 ResponseEntity<String> performRequest(URI uri, String cookie) {
+		HttpHeaders headers = getHeaders(cookie);
+		RequestEntity<Object> request = new RequestEntity<>(headers, HttpMethod.GET, uri);
+		return this.restTemplate.exchange(request, String.class);
+	}
+
+	private HttpHeaders getHeaders(String cookie) {
+		HttpHeaders headers = new HttpHeaders();
+		if (cookie != null) {
+			headers.set("Cookie", cookie);
+		}
+		else {
+			headers.set("Authorization", getBasicAuth());
+		}
+		return headers;
+	}
+
+	private String getBasicAuth() {
+		return "Basic " + Base64.getEncoder().encodeToString("user:password".getBytes());
+	}
+
+	@SuppressWarnings("unchecked")
+	private ResponseEntity<Map<String, Object>> getSessions() {
+		HttpHeaders headers = getHeaders(null);
+		RequestEntity<Object> request = new RequestEntity<>(headers, HttpMethod.GET,
+				URI.create("/actuator/sessions?username=user"));
+		return (ResponseEntity<Map<String, Object>>) (ResponseEntity) this.restTemplate.exchange(request, Map.class);
+	}
+
+}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/resources/application.properties renamed to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-jdbc/src/main/resources/application.properties

@@ -49,10 +49,6 @@
 @Testcontainers(disabledWithoutDocker = true)
 public class SampleSessionMongoApplicationTests {
 
-	private static final String USERNAME = "user";
-
-	private static final String PASSWORD = "password";
-
 	@Autowired
 	private TestRestTemplate restTemplate;
 
@@ -68,26 +64,29 @@ static void applicationProperties(DynamicPropertyRegistry registry) {
 	@Test
 	@SuppressWarnings("unchecked")
 	void sessionsEndpointShouldReturnUserSessions() {
-		createSession();
+		createSession(URI.create("/"));
 		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);
+	private void createSession(URI uri) {
+		RequestEntity<Object> request = getRequestEntity(uri);
 		this.restTemplate.exchange(request, String.class);
 	}
 
+	private RequestEntity<Object> getRequestEntity(URI uri) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.setBasicAuth("user", "password");
+		return new RequestEntity<>(headers, HttpMethod.GET, uri);
+	}
+
 	@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);
+		RequestEntity<Object> request = getRequestEntity(URI.create("/actuator/sessions?username=user"));
+		return (ResponseEntity<Map<String, Object>>) (ResponseEntity) this.restTemplate.exchange(request, Map.class);
 	}
 
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-jdbc/src/test/java/smoketest/session/SampleSessionJdbcApplicationTests.java

@@ -47,10 +47,6 @@
 @Testcontainers(disabledWithoutDocker = true)
 public class SampleSessionRedisApplicationTests {
 
-	private static final String USERNAME = "user";
-
-	private static final String PASSWORD = "password";
-
 	@Container
 	static RedisContainer redis = new RedisContainer();
 
@@ -66,26 +62,29 @@ static void applicationProperties(DynamicPropertyRegistry registry) {
 	@Test
 	@SuppressWarnings("unchecked")
 	void sessionsEndpointShouldReturnUserSessions() {
-		createSession();
+		createSession(URI.create("/"));
 		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);
+	private void createSession(URI uri) {
+		RequestEntity<Object> request = getRequestEntity(uri);
 		this.restTemplate.exchange(request, String.class);
 	}
 
+	private RequestEntity<Object> getRequestEntity(URI uri) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.setBasicAuth("user", "password");
+		return new RequestEntity<>(headers, HttpMethod.GET, uri);
+	}
+
 	@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);
+		RequestEntity<Object> request = getRequestEntity(URI.create("/actuator/sessions?username=user"));
+		return (ResponseEntity<Map<String, Object>>) (ResponseEntity) this.restTemplate.exchange(request, Map.class);
 	}
 
 }