Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Suppress deprecation warnings in tests

Browse Source
This commit is contained in:
Sam Brannen
2022-03-29 15:04:58 +02:00
parent c8d0146bcc
commit 7a1421cb0f
12 changed files with 217 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 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.
@@ -45,19 +45,19 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Arjen Poutsma
*/
public class DefaultEntityResponseBuilderTests {
class DefaultEntityResponseBuilderTests {
static final ServerResponse.Context EMPTY_CONTEXT = () -> Collections.emptyList();
@Test
public void fromObject() {
void fromObject() {
String body = "foo";
EntityResponse<String> response = EntityResponse.fromObject(body).build();
assertThat(response.entity()).isSameAs(body);
}
@Test
public void fromObjectTypeReference() {
void fromObjectTypeReference() {
String body = "foo";
EntityResponse<String> response = EntityResponse.fromObject(body,
new ParameterizedTypeReference<String>() {})
@@ -67,7 +67,8 @@ public class DefaultEntityResponseBuilderTests {
}
@Test
public void status() {
@SuppressWarnings("deprecation")
void status() {
String body = "foo";
EntityResponse<String> result =
EntityResponse.fromObject(body).status(HttpStatus.CREATED).build();
@@ -77,7 +78,7 @@ public class DefaultEntityResponseBuilderTests {
}
@Test
public void allow() {
void allow() {
String body = "foo";
EntityResponse<String> result =
EntityResponse.fromObject(body).allow(HttpMethod.GET).build();
@@ -86,14 +87,14 @@ public class DefaultEntityResponseBuilderTests {
}
@Test
public void contentLength() {
void contentLength() {
String body = "foo";
EntityResponse<String> result = EntityResponse.fromObject(body).contentLength(42).build();
assertThat(result.headers().getContentLength()).isEqualTo(42);
}
@Test
public void contentType() {
void contentType() {
String body = "foo";
EntityResponse<String>
result =
@@ -103,7 +104,7 @@ public class DefaultEntityResponseBuilderTests {
}
@Test
public void etag() {
void etag() {
String body = "foo";
EntityResponse<String> result = EntityResponse.fromObject(body).eTag("foo").build();
@@ -111,7 +112,7 @@ public class DefaultEntityResponseBuilderTests {
}
@Test
public void lastModified() {
void lastModified() {
ZonedDateTime now = ZonedDateTime.now();
String body = "foo";
EntityResponse<String> result = EntityResponse.fromObject(body).lastModified(now).build();
@@ -120,7 +121,7 @@ public class DefaultEntityResponseBuilderTests {
}
@Test
public void cacheControlTag() {
void cacheControlTag() {
String body = "foo";
EntityResponse<String> result =
EntityResponse.fromObject(body).cacheControl(CacheControl.noCache()).build();
@@ -128,7 +129,7 @@ public class DefaultEntityResponseBuilderTests {
}
@Test
public void varyBy() {
void varyBy() {
String body = "foo";
EntityResponse<String> result = EntityResponse.fromObject(body).varyBy("foo").build();
List<String> expected = Collections.singletonList("foo");
@@ -136,14 +137,14 @@ public class DefaultEntityResponseBuilderTests {
}
@Test
public void header() {
void header() {
String body = "foo";
EntityResponse<String> result = EntityResponse.fromObject(body).header("foo", "bar").build();
assertThat(result.headers().getFirst("foo")).isEqualTo("bar");
}
@Test
public void headers() {
void headers() {
String body = "foo";
HttpHeaders headers = new HttpHeaders();
headers.set("foo", "bar");
@@ -154,7 +155,7 @@ public class DefaultEntityResponseBuilderTests {
}
@Test
public void cookie() {
void cookie() {
Cookie cookie = new Cookie("name", "value");
EntityResponse<String> result =
EntityResponse.fromObject("foo").cookie(cookie)
@@ -163,7 +164,7 @@ public class DefaultEntityResponseBuilderTests {
}
@Test
public void cookies() {
void cookies() {
MultiValueMap<String, Cookie> newCookies = new LinkedMultiValueMap<>();
newCookies.add("name", new Cookie("name", "value"));
EntityResponse<String> result =
@@ -173,7 +174,7 @@ public class DefaultEntityResponseBuilderTests {
}
@Test
public void notModifiedEtag() throws Exception {
void notModifiedEtag() throws Exception {
String etag = "\"foo\"";
EntityResponse<String> entityResponse = EntityResponse.fromObject("bar")
.eTag(etag)
@@ -192,7 +193,7 @@ public class DefaultEntityResponseBuilderTests {
@Test
public void notModifiedLastModified() throws ServletException, IOException {
void notModifiedLastModified() throws ServletException, IOException {
ZonedDateTime now = ZonedDateTime.now();
ZonedDateTime oneMinuteBeforeNow = now.minus(1, ChronoUnit.MINUTES);

65
spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 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.
@@ -51,19 +51,20 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Arjen Poutsma
*/
public class DefaultServerResponseBuilderTests {
class DefaultServerResponseBuilderTests {
static final ServerResponse.Context EMPTY_CONTEXT = () -> Collections.emptyList();
@Test
public void status() {
@SuppressWarnings("deprecation")
void status() {
ServerResponse response = ServerResponse.status(HttpStatus.CREATED).build();
assertThat(response.statusCode()).isEqualTo(HttpStatus.CREATED);
assertThat(response.rawStatusCode()).isEqualTo(201);
}
@Test
public void from() {
void from() {
Cookie cookie = new Cookie("foo", "bar");
ServerResponse other = ServerResponse.ok()
.header("foo", "bar")
@@ -77,14 +78,14 @@ public class DefaultServerResponseBuilderTests {
@Test
public void ok() {
void ok() {
ServerResponse response = ServerResponse.ok().build();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
}
@Test
public void created() {
void created() {
URI location = URI.create("https://example.com");
ServerResponse response = ServerResponse.created(location).build();
assertThat(response.statusCode()).isEqualTo(HttpStatus.CREATED);
@@ -92,19 +93,19 @@ public class DefaultServerResponseBuilderTests {
}
@Test
public void accepted() {
void accepted() {
ServerResponse response = ServerResponse.accepted().build();
assertThat(response.statusCode()).isEqualTo(HttpStatus.ACCEPTED);
}
@Test
public void noContent() {
void noContent() {
ServerResponse response = ServerResponse.noContent().build();
assertThat(response.statusCode()).isEqualTo(HttpStatus.NO_CONTENT);
}
@Test
public void seeOther() {
void seeOther() {
URI location = URI.create("https://example.com");
ServerResponse response = ServerResponse.seeOther(location).build();
assertThat(response.statusCode()).isEqualTo(HttpStatus.SEE_OTHER);
@@ -112,7 +113,7 @@ public class DefaultServerResponseBuilderTests {
}
@Test
public void temporaryRedirect() {
void temporaryRedirect() {
URI location = URI.create("https://example.com");
ServerResponse response = ServerResponse.temporaryRedirect(location).build();
assertThat(response.statusCode()).isEqualTo(HttpStatus.TEMPORARY_REDIRECT);
@@ -120,7 +121,7 @@ public class DefaultServerResponseBuilderTests {
}
@Test
public void permanentRedirect() {
void permanentRedirect() {
URI location = URI.create("https://example.com");
ServerResponse response = ServerResponse.permanentRedirect(location).build();
assertThat(response.statusCode()).isEqualTo(HttpStatus.PERMANENT_REDIRECT);
@@ -128,49 +129,49 @@ public class DefaultServerResponseBuilderTests {
}
@Test
public void badRequest() {
void badRequest() {
ServerResponse response = ServerResponse.badRequest().build();
assertThat(response.statusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
}
@Test
public void notFound() {
void notFound() {
ServerResponse response = ServerResponse.notFound().build();
assertThat(response.statusCode()).isEqualTo(HttpStatus.NOT_FOUND);
}
@Test
public void unprocessableEntity() {
void unprocessableEntity() {
ServerResponse response = ServerResponse.unprocessableEntity().build();
assertThat(response.statusCode()).isEqualTo(HttpStatus.UNPROCESSABLE_ENTITY);
}
@Test
public void allow() {
void allow() {
ServerResponse response = ServerResponse.ok().allow(HttpMethod.GET).build();
assertThat(response.headers().getAllow()).isEqualTo(Set.of(HttpMethod.GET));
}
@Test
public void contentLength() {
void contentLength() {
ServerResponse response = ServerResponse.ok().contentLength(42).build();
assertThat(response.headers().getContentLength()).isEqualTo(42L);
}
@Test
public void contentType() {
void contentType() {
ServerResponse response = ServerResponse.ok().contentType(MediaType.APPLICATION_JSON).build();
assertThat(response.headers().getContentType()).isEqualTo(MediaType.APPLICATION_JSON);
}
@Test
public void eTag() {
void eTag() {
ServerResponse response = ServerResponse.ok().eTag("foo").build();
assertThat(response.headers().getETag()).isEqualTo("\"foo\"");
}
@Test
public void lastModified() {
void lastModified() {
ZonedDateTime now = ZonedDateTime.now();
ServerResponse response = ServerResponse.ok().lastModified(now).build();
long expected = now.toInstant().toEpochMilli() / 1000;
@@ -178,28 +179,27 @@ public class DefaultServerResponseBuilderTests {
}
@Test
public void cacheControlTag() {
void cacheControlTag() {
ServerResponse response = ServerResponse.ok().cacheControl(CacheControl.noCache()).build();
assertThat(response.headers().getCacheControl()).isEqualTo("no-cache");
}
@Test
public void varyBy() {
void varyBy() {
ServerResponse response = ServerResponse.ok().varyBy("foo").build();
List<String> expected = Collections.singletonList("foo");
assertThat(response.headers().getVary()).isEqualTo(expected);
}
@Test
public void statusCode() {
void statusCode() {
HttpStatus statusCode = HttpStatus.ACCEPTED;
ServerResponse response = ServerResponse.status(statusCode).build();
assertThat(response.statusCode()).isEqualTo(statusCode);
}
@Test
public void headers() {
void headers() {
HttpHeaders newHeaders = new HttpHeaders();
newHeaders.set("foo", "bar");
ServerResponse response = ServerResponse.ok()
@@ -209,7 +209,7 @@ public class DefaultServerResponseBuilderTests {
}
@Test
public void cookies() {
void cookies() {
MultiValueMap<String, Cookie> newCookies = new LinkedMultiValueMap<>();
newCookies.add("name", new Cookie("name", "value"));
ServerResponse response = ServerResponse.ok()
@@ -219,7 +219,7 @@ public class DefaultServerResponseBuilderTests {
}
@Test
public void build() throws Exception {
void build() throws Exception {
Cookie cookie = new Cookie("name", "value");
ServerResponse response = ServerResponse.status(HttpStatus.CREATED)
.header("MyKey", "MyValue")
@@ -238,7 +238,7 @@ public class DefaultServerResponseBuilderTests {
}
@Test
public void notModifiedEtag() throws Exception {
void notModifiedEtag() throws Exception {
String etag = "\"foo\"";
ServerResponse response = ServerResponse.ok()
.eTag(etag)
@@ -255,7 +255,7 @@ public class DefaultServerResponseBuilderTests {
}
@Test
public void notModifiedLastModified() throws Exception {
void notModifiedLastModified() throws Exception {
ZonedDateTime now = ZonedDateTime.now();
ZonedDateTime oneMinuteBeforeNow = now.minus(1, ChronoUnit.MINUTES);
@@ -274,7 +274,7 @@ public class DefaultServerResponseBuilderTests {
}
@Test
public void body() throws Exception {
void body() throws Exception {
String body = "foo";
ServerResponse response = ServerResponse.ok().body(body);
@@ -289,7 +289,7 @@ public class DefaultServerResponseBuilderTests {
}
@Test
public void bodyWithParameterizedTypeReference() throws Exception {
void bodyWithParameterizedTypeReference() throws Exception {
List<String> body = new ArrayList<>();
body.add("foo");
body.add("bar");
@@ -306,7 +306,7 @@ public class DefaultServerResponseBuilderTests {
}
@Test
public void bodyCompletionStage() throws Exception {
void bodyCompletionStage() throws Exception {
String body = "foo";
CompletionStage<String> completionStage = CompletableFuture.completedFuture(body);
ServerResponse response = ServerResponse.ok().body(completionStage);
@@ -320,12 +320,11 @@ public class DefaultServerResponseBuilderTests {
ModelAndView mav = response.writeTo(mockRequest, mockResponse, context);
assertThat(mav).isNull();
assertThat(mockResponse.getContentAsString()).isEqualTo(body);
}
@Test
public void bodyPublisher() throws Exception {
void bodyPublisher() throws Exception {
String body = "foo";
Publisher<String> publisher = Mono.just(body);
ServerResponse response = ServerResponse.ok().body(publisher);