[JAVA-33568] Fix spring-security-web-boot-3 integration tests (#16441)

This commit is contained in:
Harry9656 2024-04-19 08:22:40 +02:00 committed by GitHub
parent 9c4a0b79d5
commit d2e7eab43e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 20 deletions

View File

@ -1,43 +1,41 @@
package com.baeldung.cachecontrol; package com.baeldung.cachecontrol;
import io.restassured.http.ContentType;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.test.context.junit4.SpringRunner;
import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.given;
@RunWith(SpringRunner.class) import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.server.LocalServerPort;
import io.restassured.http.ContentType;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AppRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AppRunner.class)
public class ResourceEndpointIntegrationTest { class ResourceEndpointIntegrationTest {
@LocalServerPort @LocalServerPort
private int serverPort; private int serverPort;
@Test @Test
public void whenGetRequestForUser_shouldRespondWithDefaultCacheHeaders() { void whenGetRequestForUser_shouldRespondWithDefaultCacheHeaders() {
given().when().get(getBaseUrl() + "/default/users/Michael").then().headers("Cache-Control", "no-cache, no-store, max-age=0, must-revalidate").header("Pragma", "no-cache"); given().when().get(getBaseUrl() + "/default/users/Michael").then().headers("Cache-Control", "no-cache, no-store, max-age=0, must-revalidate").header("Pragma", "no-cache");
} }
@Test @Test
public void whenGetRequestForUser_shouldRespondMaxAgeCacheControl() { void whenGetRequestForUser_shouldRespondMaxAgeCacheControl() {
given().when().get(getBaseUrl() + "/users/Michael").then().header("Cache-Control", "max-age=60"); given().when().get(getBaseUrl() + "/users/Michael").then().header("Cache-Control", "max-age=60");
} }
@Test @Test
public void givenServiceEndpoint_whenGetRequestForUser_shouldResponseWithCacheControlMaxAge() { void givenServiceEndpoint_whenGetRequestForUser_shouldResponseWithCacheControlMaxAge() {
given().when().get(getBaseUrl() + "/users/Michael").then().contentType(ContentType.JSON).and().statusCode(200).and().header("Cache-Control", "max-age=60"); given().when().get(getBaseUrl() + "/users/Michael").then().contentType(ContentType.JSON).and().statusCode(200).and().header("Cache-Control", "max-age=60");
} }
@Test @Test
public void givenServiceEndpoint_whenGetRequestForNotCacheableContent_shouldResponseWithCacheControlNoCache() { void givenServiceEndpoint_whenGetRequestForNotCacheableContent_shouldResponseWithCacheControlNoCache() {
given().when().get(getBaseUrl() + "/timestamp").then().contentType(ContentType.JSON).and().statusCode(200).and().header("Cache-Control", "no-store"); given().when().get(getBaseUrl() + "/timestamp").then().contentType(ContentType.JSON).and().statusCode(200).and().header("Cache-Control", "no-store");
} }
@Test @Test
public void givenServiceEndpoint_whenGetRequestForPrivateUser_shouldResponseWithSecurityDefaultCacheControl() { void givenServiceEndpoint_whenGetRequestForPrivateUser_shouldResponseWithSecurityDefaultCacheControl() {
given().when().get(getBaseUrl() + "/private/users/Michael").then().contentType(ContentType.JSON).and().statusCode(200).and().header("Cache-Control", "no-cache, no-store, max-age=0, must-revalidate"); given().when().get(getBaseUrl() + "/private/users/Michael").then().contentType(ContentType.JSON).and().statusCode(200).and().header("Cache-Control", "no-cache, no-store, max-age=0, must-revalidate");
} }

View File

@ -1,15 +1,12 @@
package com.baeldung.cachecontrol; package com.baeldung.cachecontrol;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = AppRunner.class) @SpringBootTest(classes = AppRunner.class)
public class SpringContextTest { class SpringContextTest {
@Test @Test
public void whenSpringContextIsBootstrapped_thenNoExceptions() { void whenSpringContextIsBootstrapped_thenNoExceptions() {
} }
} }