Skip to content

Commit 0395fb4

Browse files
committed
Polish tests
1 parent 1688bec commit 0395fb4

File tree

2 files changed

+84
-86
lines changed

2 files changed

+84
-86
lines changed

spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void getResource() throws Exception {
111111
assertThat(headers.containsKey("Last-Modified")).isTrue();
112112
assertThat(resourceLastModifiedDate("test/foo.css") / 1000).isEqualTo(headers.getLastModified() / 1000);
113113
assertThat(headers.getFirst("Accept-Ranges")).isEqualTo("bytes");
114-
assertThat(headers.get("Accept-Ranges").size()).isEqualTo(1);
114+
assertThat(headers.get("Accept-Ranges")).hasSize(1);
115115
assertResponseBody(exchange, "h1 { color:red; }");
116116
}
117117

@@ -157,14 +157,14 @@ void getResourceNoCache() throws Exception {
157157
assertThat(response.getHeaders().containsKey("Last-Modified")).isTrue();
158158
assertThat(resourceLastModifiedDate("test/foo.css") / 1000).isEqualTo(response.getHeaders().getLastModified() / 1000);
159159
assertThat(response.getHeaders().getFirst("Accept-Ranges")).isEqualTo("bytes");
160-
assertThat(response.getHeaders().get("Accept-Ranges").size()).isEqualTo(1);
160+
assertThat(response.getHeaders().get("Accept-Ranges")).hasSize(1);
161161
}
162162

163163
@Test
164164
void getVersionedResource() throws Exception {
165165
VersionResourceResolver versionResolver = new VersionResourceResolver();
166166
versionResolver.addFixedVersionStrategy("versionString", "/**");
167-
this.handler.setResourceResolvers(Arrays.asList(versionResolver, new PathResourceResolver()));
167+
this.handler.setResourceResolvers(List.of(versionResolver, new PathResourceResolver()));
168168
this.handler.afterPropertiesSet();
169169

170170
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get(""));
@@ -173,7 +173,7 @@ void getVersionedResource() throws Exception {
173173

174174
assertThat(exchange.getResponse().getHeaders().getETag()).isEqualTo("W/\"versionString\"");
175175
assertThat(exchange.getResponse().getHeaders().getFirst("Accept-Ranges")).isEqualTo("bytes");
176-
assertThat(exchange.getResponse().getHeaders().get("Accept-Ranges").size()).isEqualTo(1);
176+
assertThat(exchange.getResponse().getHeaders().get("Accept-Ranges")).hasSize(1);
177177
}
178178

179179
@Test
@@ -188,7 +188,7 @@ void getResourceWithHtmlMediaType() throws Exception {
188188
assertThat(headers.containsKey("Last-Modified")).isTrue();
189189
assertThat(resourceLastModifiedDate("test/foo.html") / 1000).isEqualTo(headers.getLastModified() / 1000);
190190
assertThat(headers.getFirst("Accept-Ranges")).isEqualTo("bytes");
191-
assertThat(headers.get("Accept-Ranges").size()).isEqualTo(1);
191+
assertThat(headers.get("Accept-Ranges")).hasSize(1);
192192
}
193193

194194
@Test
@@ -204,7 +204,7 @@ void getResourceFromAlternatePath() throws Exception {
204204
assertThat(headers.containsKey("Last-Modified")).isTrue();
205205
assertThat(resourceLastModifiedDate("testalternatepath/baz.css") / 1000).isEqualTo(headers.getLastModified() / 1000);
206206
assertThat(headers.getFirst("Accept-Ranges")).isEqualTo("bytes");
207-
assertThat(headers.get("Accept-Ranges").size()).isEqualTo(1);
207+
assertThat(headers.get("Accept-Ranges")).hasSize(1);
208208
assertResponseBody(exchange, "h1 { color:red; }");
209209
}
210210

@@ -268,7 +268,7 @@ void getResourceFromFileSystem() throws Exception {
268268

269269
@Test // gh-27538, gh-27624
270270
void filterNonExistingLocations() throws Exception {
271-
List<Resource> inputLocations = Arrays.asList(
271+
List<Resource> inputLocations = List.of(
272272
new ClassPathResource("test/", getClass()),
273273
new ClassPathResource("testalternatepath/", getClass()),
274274
new ClassPathResource("nosuchpath/", getClass()));
@@ -437,7 +437,7 @@ void initAllowedLocationsWithExplicitConfiguration() throws Exception {
437437

438438
ResourceWebHandler handler = new ResourceWebHandler();
439439
handler.setResourceResolvers(List.of(pathResolver));
440-
handler.setLocations(Arrays.asList(location1, location2));
440+
handler.setLocations(List.of(location1, location2));
441441
handler.afterPropertiesSet();
442442

443443
assertThat(pathResolver.getAllowedLocations()).containsExactly(location1);
@@ -545,7 +545,7 @@ void partialContentByteRange() {
545545
assertThat(exchange.getResponse().getHeaders().getContentLength()).isEqualTo(2);
546546
assertThat(exchange.getResponse().getHeaders().getFirst("Content-Range")).isEqualTo("bytes 0-1/10");
547547
assertThat(exchange.getResponse().getHeaders().getFirst("Accept-Ranges")).isEqualTo("bytes");
548-
assertThat(exchange.getResponse().getHeaders().get("Accept-Ranges").size()).isEqualTo(1);
548+
assertThat(exchange.getResponse().getHeaders().get("Accept-Ranges")).hasSize(1);
549549
assertResponseBody(exchange, "So");
550550
}
551551

@@ -561,7 +561,7 @@ void partialContentByteRangeNoEnd() {
561561
assertThat(exchange.getResponse().getHeaders().getContentLength()).isEqualTo(1);
562562
assertThat(exchange.getResponse().getHeaders().getFirst("Content-Range")).isEqualTo("bytes 9-9/10");
563563
assertThat(exchange.getResponse().getHeaders().getFirst("Accept-Ranges")).isEqualTo("bytes");
564-
assertThat(exchange.getResponse().getHeaders().get("Accept-Ranges").size()).isEqualTo(1);
564+
assertThat(exchange.getResponse().getHeaders().get("Accept-Ranges")).hasSize(1);
565565
assertResponseBody(exchange, ".");
566566
}
567567

@@ -577,7 +577,7 @@ void partialContentByteRangeLargeEnd() {
577577
assertThat(exchange.getResponse().getHeaders().getContentLength()).isEqualTo(1);
578578
assertThat(exchange.getResponse().getHeaders().getFirst("Content-Range")).isEqualTo("bytes 9-9/10");
579579
assertThat(exchange.getResponse().getHeaders().getFirst("Accept-Ranges")).isEqualTo("bytes");
580-
assertThat(exchange.getResponse().getHeaders().get("Accept-Ranges").size()).isEqualTo(1);
580+
assertThat(exchange.getResponse().getHeaders().get("Accept-Ranges")).hasSize(1);
581581
assertResponseBody(exchange, ".");
582582
}
583583

@@ -593,7 +593,7 @@ void partialContentSuffixRange() {
593593
assertThat(exchange.getResponse().getHeaders().getContentLength()).isEqualTo(1);
594594
assertThat(exchange.getResponse().getHeaders().getFirst("Content-Range")).isEqualTo("bytes 9-9/10");
595595
assertThat(exchange.getResponse().getHeaders().getFirst("Accept-Ranges")).isEqualTo("bytes");
596-
assertThat(exchange.getResponse().getHeaders().get("Accept-Ranges").size()).isEqualTo(1);
596+
assertThat(exchange.getResponse().getHeaders().get("Accept-Ranges")).hasSize(1);
597597
assertResponseBody(exchange, ".");
598598
}
599599

@@ -609,7 +609,7 @@ void partialContentSuffixRangeLargeSuffix() {
609609
assertThat(exchange.getResponse().getHeaders().getContentLength()).isEqualTo(10);
610610
assertThat(exchange.getResponse().getHeaders().getFirst("Content-Range")).isEqualTo("bytes 0-9/10");
611611
assertThat(exchange.getResponse().getHeaders().getFirst("Accept-Ranges")).isEqualTo("bytes");
612-
assertThat(exchange.getResponse().getHeaders().get("Accept-Ranges").size()).isEqualTo(1);
612+
assertThat(exchange.getResponse().getHeaders().get("Accept-Ranges")).hasSize(1);
613613
assertResponseBody(exchange, "Some text.");
614614
}
615615

0 commit comments

Comments
 (0)