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

User AssertJ's hasSize() for arrays

Browse Source 
Achieved via global search-and-replace.
This commit is contained in:
Sam Brannen
2022-11-22 17:03:45 +01:00
parent 36f7597f25
commit d5b0b2b1a1
72 changed files with 277 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
View File

@@ -236,11 +236,11 @@ class MockHttpServletRequestTests {
params.put("key3", new String[] { "value3A", "value3B" });
request.setParameters(params);
String[] values1 = request.getParameterValues("key1");
assertThat(values1.length).isEqualTo(1);
assertThat(values1).hasSize(1);
assertThat(request.getParameter("key1")).isEqualTo("newValue1");
assertThat(request.getParameter("key2")).isEqualTo("value2");
String[] values3 = request.getParameterValues("key3");
assertThat(values3.length).isEqualTo(2);
assertThat(values3).hasSize(2);
assertThat(values3[0]).isEqualTo("value3A");
assertThat(values3[1]).isEqualTo("value3B");
}
@@ -254,12 +254,12 @@ class MockHttpServletRequestTests {
params.put("key3", new String[] { "value3A", "value3B" });
request.addParameters(params);
String[] values1 = request.getParameterValues("key1");
assertThat(values1.length).isEqualTo(2);
assertThat(values1).hasSize(2);
assertThat(values1[0]).isEqualTo("value1");
assertThat(values1[1]).isEqualTo("newValue1");
assertThat(request.getParameter("key2")).isEqualTo("value2");
String[] values3 = request.getParameterValues("key3");
assertThat(values3.length).isEqualTo(2);
assertThat(values3).hasSize(2);
assertThat(values3[0]).isEqualTo("value3A");
assertThat(values3[1]).isEqualTo("value3B");
}

12
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
View File

@@ -280,7 +280,7 @@ class MockHttpServletResponseTests {
int size = response.getBufferSize();
response.getOutputStream().write(new byte[size]);
assertThat(response.isCommitted()).isTrue();
assertThat(response.getContentAsByteArray().length).isEqualTo((size + 1));
assertThat(response.getContentAsByteArray()).hasSize((size + 1));
}
@Test
@@ -290,7 +290,7 @@ class MockHttpServletResponseTests {
assertThat(response.isCommitted()).isFalse();
response.flushBuffer();
assertThat(response.isCommitted()).isTrue();
assertThat(response.getContentAsByteArray().length).isEqualTo(1);
assertThat(response.getContentAsByteArray()).hasSize(1);
}
@Test
@@ -303,7 +303,7 @@ class MockHttpServletResponseTests {
Arrays.fill(data, 'p');
response.getWriter().write(data);
assertThat(response.isCommitted()).isTrue();
assertThat(response.getContentAsByteArray().length).isEqualTo((size + 1));
assertThat(response.getContentAsByteArray()).hasSize((size + 1));
}
@Test
@@ -313,7 +313,7 @@ class MockHttpServletResponseTests {
assertThat(response.isCommitted()).isFalse();
response.getOutputStream().flush();
assertThat(response.isCommitted()).isTrue();
assertThat(response.getContentAsByteArray().length).isEqualTo(1);
assertThat(response.getContentAsByteArray()).hasSize(1);
}
@Test
@@ -323,7 +323,7 @@ class MockHttpServletResponseTests {
assertThat(response.isCommitted()).isFalse();
response.getWriter().flush();
assertThat(response.isCommitted()).isTrue();
assertThat(response.getContentAsByteArray().length).isEqualTo(1);
assertThat(response.getContentAsByteArray()).hasSize(1);
}
@Test // SPR-16683
@@ -333,7 +333,7 @@ class MockHttpServletResponseTests {
assertThat(response.isCommitted()).isFalse();
response.getWriter().close();
assertThat(response.isCommitted()).isTrue();
assertThat(response.getContentAsByteArray().length).isEqualTo(1);
assertThat(response.getContentAsByteArray()).hasSize(1);
}
@Test // gh-23219

2
spring-test/src/test/java/org/springframework/test/context/TestContextConcurrencyTests.java
View File

@@ -77,7 +77,7 @@ class TestContextConcurrencyTests {
});
assertThat(actualMethods).isEqualTo(expectedMethods);
});
assertThat(tcm.getTestContext().attributeNames().length).isEqualTo(0);
assertThat(tcm.getTestContext().attributeNames()).hasSize(0);
}

2
spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtilsTests.java
View File

@@ -47,7 +47,7 @@ class AnnotationConfigContextLoaderUtilsTests {
void detectDefaultConfigurationClassesWithoutConfigurationClass() {
Class<?>[] configClasses = detectDefaultConfigurationClasses(NoConfigTestCase.class);
assertThat(configClasses).isNotNull();
assertThat(configClasses.length).isEqualTo(0);
assertThat(configClasses).hasSize(0);
}
@Test

16
spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java
View File

@@ -338,20 +338,20 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati
List<ContextConfigurationAttributes> alphaConfig = map.get("alpha");
assertThat(alphaConfig).hasSize(2);
assertThat(alphaConfig.get(0).getLocations().length).isEqualTo(1);
assertThat(alphaConfig.get(0).getLocations()).hasSize(1);
assertThat(alphaConfig.get(0).getLocations()[0]).isEqualTo("1-A.xml");
assertThat(alphaConfig.get(0).getInitializers().length).isEqualTo(0);
assertThat(alphaConfig.get(1).getLocations().length).isEqualTo(0);
assertThat(alphaConfig.get(1).getInitializers().length).isEqualTo(1);
assertThat(alphaConfig.get(0).getInitializers()).hasSize(0);
assertThat(alphaConfig.get(1).getLocations()).hasSize(0);
assertThat(alphaConfig.get(1).getInitializers()).hasSize(1);
assertThat(alphaConfig.get(1).getInitializers()[0]).isEqualTo(DummyApplicationContextInitializer.class);
List<ContextConfigurationAttributes> betaConfig = map.get("beta");
assertThat(betaConfig).hasSize(2);
assertThat(betaConfig.get(0).getLocations().length).isEqualTo(1);
assertThat(betaConfig.get(0).getLocations()).hasSize(1);
assertThat(betaConfig.get(0).getLocations()[0]).isEqualTo("1-B.xml");
assertThat(betaConfig.get(0).getInitializers().length).isEqualTo(0);
assertThat(betaConfig.get(1).getLocations().length).isEqualTo(0);
assertThat(betaConfig.get(1).getInitializers().length).isEqualTo(1);
assertThat(betaConfig.get(0).getInitializers()).hasSize(0);
assertThat(betaConfig.get(1).getLocations()).hasSize(0);
assertThat(betaConfig.get(1).getInitializers()).hasSize(1);
assertThat(betaConfig.get(1).getInitializers()[0]).isEqualTo(DummyApplicationContextInitializer.class);
}

32
spring-test/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java
View File

@@ -46,7 +46,7 @@ class ResponseCreatorsTests {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
assertThat(response.getHeaders().isEmpty()).isTrue();
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -77,7 +77,7 @@ class ResponseCreatorsTests {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED);
assertThat(response.getHeaders().getLocation()).isEqualTo(location);
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -86,7 +86,7 @@ class ResponseCreatorsTests {
MockClientHttpResponse response = (MockClientHttpResponse) responseCreator.createResponse(null);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.ACCEPTED);
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -96,7 +96,7 @@ class ResponseCreatorsTests {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT);
assertThat(response.getHeaders().isEmpty()).isTrue();
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -106,7 +106,7 @@ class ResponseCreatorsTests {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
assertThat(response.getHeaders().isEmpty()).isTrue();
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -116,7 +116,7 @@ class ResponseCreatorsTests {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
assertThat(response.getHeaders().isEmpty()).isTrue();
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -125,7 +125,7 @@ class ResponseCreatorsTests {
MockClientHttpResponse response = (MockClientHttpResponse) responseCreator.createResponse(null);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN);
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -134,7 +134,7 @@ class ResponseCreatorsTests {
MockClientHttpResponse response = (MockClientHttpResponse) responseCreator.createResponse(null);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -143,7 +143,7 @@ class ResponseCreatorsTests {
MockClientHttpResponse response = (MockClientHttpResponse) responseCreator.createResponse(null);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CONFLICT);
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -153,7 +153,7 @@ class ResponseCreatorsTests {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.TOO_MANY_REQUESTS);
assertThat(response.getHeaders()).doesNotContainKey(HttpHeaders.RETRY_AFTER);
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -163,7 +163,7 @@ class ResponseCreatorsTests {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.TOO_MANY_REQUESTS);
assertThat(response.getHeaders().getFirst(HttpHeaders.RETRY_AFTER)).isEqualTo("512");
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -173,7 +173,7 @@ class ResponseCreatorsTests {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
assertThat(response.getHeaders().isEmpty()).isTrue();
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -182,7 +182,7 @@ class ResponseCreatorsTests {
MockClientHttpResponse response = (MockClientHttpResponse) responseCreator.createResponse(null);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_GATEWAY);
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -191,7 +191,7 @@ class ResponseCreatorsTests {
MockClientHttpResponse response = (MockClientHttpResponse) responseCreator.createResponse(null);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE);
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -200,7 +200,7 @@ class ResponseCreatorsTests {
MockClientHttpResponse response = (MockClientHttpResponse) responseCreator.createResponse(null);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.GATEWAY_TIMEOUT);
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test
@@ -210,7 +210,7 @@ class ResponseCreatorsTests {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN);
assertThat(response.getHeaders().isEmpty()).isTrue();
assertThat(StreamUtils.copyToByteArray(response.getBody()).length).isEqualTo(0);
assertThat(StreamUtils.copyToByteArray(response.getBody())).hasSize(0);
}
@Test

6
spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
View File

@@ -230,7 +230,7 @@ public class HtmlUnitRequestBuilderTests {
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
Cookie[] cookies = actualRequest.getCookies();
assertThat(cookies.length).isEqualTo(1);
assertThat(cookies).hasSize(1);
assertThat(cookies[0].getName()).isEqualTo("name");
assertThat(cookies[0].getValue()).isEqualTo("value");
}
@@ -242,7 +242,7 @@ public class HtmlUnitRequestBuilderTests {
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
Cookie[] cookies = actualRequest.getCookies();
assertThat(cookies.length).isEqualTo(2);
assertThat(cookies).hasSize(2);
Cookie cookie = cookies[0];
assertThat(cookie.getName()).isEqualTo("name");
assertThat(cookie.getValue()).isEqualTo("value");
@@ -857,7 +857,7 @@ public class HtmlUnitRequestBuilderTests {
Cookie[] cookies = mockMvc.perform(requestBuilder).andReturn().getRequest().getCookies();
assertThat(cookies).isNotNull();
assertThat(cookies.length).isEqualTo(1);
assertThat(cookies).hasSize(1);
Cookie cookie = cookies[0];
assertThat(cookie.getName()).isEqualTo(cookieName);
assertThat(cookie.getValue()).isEqualTo(cookieValue);

2
spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
View File

@@ -463,7 +463,7 @@ class MockHttpServletRequestBuilderTests {
MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
Cookie[] cookies = request.getCookies();
assertThat(cookies.length).isEqualTo(2);
assertThat(cookies).hasSize(2);
assertThat(cookies[0].getName()).isEqualTo("foo");
assertThat(cookies[0].getValue()).isEqualTo("bar");
assertThat(cookies[1].getName()).isEqualTo("baz");

2
spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
View File

@@ -190,7 +190,7 @@ class PrintingResultHandlerTests {
Map<String, Map<String, Object>> printedValues = this.handler.getPrinter().printedValues;
String[] cookies = (String[]) printedValues.get(heading).get("Cookies");
assertThat(cookies.length).isEqualTo(2);
assertThat(cookies).hasSize(2);
String cookie1 = cookies[0];
String cookie2 = cookies[1];
assertThat(cookie1.startsWith("[" + Cookie.class.getSimpleName())).isTrue();