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

Use AssertJ's hasSize() for collections and maps

Browse Source 
Achieved via a global search-and-replace.
This commit is contained in:
Sam Brannen
2022-11-22 16:50:10 +01:00
parent f9f8f2d89e
commit 36f7597f25
237 changed files with 1161 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
View File

@@ -588,7 +588,7 @@ public class HttpHeadersTests {
// isEmpty() and size()
assertThat(keySet.isEmpty()).isFalse();
assertThat(keySet.size()).isEqualTo(2);
assertThat(keySet).hasSize(2);
// contains()
assertThat(keySet.contains("Alpha")).as("Alpha should be present").isTrue();
@@ -610,18 +610,18 @@ public class HttpHeadersTests {
// remove()
assertThat(keySet.remove("Alpha")).isTrue();
assertThat(keySet.size()).isEqualTo(1);
assertThat(headers.size()).isEqualTo(1);
assertThat(keySet).hasSize(1);
assertThat(headers).hasSize(1);
assertThat(keySet.remove("Alpha")).isFalse();
assertThat(keySet.size()).isEqualTo(1);
assertThat(headers.size()).isEqualTo(1);
assertThat(keySet).hasSize(1);
assertThat(headers).hasSize(1);
// clear()
keySet.clear();
assertThat(keySet.isEmpty()).isTrue();
assertThat(keySet.size()).isEqualTo(0);
assertThat(keySet).hasSize(0);
assertThat(headers.isEmpty()).isTrue();
assertThat(headers.size()).isEqualTo(0);
assertThat(headers).hasSize(0);
// Unsupported operations
assertThatExceptionOfType(UnsupportedOperationException.class)
@@ -653,7 +653,7 @@ public class HttpHeadersTests {
assertThat(removed).isTrue();
assertThat(headers.keySet().remove("Alpha")).isFalse();
assertThat(headers.size()).isEqualTo(1);
assertThat(headers).hasSize(1);
assertThat(headers.containsKey("Alpha")).as("Alpha should have been removed").isFalse();
assertThat(headers.containsKey("Bravo")).as("Bravo should be present").isTrue();
assertThat(headers.keySet()).containsOnly("Bravo");

6
spring-web/src/test/java/org/springframework/http/HttpRangeTests.java
View File

@@ -96,7 +96,7 @@ public class HttpRangeTests {
@Test
public void parseRanges() {
List<HttpRange> ranges = HttpRange.parseRanges("bytes=0-0,500-,-1");
assertThat(ranges.size()).isEqualTo(3);
assertThat(ranges).hasSize(3);
assertThat(ranges.get(0).getRangeStart(1000)).isEqualTo(0);
assertThat(ranges.get(0).getRangeEnd(1000)).isEqualTo(0);
assertThat(ranges.get(1).getRangeStart(1000)).isEqualTo(500);
@@ -114,7 +114,7 @@ public class HttpRangeTests {
atLimit.append(',').append(i).append('-').append(i + 1);
}
List<HttpRange> ranges = HttpRange.parseRanges(atLimit.toString());
assertThat(ranges.size()).isEqualTo(100);
assertThat(ranges).hasSize(100);
// 2. Above limit..
StringBuilder aboveLimit = new StringBuilder("bytes=0-0");
@@ -185,7 +185,7 @@ public class HttpRangeTests {
// 1. Below length
List<HttpRange> belowLengthRanges = HttpRange.parseRanges("bytes=0-1,2-3");
List<ResourceRegion> regions = HttpRange.toResourceRegions(belowLengthRanges, resource);
assertThat(regions.size()).isEqualTo(2);
assertThat(regions).hasSize(2);
// 2. At length
List<HttpRange> atLengthRanges = HttpRange.parseRanges("bytes=0-1,2-4");

6
spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java
View File

@@ -47,7 +47,7 @@ class ResponseEntityTests {
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
assertThat(responseEntity.getHeaders().containsKey(headerName)).isTrue();
List<String> list = responseEntity.getHeaders().get(headerName);
assertThat(list.size()).isEqualTo(2);
assertThat(list).hasSize(2);
assertThat(list.get(0)).isEqualTo(headerValue1);
assertThat(list.get(1)).isEqualTo(headerValue2);
assertThat((int) responseEntity.getBody()).isEqualTo((int) entity);
@@ -221,8 +221,8 @@ class ResponseEntityTests {
HttpHeaders responseHeaders = responseEntity.getHeaders();
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
assertThat(responseHeaders.size()).isEqualTo(1);
assertThat(responseHeaders.get("X-CustomHeader").size()).isEqualTo(1);
assertThat(responseHeaders).hasSize(1);
assertThat(responseHeaders.get("X-CustomHeader")).hasSize(1);
assertThat(responseHeaders.getFirst("X-CustomHeader")).isEqualTo("vale");
}

2
spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
View File

@@ -103,7 +103,7 @@ class InterceptingClientHttpRequestFactoryTests {
@Override
protected ClientHttpResponse executeInternal() throws IOException {
List<String> headerValues = getHeaders().get(headerName);
assertThat(headerValues.size()).isEqualTo(2);
assertThat(headerValues).hasSize(2);
assertThat(headerValues.get(0)).isEqualTo(headerValue);
assertThat(headerValues.get(1)).isEqualTo(otherValue);
return responseMock;

2
spring-web/src/test/java/org/springframework/http/client/MultipartBodyBuilderTests.java
View File

@@ -60,7 +60,7 @@ public class MultipartBodyBuilderTests {
MultiValueMap<String, HttpEntity<?>> result = builder.build();
assertThat(result.size()).isEqualTo(5);
assertThat(result).hasSize(5);
HttpEntity<?> resultEntity = result.getFirst("key");
assertThat(resultEntity).isNotNull();
assertThat(resultEntity.getBody()).isEqualTo(multipartData);

10
spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java
View File

@@ -127,7 +127,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests {
.block(Duration.ofSeconds(5));
MultiValueMap<String, Part> requestParts = parse(this.response, hints);
assertThat(requestParts.size()).isEqualTo(7);
assertThat(requestParts).hasSize(7);
Part part = requestParts.getFirst("name 1");
assertThat(part instanceof FormFieldPart).isTrue();
@@ -135,7 +135,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests {
assertThat(((FormFieldPart) part).value()).isEqualTo("value 1");
List<Part> parts2 = requestParts.get("name 2");
assertThat(parts2.size()).isEqualTo(2);
assertThat(parts2).hasSize(2);
part = parts2.get(0);
assertThat(part instanceof FormFieldPart).isTrue();
assertThat(part.name()).isEqualTo("name 2");
@@ -202,7 +202,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests {
assertThat(contentType.getParameter("charset")).isNull();
MultiValueMap<String, Part> requestParts = parse(this.response, hints);
assertThat(requestParts.size()).isEqualTo(2);
assertThat(requestParts).hasSize(2);
assertThat(requestParts.getFirst("name 1").name()).isEqualTo("name 1");
assertThat(requestParts.getFirst("name 2").name()).isEqualTo("name 2");
}
@@ -229,7 +229,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests {
this.writer.write(result, null, MediaType.MULTIPART_FORM_DATA, this.response, hints).block();
MultiValueMap<String, Part> requestParts = parse(this.response, hints);
assertThat(requestParts.size()).isEqualTo(1);
assertThat(requestParts).hasSize(1);
Part part = requestParts.getFirst("logo");
assertThat(part.name()).isEqualTo("logo");
@@ -281,7 +281,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests {
this.response, hints).block();
MultiValueMap<String, Part> requestParts = parse(this.response, hints);
assertThat(requestParts.size()).isEqualTo(2);
assertThat(requestParts).hasSize(2);
Part part = requestParts.getFirst("resource");
assertThat(part instanceof FilePart).isTrue();

2
spring-web/src/test/java/org/springframework/http/codec/multipart/PartEventHttpMessageWriterTests.java
View File

@@ -79,7 +79,7 @@ public class PartEventHttpMessageWriterTests extends AbstractLeakCheckingTests {
.block(Duration.ofSeconds(5));
MultiValueMap<String, Part> requestParts = parse(this.response, hints);
assertThat(requestParts.size()).isEqualTo(2);
assertThat(requestParts).hasSize(2);
Part part = requestParts.getFirst("text part");
assertThat(part.name()).isEqualTo("text part");

2
spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java
View File

@@ -96,7 +96,7 @@ public class PartHttpMessageWriterTests extends AbstractLeakCheckingTests {
.block(Duration.ofSeconds(5));
MultiValueMap<String, Part> requestParts = parse(this.response, hints);
assertThat(requestParts.size()).isEqualTo(2);
assertThat(requestParts).hasSize(2);
Part part = requestParts.getFirst("text part");
assertThat(part.name()).isEqualTo("text part");

6
spring-web/src/test/java/org/springframework/http/codec/support/ClientCodecConfigurerTests.java
View File

@@ -92,7 +92,7 @@ public class ClientCodecConfigurerTests {
@Test
public void defaultReaders() {
List<HttpMessageReader<?>> readers = this.configurer.getReaders();
assertThat(readers.size()).isEqualTo(17);
assertThat(readers).hasSize(17);
assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteArrayDecoder.class);
assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteBufferDecoder.class);
assertThat(getNextDecoder(readers).getClass()).isEqualTo(DataBufferDecoder.class);
@@ -116,7 +116,7 @@ public class ClientCodecConfigurerTests {
@Test
public void defaultWriters() {
List<HttpMessageWriter<?>> writers = this.configurer.getWriters();
assertThat(writers.size()).isEqualTo(17);
assertThat(writers).hasSize(17);
assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteArrayEncoder.class);
assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteBufferEncoder.class);
assertThat(getNextEncoder(writers).getClass()).isEqualTo(DataBufferEncoder.class);
@@ -184,7 +184,7 @@ public class ClientCodecConfigurerTests {
int size = 99;
this.configurer.defaultCodecs().maxInMemorySize(size);
List<HttpMessageReader<?>> readers = this.configurer.getReaders();
assertThat(readers.size()).isEqualTo(17);
assertThat(readers).hasSize(17);
assertThat(((ByteArrayDecoder) getNextDecoder(readers)).getMaxInMemorySize()).isEqualTo(size);
assertThat(((ByteBufferDecoder) getNextDecoder(readers)).getMaxInMemorySize()).isEqualTo(size);
assertThat(((DataBufferDecoder) getNextDecoder(readers)).getMaxInMemorySize()).isEqualTo(size);

12
spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java
View File

@@ -87,7 +87,7 @@ class CodecConfigurerTests {
@Test
void defaultReaders() {
List<HttpMessageReader<?>> readers = this.configurer.getReaders();
assertThat(readers.size()).isEqualTo(16);
assertThat(readers).hasSize(16);
assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteArrayDecoder.class);
assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteBufferDecoder.class);
assertThat(getNextDecoder(readers).getClass()).isEqualTo(DataBufferDecoder.class);
@@ -109,7 +109,7 @@ class CodecConfigurerTests {
@Test
void defaultWriters() {
List<HttpMessageWriter<?>> writers = this.configurer.getWriters();
assertThat(writers.size()).isEqualTo(15);
assertThat(writers).hasSize(15);
assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteArrayEncoder.class);
assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteBufferEncoder.class);
assertThat(getNextEncoder(writers).getClass()).isEqualTo(DataBufferEncoder.class);
@@ -149,7 +149,7 @@ class CodecConfigurerTests {
List<HttpMessageReader<?>> readers = this.configurer.getReaders();
assertThat(readers.size()).isEqualTo(20);
assertThat(readers).hasSize(20);
assertThat(getNextDecoder(readers)).isSameAs(customDecoder1);
assertThat(readers.get(this.index.getAndIncrement())).isSameAs(customReader1);
assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteArrayDecoder.class);
@@ -194,7 +194,7 @@ class CodecConfigurerTests {
List<HttpMessageWriter<?>> writers = this.configurer.getWriters();
assertThat(writers.size()).isEqualTo(19);
assertThat(writers).hasSize(19);
assertThat(getNextEncoder(writers)).isSameAs(customEncoder1);
assertThat(writers.get(this.index.getAndIncrement())).isSameAs(customWriter1);
assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteArrayEncoder.class);
@@ -240,7 +240,7 @@ class CodecConfigurerTests {
List<HttpMessageReader<?>> readers = this.configurer.getReaders();
assertThat(readers.size()).isEqualTo(4);
assertThat(readers).hasSize(4);
assertThat(getNextDecoder(readers)).isSameAs(customDecoder1);
assertThat(readers.get(this.index.getAndIncrement())).isSameAs(customReader1);
assertThat(getNextDecoder(readers)).isSameAs(customDecoder2);
@@ -271,7 +271,7 @@ class CodecConfigurerTests {
List<HttpMessageWriter<?>> writers = this.configurer.getWriters();
assertThat(writers.size()).isEqualTo(4);
assertThat(writers).hasSize(4);
assertThat(getNextEncoder(writers)).isSameAs(customEncoder1);
assertThat(writers.get(this.index.getAndIncrement())).isSameAs(customWriter1);
assertThat(getNextEncoder(writers)).isSameAs(customEncoder2);

4
spring-web/src/test/java/org/springframework/http/codec/support/ServerCodecConfigurerTests.java
View File

@@ -92,7 +92,7 @@ public class ServerCodecConfigurerTests {
@Test
public void defaultReaders() {
List<HttpMessageReader<?>> readers = this.configurer.getReaders();
assertThat(readers.size()).isEqualTo(19);
assertThat(readers).hasSize(19);
assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteArrayDecoder.class);
assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteBufferDecoder.class);
assertThat(getNextDecoder(readers).getClass()).isEqualTo(DataBufferDecoder.class);
@@ -117,7 +117,7 @@ public class ServerCodecConfigurerTests {
@Test
public void defaultWriters() {
List<HttpMessageWriter<?>> writers = this.configurer.getWriters();
assertThat(writers.size()).isEqualTo(17);
assertThat(writers).hasSize(17);
assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteArrayEncoder.class);
assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteBufferEncoder.class);
assertThat(getNextEncoder(writers).getClass()).isEqualTo(DataBufferEncoder.class);

6
spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
View File

@@ -99,7 +99,7 @@ public class Jaxb2XmlDecoderTests extends AbstractLeakCheckingTests {
StepVerifier.create(result)
.consumeNextWith(events -> {
assertThat(events.size()).isEqualTo(8);
assertThat(events).hasSize(8);
assertStartElement(events.get(0), "pojo");
assertStartElement(events.get(1), "foo");
assertCharacters(events.get(2), "foofoo");
@@ -121,7 +121,7 @@ public class Jaxb2XmlDecoderTests extends AbstractLeakCheckingTests {
StepVerifier.create(result)
.consumeNextWith(events -> {
assertThat(events.size()).isEqualTo(8);
assertThat(events).hasSize(8);
assertStartElement(events.get(0), "pojo");
assertStartElement(events.get(1), "foo");
assertCharacters(events.get(2), "foo");
@@ -132,7 +132,7 @@ public class Jaxb2XmlDecoderTests extends AbstractLeakCheckingTests {
assertEndElement(events.get(7), "pojo");
})
.consumeNextWith(events -> {
assertThat(events.size()).isEqualTo(8);
assertThat(events).hasSize(8);
assertStartElement(events.get(0), "pojo");
assertStartElement(events.get(1), "foo");
assertCharacters(events.get(2), "foofoo");

6
spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
View File

@@ -199,7 +199,7 @@ public class FormHttpMessageConverterTests {
fileUpload.setFileItemFactory(new DiskFileItemFactory());
RequestContext requestContext = new MockHttpOutputMessageRequestContext(outputMessage);
List<FileItem> items = fileUpload.parseRequest(requestContext);
assertThat(items.size()).isEqualTo(6);
assertThat(items).hasSize(6);
FileItem item = items.get(0);
assertThat(item.isFormField()).isTrue();
assertThat(item.getFieldName()).isEqualTo("name 1");
@@ -281,7 +281,7 @@ public class FormHttpMessageConverterTests {
fileUpload.setFileItemFactory(new DiskFileItemFactory());
RequestContext requestContext = new MockHttpOutputMessageRequestContext(outputMessage);
List<FileItem> items = fileUpload.parseRequest(requestContext);
assertThat(items.size()).isEqualTo(6);
assertThat(items).hasSize(6);
FileItem item = items.get(0);
assertThat(item.isFormField()).isTrue();
assertThat(item.getFieldName()).isEqualTo("name 1");
@@ -341,7 +341,7 @@ public class FormHttpMessageConverterTests {
fileUpload.setFileItemFactory(new DiskFileItemFactory());
RequestContext requestContext = new MockHttpOutputMessageRequestContext(outputMessage);
List<FileItem> items = fileUpload.parseRequest(requestContext);
assertThat(items.size()).isEqualTo(2);
assertThat(items).hasSize(2);
FileItem item = items.get(0);
assertThat(item.isFormField()).isTrue();

2
spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java
View File

@@ -78,7 +78,7 @@ public class AtomFeedHttpMessageConverterTests {
assertThat(result.getTitle()).isEqualTo("title");
assertThat(result.getSubtitle().getValue()).isEqualTo("subtitle");
List<?> entries = result.getEntries();
assertThat(entries.size()).isEqualTo(2);
assertThat(entries).hasSize(2);
Entry entry1 = (Entry) entries.get(0);
assertThat(entry1.getId()).isEqualTo("id1");

2
spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
View File

@@ -65,7 +65,7 @@ public class RssChannelHttpMessageConverterTests {
assertThat(result.getDescription()).isEqualTo("description");
List<?> items = result.getItems();
assertThat(items.size()).isEqualTo(2);
assertThat(items).hasSize(2);
Item item1 = (Item) items.get(0);
assertThat(item1.getTitle()).isEqualTo("title1");

6
spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java
View File

@@ -189,7 +189,7 @@ public class GsonHttpMessageConverterTests {
Type genericType = beansList.getGenericType();
List<MyBean> results = (List<MyBean>) converter.read(genericType, MyBeanListHolder.class, inputMessage);
assertThat(results.size()).isEqualTo(1);
assertThat(results).hasSize(1);
MyBean result = results.get(0);
assertThat(result.getString()).isEqualTo("Foo");
assertThat(result.getNumber()).isEqualTo(42);
@@ -216,7 +216,7 @@ public class GsonHttpMessageConverterTests {
inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
List<MyBean> results = (List<MyBean>) converter.read(beansList.getType(), null, inputMessage);
assertThat(results.size()).isEqualTo(1);
assertThat(results).hasSize(1);
MyBean result = results.get(0);
assertThat(result.getString()).isEqualTo("Foo");
assertThat(result.getNumber()).isEqualTo(42);
@@ -243,7 +243,7 @@ public class GsonHttpMessageConverterTests {
inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
List<MyBean> results = (List<MyBean>) converter.read(beansList.getType(), null, inputMessage);
assertThat(results.size()).isEqualTo(1);
assertThat(results).hasSize(1);
MyBean result = results.get(0);
assertThat(result.getString()).isEqualTo("Foo");
assertThat(result.getNumber()).isEqualTo(42);

6
spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
View File

@@ -189,7 +189,7 @@ public class JsonbHttpMessageConverterTests {
Type genericType = beansList.getGenericType();
List<MyBean> results = (List<MyBean>) converter.read(genericType, MyBeanListHolder.class, inputMessage);
assertThat(results.size()).isEqualTo(1);
assertThat(results).hasSize(1);
MyBean result = results.get(0);
assertThat(result.getString()).isEqualTo("Foo");
assertThat(result.getNumber()).isEqualTo(42);
@@ -215,7 +215,7 @@ public class JsonbHttpMessageConverterTests {
inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
List<MyBean> results = (List<MyBean>) converter.read(beansList.getType(), null, inputMessage);
assertThat(results.size()).isEqualTo(1);
assertThat(results).hasSize(1);
MyBean result = results.get(0);
assertThat(result.getString()).isEqualTo("Foo");
assertThat(result.getNumber()).isEqualTo(42);
@@ -242,7 +242,7 @@ public class JsonbHttpMessageConverterTests {
inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
List<MyBean> results = (List<MyBean>) converter.read(beansList.getType(), null, inputMessage);
assertThat(results.size()).isEqualTo(1);
assertThat(results).hasSize(1);
MyBean result = results.get(0);
assertThat(result.getString()).isEqualTo("Foo");
assertThat(result.getNumber()).isEqualTo(42);

6
spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
View File

@@ -268,7 +268,7 @@ public class MappingJackson2HttpMessageConverterTests {
inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
List<MyBean> results = (List<MyBean>) converter.read(List.class, inputMessage);
assertThat(results.size()).isEqualTo(1);
assertThat(results).hasSize(1);
MyBean result = results.get(0);
assertThat(result.getString()).isEqualTo("Foo");
assertThat(result.getNumber()).isEqualTo(42);
@@ -299,7 +299,7 @@ public class MappingJackson2HttpMessageConverterTests {
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
List<MyBean> results = (List<MyBean>) converter.read(beansList.getType(), null, inputMessage);
assertThat(results.size()).isEqualTo(1);
assertThat(results).hasSize(1);
MyBean result = results.get(0);
assertThat(result.getString()).isEqualTo("Foo");
assertThat(result.getNumber()).isEqualTo(42);
@@ -331,7 +331,7 @@ public class MappingJackson2HttpMessageConverterTests {
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
List<MyBean> results = (List<MyBean>) converter.read(beansList.getType(), null, inputMessage);
assertThat(results.size()).isEqualTo(1);
assertThat(results).hasSize(1);
MyBean result = results.get(0);
assertThat(result.getString()).isEqualTo("Foo");
assertThat(result.getNumber()).isEqualTo(42);

4
spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
View File

@@ -145,7 +145,7 @@ public class Jaxb2CollectionHttpMessageConverterTests {
try {
Collection<RootElement> result = converter.read(rootElementListType, null, inputMessage);
assertThat(result.size()).isEqualTo(1);
assertThat(result).hasSize(1);
assertThat(result.iterator().next().external).isEqualTo("");
}
catch (HttpMessageNotReadableException ex) {
@@ -173,7 +173,7 @@ public class Jaxb2CollectionHttpMessageConverterTests {
};
Collection<RootElement> result = c.read(rootElementListType, null, inputMessage);
assertThat(result.size()).isEqualTo(1);
assertThat(result).hasSize(1);
assertThat(result.iterator().next().external).isEqualTo("Foo Bar");
}

8
spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java
View File

@@ -66,7 +66,7 @@ class ChannelSendOperatorTests {
assertThat(signal).isNotNull();
assertThat(signal.isOnComplete()).as("Unexpected signal: " + signal).isTrue();
assertThat(this.writer.items.size()).isEqualTo(0);
assertThat(this.writer.items).hasSize(0);
assertThat(this.writer.completed).isTrue();
}
@@ -78,7 +78,7 @@ class ChannelSendOperatorTests {
assertThat(signal).isNotNull();
assertThat(signal.isOnComplete()).as("Unexpected signal: " + signal).isTrue();
assertThat(this.writer.items.size()).isEqualTo(1);
assertThat(this.writer.items).hasSize(1);
assertThat(this.writer.items.get(0)).isEqualTo("one");
assertThat(this.writer.completed).isTrue();
}
@@ -93,7 +93,7 @@ class ChannelSendOperatorTests {
assertThat(signal).isNotNull();
assertThat(signal.isOnComplete()).as("Unexpected signal: " + signal).isTrue();
assertThat(this.writer.items.size()).isEqualTo(3);
assertThat(this.writer.items).hasSize(3);
assertThat(this.writer.items.get(0)).isEqualTo("one");
assertThat(this.writer.items.get(1)).isEqualTo("two");
assertThat(this.writer.items.get(2)).isEqualTo("three");
@@ -117,7 +117,7 @@ class ChannelSendOperatorTests {
assertThat(signal).isNotNull();
assertThat(signal.getThrowable()).as("Unexpected signal: " + signal).isSameAs(error);
assertThat(this.writer.items.size()).isEqualTo(3);
assertThat(this.writer.items).hasSize(3);
assertThat(this.writer.items.get(0)).isEqualTo("1");
assertThat(this.writer.items.get(1)).isEqualTo("2");
assertThat(this.writer.items.get(2)).isEqualTo("3");

8
spring-web/src/test/java/org/springframework/http/server/reactive/CookieIntegrationTests.java
View File

@@ -58,18 +58,18 @@ public class CookieIntegrationTests extends AbstractHttpHandlerIntegrationTests
RequestEntity.get(url).header("Cookie", header).build(), Void.class);
Map<String, List<HttpCookie>> requestCookies = this.cookieHandler.requestCookies;
assertThat(requestCookies.size()).isEqualTo(2);
assertThat(requestCookies).hasSize(2);
List<HttpCookie> list = requestCookies.get("SID");
assertThat(list.size()).isEqualTo(1);
assertThat(list).hasSize(1);
assertThat(list.iterator().next().getValue()).isEqualTo("31d4d96e407aad42");
list = requestCookies.get("lang");
assertThat(list.size()).isEqualTo(1);
assertThat(list).hasSize(1);
assertThat(list.iterator().next().getValue()).isEqualTo("en-US");
List<String> headerValues = response.getHeaders().get("Set-Cookie");
assertThat(headerValues.size()).isEqualTo(2);
assertThat(headerValues).hasSize(2);
List<String> cookie0 = splitCookie(headerValues.get(0));
assertThat(cookie0.remove("SID=31d4d96e407aad42")).as("SID").isTrue();

6
spring-web/src/test/java/org/springframework/http/server/reactive/HeadersAdaptersTests.java
View File

@@ -64,7 +64,7 @@ class HeadersAdaptersTests {
void sizeWithMultipleValuesForHeaderShouldCountHeaders(MultiValueMap<String, String> headers) {
headers.add("TestHeader", "first");
headers.add("TestHeader", "second");
assertThat(headers.size()).isEqualTo(1);
assertThat(headers).hasSize(1);
}
@ParameterizedHeadersTest
@@ -72,7 +72,7 @@ class HeadersAdaptersTests {
headers.add("TestHeader", "first");
headers.add("OtherHeader", "test");
headers.add("TestHeader", "second");
assertThat(headers.keySet().size()).isEqualTo(2);
assertThat(headers.keySet()).hasSize(2);
}
@ParameterizedHeadersTest
@@ -94,7 +94,7 @@ class HeadersAdaptersTests {
headers.add("TestHeader", "first");
headers.put("TestHeader", Arrays.asList("override"));
assertThat(headers.getFirst("TestHeader")).isEqualTo("override");
assertThat(headers.get("TestHeader").size()).isEqualTo(1);
assertThat(headers.get("TestHeader")).hasSize(1);
}
@ParameterizedHeadersTest

6
spring-web/src/test/java/org/springframework/http/server/reactive/ListenerWriteProcessorTests.java
View File

@@ -64,7 +64,7 @@ public class ListenerWriteProcessorTests {
this.processor.onError(new IllegalStateException());
assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull();
assertThat(this.processor.getDiscardedBuffers().size()).isEqualTo(1);
assertThat(this.processor.getDiscardedBuffers()).hasSize(1);
assertThat(this.processor.getDiscardedBuffers().get(0)).isSameAs(buffer);
}
@@ -80,7 +80,7 @@ public class ListenerWriteProcessorTests {
this.processor.onNext(buffer);
assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull();
assertThat(this.processor.getDiscardedBuffers().size()).isEqualTo(1);
assertThat(this.processor.getDiscardedBuffers()).hasSize(1);
assertThat(this.processor.getDiscardedBuffers().get(0)).isSameAs(buffer);
}
@@ -97,7 +97,7 @@ public class ListenerWriteProcessorTests {
this.processor.onNext(buffer2);
assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull();
assertThat(this.processor.getDiscardedBuffers().size()).isEqualTo(2);
assertThat(this.processor.getDiscardedBuffers()).hasSize(2);
assertThat(this.processor.getDiscardedBuffers().get(0)).isSameAs(buffer2);
assertThat(this.processor.getDiscardedBuffers().get(1)).isSameAs(buffer1);
}

2
spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java
View File

@@ -94,7 +94,7 @@ class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests {
return exchange
.getMultipartData()
.doOnNext(parts -> {
assertThat(parts.size()).isEqualTo(2);
assertThat(parts).hasSize(2);
assertThat(parts.containsKey("fooPart")).isTrue();
assertFooPart(parts.getFirst("fooPart"));
assertThat(parts.containsKey("barPart")).isTrue();

12
spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java
View File

@@ -53,13 +53,13 @@ public class ServerHttpRequestTests {
@Test
public void queryParamsNone() throws Exception {
MultiValueMap<String, String> params = createRequest("/path").getQueryParams();
assertThat(params.size()).isEqualTo(0);
assertThat(params).hasSize(0);
}
@Test
public void queryParams() throws Exception {
MultiValueMap<String, String> params = createRequest("/path?a=A&b=B").getQueryParams();
assertThat(params.size()).isEqualTo(2);
assertThat(params).hasSize(2);
assertThat(params.get("a")).isEqualTo(Collections.singletonList("A"));
assertThat(params.get("b")).isEqualTo(Collections.singletonList("B"));
}
@@ -67,28 +67,28 @@ public class ServerHttpRequestTests {
@Test
public void queryParamsWithMultipleValues() throws Exception {
MultiValueMap<String, String> params = createRequest("/path?a=1&a=2").getQueryParams();
assertThat(params.size()).isEqualTo(1);
assertThat(params).hasSize(1);
assertThat(params.get("a")).isEqualTo(Arrays.asList("1", "2"));
}
@Test // SPR-15140
public void queryParamsWithEncodedValue() throws Exception {
MultiValueMap<String, String> params = createRequest("/path?a=%20%2B+%C3%A0").getQueryParams();
assertThat(params.size()).isEqualTo(1);
assertThat(params).hasSize(1);
assertThat(params.get("a")).isEqualTo(Collections.singletonList(" + \u00e0"));
}
@Test
public void queryParamsWithEmptyValue() throws Exception {
MultiValueMap<String, String> params = createRequest("/path?a=").getQueryParams();
assertThat(params.size()).isEqualTo(1);
assertThat(params).hasSize(1);
assertThat(params.get("a")).isEqualTo(Collections.singletonList(""));
}
@Test
public void queryParamsWithNoValue() throws Exception {
MultiValueMap<String, String> params = createRequest("/path?a").getQueryParams();
assertThat(params.size()).isEqualTo(1);
assertThat(params).hasSize(1);
assertThat(params.get("a")).isEqualTo(Collections.singletonList(null));
}

6
spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpResponseTests.java
View File

@@ -67,7 +67,7 @@ class ServerHttpResponseTests {
assertThat(response.headersWritten).isTrue();
assertThat(response.cookiesWritten).isTrue();
assertThat(response.body.size()).isEqualTo(3);
assertThat(response.body).hasSize(3);
assertThat(new String(response.body.get(0).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("a");
assertThat(new String(response.body.get(1).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("b");
assertThat(new String(response.body.get(2).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("c");
@@ -83,7 +83,7 @@ class ServerHttpResponseTests {
assertThat(response.headersWritten).isTrue();
assertThat(response.cookiesWritten).isTrue();
assertThat(response.body.size()).isEqualTo(1);
assertThat(response.body).hasSize(1);
assertThat(new String(response.body.get(0).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("foo");
}
@@ -138,7 +138,7 @@ class ServerHttpResponseTests {
assertThat(response.cookiesWritten).isTrue();
assertThat(response.getCookies().getFirst("ID")).isSameAs(cookie);
assertThat(response.body.size()).isEqualTo(3);
assertThat(response.body).hasSize(3);
assertThat(new String(response.body.get(0).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("a");
assertThat(new String(response.body.get(1).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("b");
assertThat(new String(response.body.get(2).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("c");

4
spring-web/src/test/java/org/springframework/web/accept/HeaderContentNegotiationStrategyTests.java
View File

@@ -49,7 +49,7 @@ public class HeaderContentNegotiationStrategyTests {
this.servletRequest.addHeader("Accept", "text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c");
List<MediaType> mediaTypes = this.strategy.resolveMediaTypes(this.webRequest);
assertThat(mediaTypes.size()).isEqualTo(4);
assertThat(mediaTypes).hasSize(4);
assertThat(mediaTypes.get(0).toString()).isEqualTo("text/html");
assertThat(mediaTypes.get(1).toString()).isEqualTo("text/x-c");
assertThat(mediaTypes.get(2).toString()).isEqualTo("text/x-dvi;q=0.8");
@@ -62,7 +62,7 @@ public class HeaderContentNegotiationStrategyTests {
this.servletRequest.addHeader("Accept", "text/x-dvi; q=0.8, text/x-c");
List<MediaType> mediaTypes = this.strategy.resolveMediaTypes(this.webRequest);
assertThat(mediaTypes.size()).isEqualTo(4);
assertThat(mediaTypes).hasSize(4);
assertThat(mediaTypes.get(0).toString()).isEqualTo("text/html");
assertThat(mediaTypes.get(1).toString()).isEqualTo("text/x-c");
assertThat(mediaTypes.get(2).toString()).isEqualTo("text/x-dvi;q=0.8");

4
spring-web/src/test/java/org/springframework/web/accept/MappingContentNegotiationStrategyTests.java
View File

@@ -42,7 +42,7 @@ public class MappingContentNegotiationStrategyTests {
List<MediaType> mediaTypes = strategy.resolveMediaTypes(null);
assertThat(mediaTypes.size()).isEqualTo(1);
assertThat(mediaTypes).hasSize(1);
assertThat(mediaTypes.get(0).toString()).isEqualTo("application/json");
}
@@ -73,7 +73,7 @@ public class MappingContentNegotiationStrategyTests {
List<MediaType> mediaTypes = strategy.resolveMediaTypes(null);
assertThat(mediaTypes.size()).isEqualTo(1);
assertThat(mediaTypes).hasSize(1);
assertThat(mediaTypes.get(0).toString()).isEqualTo("application/xml");
}

2
spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java
View File

@@ -214,7 +214,7 @@ public class WebExchangeDataBinderTests {
assertThat(bean.getSomeList()).isEqualTo(Arrays.asList("123", "abc"));
assertThat(bean.getSomeArray()).isEqualTo(new String[] {"dec", "456"});
assertThat(bean.getPart().filename()).isEqualTo("foo.txt");
assertThat(bean.getSomePartList().size()).isEqualTo(2);
assertThat(bean.getSomePartList()).hasSize(2);
assertThat(bean.getSomePartList().get(0).filename()).isEqualTo("foo.txt");
assertThat(bean.getSomePartList().get(1).filename()).isEqualTo("spring.png");
}

2
spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java
View File

@@ -125,7 +125,7 @@ class WebRequestDataBinderIntegrationTests {
template.postForLocation(baseUrl + "/partlist", parts);
assertThat(bean.getPartList()).isNotNull();
assertThat(bean.getPartList().size()).isEqualTo(parts.get("partList").size());
assertThat(bean.getPartList()).hasSize(parts.get("partList").size());
}

2
spring-web/src/test/java/org/springframework/web/client/AbstractMockWebServerTests.java
View File

@@ -91,7 +91,7 @@ abstract class AbstractMockWebServerTests {
private MockResponse postRequest(RecordedRequest request, String expectedRequestContent,
String location, String contentType, byte[] responseBody) {
assertThat(request.getHeaders().values(CONTENT_LENGTH).size()).isEqualTo(1);
assertThat(request.getHeaders().values(CONTENT_LENGTH)).hasSize(1);
assertThat(Integer.parseInt(request.getHeader(CONTENT_LENGTH))).as("Invalid request content-length").isGreaterThan(0);
String requestContentType = request.getHeader(CONTENT_TYPE);
assertThat(requestContentType).as("No content-type").isNotNull();

2
spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
View File

@@ -69,7 +69,7 @@ public class ServletWebRequestTests {
assertThat(request.getParameterValues("param2")[1]).isEqualTo("value2a");
Map<String, String[]> paramMap = request.getParameterMap();
assertThat(paramMap.size()).isEqualTo(2);
assertThat(paramMap).hasSize(2);
assertThat(paramMap.get("param1").length).isEqualTo(1);
assertThat(paramMap.get("param1")[0]).isEqualTo("value1");
assertThat(paramMap.get("param2").length).isEqualTo(2);

4
spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java
View File

@@ -68,7 +68,7 @@ public class StandardServletAsyncWebRequestTests {
MockAsyncContext context = (MockAsyncContext) this.request.getAsyncContext();
assertThat(context).isNotNull();
assertThat(context.getTimeout()).as("Timeout value not set").isEqualTo((44 * 1000));
assertThat(context.getListeners().size()).isEqualTo(1);
assertThat(context.getListeners()).hasSize(1);
assertThat(context.getListeners().get(0)).isSameAs(this.asyncRequest);
}
@@ -81,7 +81,7 @@ public class StandardServletAsyncWebRequestTests {
MockAsyncContext context = (MockAsyncContext) this.request.getAsyncContext();
assertThat(context).isNotNull();
assertThat(context.getListeners().size()).isEqualTo(1);
assertThat(context.getListeners()).hasSize(1);
}
@Test

2
spring-web/src/test/java/org/springframework/web/filter/FormContentFilterTests.java
View File

@@ -200,7 +200,7 @@ public class FormContentFilterTests {
Map<String, String[]> parameters = this.filterChain.getRequest().getParameterMap();
assertThat(this.filterChain.getRequest()).as("Request not wrapped").isNotSameAs(this.request);
assertThat(parameters.size()).isEqualTo(2);
assertThat(parameters).hasSize(2);
assertThat(parameters.get("name")).isEqualTo(new String[] {"value1", "value2", "value3"});
assertThat(parameters.get("name4")).isEqualTo(new String[] {"value4"});
}

4
spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java
View File

@@ -177,7 +177,7 @@ public class ModelFactoryTests {
assertThat(container.getModel().get(commandName)).isEqualTo(command);
String bindingResultKey = BindingResult.MODEL_KEY_PREFIX + commandName;
assertThat(container.getModel().get(bindingResultKey)).isSameAs(dataBinder.getBindingResult());
assertThat(container.getModel().size()).isEqualTo(2);
assertThat(container.getModel()).hasSize(2);
}
@Test
@@ -240,7 +240,7 @@ public class ModelFactoryTests {
modelFactory.updateModel(this.webRequest, container);
assertThat(container.getModel().get(queryParamName)).isEqualTo(queryParam);
assertThat(container.getModel().size()).isEqualTo(1);
assertThat(container.getModel()).hasSize(1);
assertThat(this.attributeStore.retrieveAttribute(this.webRequest, attributeName)).isEqualTo(attribute);
}

16
spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java
View File

@@ -122,7 +122,7 @@ public class RequestParamMapMethodArgumentResolverTests {
boolean condition = result instanceof Map;
assertThat(condition).isTrue();
Map<String, MultipartFile> resultMap = (Map<String, MultipartFile>) result;
assertThat(resultMap.size()).isEqualTo(2);
assertThat(resultMap).hasSize(2);
assertThat(resultMap.get("mfile")).isEqualTo(expected1);
assertThat(resultMap.get("other")).isEqualTo(expected2);
}
@@ -145,11 +145,11 @@ public class RequestParamMapMethodArgumentResolverTests {
boolean condition = result instanceof MultiValueMap;
assertThat(condition).isTrue();
MultiValueMap<String, MultipartFile> resultMap = (MultiValueMap<String, MultipartFile>) result;
assertThat(resultMap.size()).isEqualTo(2);
assertThat(resultMap.get("mfilelist").size()).isEqualTo(2);
assertThat(resultMap).hasSize(2);
assertThat(resultMap.get("mfilelist")).hasSize(2);
assertThat(resultMap.get("mfilelist").get(0)).isEqualTo(expected1);
assertThat(resultMap.get("mfilelist").get(1)).isEqualTo(expected2);
assertThat(resultMap.get("other").size()).isEqualTo(1);
assertThat(resultMap.get("other")).hasSize(1);
assertThat(resultMap.get("other").get(0)).isEqualTo(expected3);
}
@@ -170,7 +170,7 @@ public class RequestParamMapMethodArgumentResolverTests {
boolean condition = result instanceof Map;
assertThat(condition).isTrue();
Map<String, Part> resultMap = (Map<String, Part>) result;
assertThat(resultMap.size()).isEqualTo(2);
assertThat(resultMap).hasSize(2);
assertThat(resultMap.get("mfile")).isEqualTo(expected1);
assertThat(resultMap.get("other")).isEqualTo(expected2);
}
@@ -194,11 +194,11 @@ public class RequestParamMapMethodArgumentResolverTests {
boolean condition = result instanceof MultiValueMap;
assertThat(condition).isTrue();
MultiValueMap<String, Part> resultMap = (MultiValueMap<String, Part>) result;
assertThat(resultMap.size()).isEqualTo(2);
assertThat(resultMap.get("mfilelist").size()).isEqualTo(2);
assertThat(resultMap).hasSize(2);
assertThat(resultMap.get("mfilelist")).hasSize(2);
assertThat(resultMap.get("mfilelist").get(0)).isEqualTo(expected1);
assertThat(resultMap.get("mfilelist").get(1)).isEqualTo(expected2);
assertThat(resultMap.get("other").size()).isEqualTo(1);
assertThat(resultMap.get("other")).hasSize(1);
assertThat(resultMap.get("other").get(0)).isEqualTo(expected3);
}

8
spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java
View File

@@ -61,8 +61,8 @@ public class InvocableHandlerMethodTests {
Object value = getInvocable(Integer.class, String.class).invokeForRequest(request, null);
assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(1).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1);
assertThat(getStubResolver(1).getResolvedParameters()).hasSize(1);
assertThat(value).isEqualTo("99-value");
assertThat(getStubResolver(0).getResolvedParameters().get(0).getParameterName()).isEqualTo("intArg");
assertThat(getStubResolver(1).getResolvedParameters().get(0).getParameterName()).isEqualTo("stringArg");
@@ -75,8 +75,8 @@ public class InvocableHandlerMethodTests {
Object returnValue = getInvocable(Integer.class, String.class).invokeForRequest(request, null);
assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(1).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1);
assertThat(getStubResolver(1).getResolvedParameters()).hasSize(1);
assertThat(returnValue).isEqualTo("null-null");
}

8
spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java
View File

@@ -43,7 +43,7 @@ public class ModelAndViewContainerTests {
@Test
public void getModel() {
this.mavContainer.addAttribute("name", "value");
assertThat(this.mavContainer.getModel().size()).isEqualTo(1);
assertThat(this.mavContainer.getModel()).hasSize(1);
assertThat(this.mavContainer.getModel().get("name")).isEqualTo("value");
}
@@ -53,7 +53,7 @@ public class ModelAndViewContainerTests {
this.mavContainer.setRedirectModel(new ModelMap("name2", "value2"));
this.mavContainer.setRedirectModelScenario(true);
assertThat(this.mavContainer.getModel().size()).isEqualTo(1);
assertThat(this.mavContainer.getModel()).hasSize(1);
assertThat(this.mavContainer.getModel().get("name2")).isEqualTo("value2");
}
@@ -64,7 +64,7 @@ public class ModelAndViewContainerTests {
this.mavContainer.addAttribute("name", "value");
this.mavContainer.setRedirectModelScenario(true);
assertThat(this.mavContainer.getModel().size()).isEqualTo(1);
assertThat(this.mavContainer.getModel()).hasSize(1);
assertThat(this.mavContainer.getModel().get("name")).isEqualTo("value");
}
@@ -81,7 +81,7 @@ public class ModelAndViewContainerTests {
this.mavContainer.setRedirectModelScenario(true);
this.mavContainer.addAttribute("name", "value");
assertThat(this.mavContainer.getModel().size()).isEqualTo(1);
assertThat(this.mavContainer.getModel()).hasSize(1);
assertThat(this.mavContainer.getModel().get("name")).isEqualTo("value");
}

2
spring-web/src/test/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequestTests.java
View File

@@ -64,7 +64,7 @@ public class DefaultMultipartHttpServletRequestTests {
Map<String, String[]> map = createMultipartRequest().getParameterMap();
assertThat(map.size()).isEqualTo(3);
assertThat(map).hasSize(3);
assertThat(map.get("key1")).isEqualTo(new String[] {"p1", "q1"});
assertThat(map.get("key2")).isEqualTo(new String[] {"p2"});
assertThat(map.get("key3")).isEqualTo(new String[] {"q3"});

2
spring-web/src/test/java/org/springframework/web/server/adapter/DefaultServerWebExchangeCheckNotModifiedTests.java
View File

@@ -80,7 +80,7 @@ class DefaultServerWebExchangeCheckNotModifiedTests {
assertThat(exchange.checkNotModified(currentDate)).isTrue();
assertThat(exchange.getResponse().getStatusCode().value()).isEqualTo(304);
assertThat(exchange.getResponse().getHeaders().get("Last-Modified").size()).isEqualTo(1);
assertThat(exchange.getResponse().getHeaders().get("Last-Modified")).hasSize(1);
assertThat(exchange.getResponse().getHeaders().getFirst("Last-Modified")).isEqualTo(CURRENT_TIME);
}

4
spring-web/src/test/java/org/springframework/web/server/session/CookieWebSessionIdResolverTests.java
View File

@@ -41,7 +41,7 @@ public class CookieWebSessionIdResolverTests {
this.resolver.setSessionId(exchange, "123");
MultiValueMap<String, ResponseCookie> cookies = exchange.getResponse().getCookies();
assertThat(cookies.size()).isEqualTo(1);
assertThat(cookies).hasSize(1);
ResponseCookie cookie = cookies.getFirst(this.resolver.getCookieName());
assertThat(cookie).isNotNull();
assertThat(cookie.toString()).isEqualTo("SESSION=123; Path=/; Secure; HttpOnly; SameSite=Lax");
@@ -58,7 +58,7 @@ public class CookieWebSessionIdResolverTests {
this.resolver.setSessionId(exchange, "123");
MultiValueMap<String, ResponseCookie> cookies = exchange.getResponse().getCookies();
assertThat(cookies.size()).isEqualTo(1);
assertThat(cookies).hasSize(1);
ResponseCookie cookie = cookies.getFirst(this.resolver.getCookieName());
assertThat(cookie).isNotNull();
assertThat(cookie.toString()).isEqualTo("SESSION=123; Path=/; Domain=example.org; HttpOnly; SameSite=Strict");

6
spring-web/src/test/java/org/springframework/web/server/session/InMemoryWebSessionStoreTests.java
View File

@@ -138,15 +138,15 @@ public class InMemoryWebSessionStoreTests {
// Create 100 sessions
IntStream.range(0, 100).forEach(i -> insertSession());
assertThat(sessions.size()).isEqualTo(100);
assertThat(sessions).hasSize(100);
// Force a new clock (31 min later), don't use setter which would clean expired sessions
accessor.setPropertyValue("clock", Clock.offset(this.store.getClock(), Duration.ofMinutes(31)));
assertThat(sessions.size()).isEqualTo(100);
assertThat(sessions).hasSize(100);
// Create 1 more which forces a time-based check (clock moved forward)
insertSession();
assertThat(sessions.size()).isEqualTo(1);
assertThat(sessions).hasSize(1);
}
@Test

2
spring-web/src/test/java/org/springframework/web/server/session/WebSessionIntegrationTests.java
View File

@@ -199,7 +199,7 @@ public class WebSessionIntegrationTests extends AbstractHttpHandlerIntegrationTe
private String extractSessionId(HttpHeaders headers) {
List<String> headerValues = headers.get("Set-Cookie");
assertThat(headerValues).isNotNull();
assertThat(headerValues.size()).isEqualTo(1);
assertThat(headerValues).hasSize(1);
for (String s : headerValues.get(0).split(";")){
if (s.startsWith("SESSION=")) {

6
spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java
View File

@@ -577,7 +577,7 @@ public class PathPatternTests {
pri = getPathRemaining(pp, "/aaa/bbb");
assertThat(pri.getPathRemaining().value()).isEqualTo("");
assertThat(pri.getPathMatched().value()).isEqualTo("/aaa/bbb");
assertThat(pri.getUriVariables().size()).isEqualTo(0);
assertThat(pri.getUriVariables()).hasSize(0);
pp = parse("/*/{foo}/b*");
pri = getPathRemaining(pp, "/foo");
@@ -807,7 +807,7 @@ public class PathPatternTests {
assertThat((Object) checkCapture("/{one}/", "//")).isNull();
assertThat((Object) checkCapture("", "/abc")).isNull();
assertThat(checkCapture("", "").getUriVariables().size()).isEqualTo(0);
assertThat(checkCapture("", "").getUriVariables()).hasSize(0);
checkCapture("{id}", "99", "id", "99");
checkCapture("/customer/{customerId}", "/customer/78", "customerId", "78");
checkCapture("/customer/{customerId}/banana", "/customer/42/banana", "customerId",
@@ -817,7 +817,7 @@ public class PathPatternTests {
"apple");
checkCapture("/{bla}.*", "/testing.html", "bla", "testing");
PathPattern.PathMatchInfo extracted = checkCapture("/abc", "/abc");
assertThat(extracted.getUriVariables().size()).isEqualTo(0);
assertThat(extracted.getUriVariables()).hasSize(0);
checkCapture("/{bla}/foo","/a/foo");
}