diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/java/smoketest/session/hazelcast/SampleSessionHazelcastApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/java/smoketest/session/hazelcast/SampleSessionHazelcastApplication.java index 8c0b9ef2fe..ea904d2a9d 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/java/smoketest/session/hazelcast/SampleSessionHazelcastApplication.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/java/smoketest/session/hazelcast/SampleSessionHazelcastApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * 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. diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/resources/hazelcast.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/resources/hazelcast.xml index 4fbcdb0b59..4abe5ce1cb 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/resources/hazelcast.xml +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/resources/hazelcast.xml @@ -1,21 +1,18 @@ - - 600 - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.hazelcast.com/schema/config + http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd"> - true - true - + + + principalName + + - + diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/test/java/smoketest/session/hazelcast/SampleSessionHazelcastApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/test/java/smoketest/session/hazelcast/SampleSessionHazelcastApplicationTests.java index a607dc35d3..769a082253 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/test/java/smoketest/session/hazelcast/SampleSessionHazelcastApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/test/java/smoketest/session/hazelcast/SampleSessionHazelcastApplicationTests.java @@ -1,20 +1,45 @@ +/* + * 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.hazelcast; +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.boot.web.server.LocalServerPort; +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; -import java.util.Map; - - /** * Tests for {@link SampleSessionHazelcastApplication}, + * * @author Susmitha Kandula + * @author Madhura Bhave */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class SampleSessionHazelcastApplicationTests { @@ -22,13 +47,43 @@ public class SampleSessionHazelcastApplicationTests { @Autowired private TestRestTemplate restTemplate; + @LocalServerPort + private int port; + @Test - public void test_sessionsEndPoint() { - ResponseEntity> entity = (ResponseEntity>) (ResponseEntity) this.restTemplate.withBasicAuth("user", "password") - .getForEntity("/actuator/sessions?username=user", Map.class); + @SuppressWarnings("unchecked") + public void sessionsEndpointShouldReturnUserSession() { + URI uri = URI.create("http://localhost:" + this.port + "/"); + ResponseEntity firstResponse = performRequest(this.restTemplate, uri, null); + String cookie = firstResponse.getHeaders().getFirst("Set-Cookie"); + performRequest(this.restTemplate, uri, cookie).getBody(); + ResponseEntity> entity = (ResponseEntity>) (ResponseEntity) this.restTemplate + .withBasicAuth("user", "password").getForEntity("/actuator/sessions?username=user", Map.class); assertThat(entity).isNotNull(); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(entity.getBody().get("sessions")).isNotNull(); + List> sessions = (List>) entity.getBody().get("sessions"); + assertThat(sessions.size()).isEqualTo(1); + } + + private ResponseEntity performRequest(TestRestTemplate restTemplate, URI uri, String cookie) { + HttpHeaders headers = getHeaders(cookie); + RequestEntity request = new RequestEntity<>(headers, HttpMethod.GET, uri); + return 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()); } }