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

Replace assertThat(x.get(i)). with assertThat(x).element(i).

Browse Source 
Search for   : assertThat\((.+)\.get\((\d+)\)\)\.
Replace with : assertThat($1).element($2).

Closes gh-31759
This commit is contained in:
Yanming Zhou
2023-12-06 14:25:18 +08:00
committed by Brian Clozel
parent 785ad399e9
commit 59815cefce
94 changed files with 549 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,7 +201,7 @@ public class HttpHeadersTests {
void ifMatch() {
String ifMatch = "\"v2.6\"";
headers.setIfMatch(ifMatch);
assertThat(headers.getIfMatch().get(0)).as("Invalid If-Match header").isEqualTo(ifMatch);
assertThat(headers.getIfMatch()).element(0).as("Invalid If-Match header").isEqualTo(ifMatch);
assertThat(headers.getFirst("If-Match")).as("Invalid If-Match header").isEqualTo("\"v2.6\"");
}
@@ -215,8 +215,8 @@ public class HttpHeadersTests {
void ifMatchMultipleHeaders() {
headers.add(HttpHeaders.IF_MATCH, "\"v2,0\"");
headers.add(HttpHeaders.IF_MATCH, "W/\"v2,1\", \"v2,2\"");
assertThat(headers.get(HttpHeaders.IF_MATCH).get(0)).as("Invalid If-Match header").isEqualTo("\"v2,0\"");
assertThat(headers.get(HttpHeaders.IF_MATCH).get(1)).as("Invalid If-Match header").isEqualTo("W/\"v2,1\", \"v2,2\"");
assertThat(headers.get(HttpHeaders.IF_MATCH)).element(0).as("Invalid If-Match header").isEqualTo("\"v2,0\"");
assertThat(headers.get(HttpHeaders.IF_MATCH)).element(1).as("Invalid If-Match header").isEqualTo("W/\"v2,1\", \"v2,2\"");
assertThat(headers.getIfMatch()).contains("\"v2,0\"", "W/\"v2,1\"", "\"v2,2\"");
}
@@ -224,7 +224,7 @@ public class HttpHeadersTests {
void ifNoneMatch() {
String ifNoneMatch = "\"v2.6\"";
headers.setIfNoneMatch(ifNoneMatch);
assertThat(headers.getIfNoneMatch().get(0)).as("Invalid If-None-Match header").isEqualTo(ifNoneMatch);
assertThat(headers.getIfNoneMatch()).element(0).as("Invalid If-None-Match header").isEqualTo(ifNoneMatch);
assertThat(headers.getFirst("If-None-Match")).as("Invalid If-None-Match header").isEqualTo("\"v2.6\"");
}
@@ -232,7 +232,7 @@ public class HttpHeadersTests {
void ifNoneMatchWildCard() {
String ifNoneMatch = "*";
headers.setIfNoneMatch(ifNoneMatch);
assertThat(headers.getIfNoneMatch().get(0)).as("Invalid If-None-Match header").isEqualTo(ifNoneMatch);
assertThat(headers.getIfNoneMatch()).element(0).as("Invalid If-None-Match header").isEqualTo(ifNoneMatch);
assertThat(headers.getFirst("If-None-Match")).as("Invalid If-None-Match header").isEqualTo("*");
}
@@ -485,10 +485,10 @@ public class HttpHeadersTests {
new Locale.LanguageRange("*", 0.5)
);
assertThat(headers.getAcceptLanguage()).isEqualTo(expectedRanges);
assertThat(headers.getAcceptLanguageAsLocales().get(0)).isEqualTo(Locale.forLanguageTag("fr-ch"));
assertThat(headers.getAcceptLanguageAsLocales()).element(0).isEqualTo(Locale.forLanguageTag("fr-ch"));
headers.setAcceptLanguageAsLocales(Collections.singletonList(Locale.FRANCE));
assertThat(headers.getAcceptLanguageAsLocales().get(0)).isEqualTo(Locale.FRANCE);
assertThat(headers.getAcceptLanguageAsLocales()).element(0).isEqualTo(Locale.FRANCE);
}
@Test // SPR-15603
@@ -671,7 +671,7 @@ public class HttpHeadersTests {
headers.keySet().removeIf(key -> key.equals(headerName));
assertThat(headers.isEmpty()).isTrue();
headers.add(headerName, headerValue);
assertThat(headers.get(headerName).get(0)).isEqualTo(headerValue);
assertThat(headers.get(headerName)).element(0).isEqualTo(headerValue);
}
@Test
@@ -685,7 +685,7 @@ public class HttpHeadersTests {
headers.entrySet().removeIf(entry -> entry.getKey().equals(headerName));
assertThat(headers.isEmpty()).isTrue();
headers.add(headerName, headerValue);
assertThat(headers.get(headerName).get(0)).isEqualTo(headerValue);
assertThat(headers.get(headerName)).element(0).isEqualTo(headerValue);
}
@Test

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

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

6
spring-web/src/test/java/org/springframework/http/client/support/InterceptingHttpAccessorTests.java
View File

@@ -49,9 +49,9 @@ public class InterceptingHttpAccessorTests {
);
accessor.setInterceptors(interceptors);
assertThat(accessor.getInterceptors().get(0)).isInstanceOf(FirstClientHttpRequestInterceptor.class);
assertThat(accessor.getInterceptors().get(1)).isInstanceOf(SecondClientHttpRequestInterceptor.class);
assertThat(accessor.getInterceptors().get(2)).isInstanceOf(ThirdClientHttpRequestInterceptor.class);
assertThat(accessor.getInterceptors()).element(0).isInstanceOf(FirstClientHttpRequestInterceptor.class);
assertThat(accessor.getInterceptors()).element(1).isInstanceOf(SecondClientHttpRequestInterceptor.class);
assertThat(accessor.getInterceptors()).element(2).isInstanceOf(ThirdClientHttpRequestInterceptor.class);
}

8
spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageReaderTests.java
View File

@@ -83,8 +83,8 @@ public class FormHttpMessageReaderTests extends AbstractLeakCheckingTests {
assertThat(result.getFirst("name 1")).as("Invalid result").isEqualTo("value 1");
List<String> values = result.get("name 2");
assertThat(values).as("Invalid result").hasSize(2);
assertThat(values.get(0)).as("Invalid result").isEqualTo("value 2+1");
assertThat(values.get(1)).as("Invalid result").isEqualTo("value 2+2");
assertThat(values).element(0).as("Invalid result").isEqualTo("value 2+1");
assertThat(values).element(1).as("Invalid result").isEqualTo("value 2+2");
assertThat(result.getFirst("name 3")).as("Invalid result").isNull();
}
@@ -98,8 +98,8 @@ public class FormHttpMessageReaderTests extends AbstractLeakCheckingTests {
assertThat(result.getFirst("name 1")).as("Invalid result").isEqualTo("value 1");
List<String> values = result.get("name 2");
assertThat(values).as("Invalid result").hasSize(2);
assertThat(values.get(0)).as("Invalid result").isEqualTo("value 2+1");
assertThat(values.get(1)).as("Invalid result").isEqualTo("value 2+2");
assertThat(values).element(0).as("Invalid result").isEqualTo("value 2+1");
assertThat(values).element(1).as("Invalid result").isEqualTo("value 2+2");
assertThat(result.getFirst("name 3")).as("Invalid result").isNull();
}

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

@@ -128,8 +128,8 @@ public class FormHttpMessageConverterTests {
assertThat(result.getFirst("name 1")).as("Invalid result").isEqualTo("value 1");
List<String> values = result.get("name 2");
assertThat(values).as("Invalid result").hasSize(2);
assertThat(values.get(0)).as("Invalid result").isEqualTo("value 2+1");
assertThat(values.get(1)).as("Invalid result").isEqualTo("value 2+2");
assertThat(values).element(0).as("Invalid result").isEqualTo("value 2+1");
assertThat(values).element(1).as("Invalid result").isEqualTo("value 2+2");
assertThat(result.getFirst("name 3")).as("Invalid result").isNull();
}

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

@@ -86,7 +86,7 @@ public class ResourceRegionHttpMessageConverterTests {
assertThat(headers.getContentType()).isEqualTo(MediaType.TEXT_PLAIN);
assertThat(headers.getContentLength()).isEqualTo(6L);
assertThat(headers.get(HttpHeaders.CONTENT_RANGE)).hasSize(1);
assertThat(headers.get(HttpHeaders.CONTENT_RANGE).get(0)).isEqualTo("bytes 0-5/39");
assertThat(headers.get(HttpHeaders.CONTENT_RANGE)).element(0).isEqualTo("bytes 0-5/39");
assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo("Spring");
}
@@ -101,7 +101,7 @@ public class ResourceRegionHttpMessageConverterTests {
assertThat(headers.getContentType()).isEqualTo(MediaType.TEXT_PLAIN);
assertThat(headers.getContentLength()).isEqualTo(32L);
assertThat(headers.get(HttpHeaders.CONTENT_RANGE)).hasSize(1);
assertThat(headers.get(HttpHeaders.CONTENT_RANGE).get(0)).isEqualTo("bytes 7-38/39");
assertThat(headers.get(HttpHeaders.CONTENT_RANGE)).element(0).isEqualTo("bytes 7-38/39");
assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo("Framework test resource content.");
}

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

@@ -79,7 +79,7 @@ class ChannelSendOperatorTests {
assertThat(signal.isOnComplete()).as("Unexpected signal: " + signal).isTrue();
assertThat(this.writer.items).hasSize(1);
assertThat(this.writer.items.get(0)).isEqualTo("one");
assertThat(this.writer.items).element(0).isEqualTo("one");
assertThat(this.writer.completed).isTrue();
}
@@ -94,9 +94,9 @@ class ChannelSendOperatorTests {
assertThat(signal.isOnComplete()).as("Unexpected signal: " + signal).isTrue();
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");
assertThat(this.writer.items).element(0).isEqualTo("one");
assertThat(this.writer.items).element(1).isEqualTo("two");
assertThat(this.writer.items).element(2).isEqualTo("three");
assertThat(this.writer.completed).isTrue();
}
@@ -118,9 +118,9 @@ class ChannelSendOperatorTests {
assertThat(signal.getThrowable()).as("Unexpected signal: " + signal).isSameAs(error);
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");
assertThat(this.writer.items).element(0).isEqualTo("1");
assertThat(this.writer.items).element(1).isEqualTo("2");
assertThat(this.writer.items).element(2).isEqualTo("3");
assertThat(this.writer.error).isSameAs(error);
}

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

@@ -89,7 +89,7 @@ class HeadersAdaptersTests {
headers.add("TestHeader", "first");
headers.add("TestHeader", "second");
assertThat(headers.getFirst("TestHeader")).isEqualTo("first");
assertThat(headers.get("TestHeader").get(0)).isEqualTo("first");
assertThat(headers.get("TestHeader")).element(0).isEqualTo("first");
}
@ParameterizedHeadersTest

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

@@ -65,7 +65,7 @@ public class ListenerWriteProcessorTests {
assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull();
assertThat(this.processor.getDiscardedBuffers()).hasSize(1);
assertThat(this.processor.getDiscardedBuffers().get(0)).isSameAs(buffer);
assertThat(this.processor.getDiscardedBuffers()).element(0).isSameAs(buffer);
}
@Test // SPR-17410
@@ -81,7 +81,7 @@ public class ListenerWriteProcessorTests {
assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull();
assertThat(this.processor.getDiscardedBuffers()).hasSize(1);
assertThat(this.processor.getDiscardedBuffers().get(0)).isSameAs(buffer);
assertThat(this.processor.getDiscardedBuffers()).element(0).isSameAs(buffer);
}
@Test // SPR-17410
@@ -98,8 +98,8 @@ public class ListenerWriteProcessorTests {
assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull();
assertThat(this.processor.getDiscardedBuffers()).hasSize(2);
assertThat(this.processor.getDiscardedBuffers().get(0)).isSameAs(buffer2);
assertThat(this.processor.getDiscardedBuffers().get(1)).isSameAs(buffer1);
assertThat(this.processor.getDiscardedBuffers()).element(0).isSameAs(buffer2);
assertThat(this.processor.getDiscardedBuffers()).element(1).isSameAs(buffer1);
}

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

@@ -243,11 +243,11 @@ class ContentNegotiationManagerFactoryBeanTests {
this.factoryBean.afterPropertiesSet();
ContentNegotiationManager manager = this.factoryBean.getObject();
assertThat(manager.resolveMediaTypes(this.webRequest).get(0)).isEqualTo(MediaType.APPLICATION_JSON);
assertThat(manager.resolveMediaTypes(this.webRequest)).element(0).isEqualTo(MediaType.APPLICATION_JSON);
// SPR-10513
this.servletRequest.addHeader("Accept", MediaType.ALL_VALUE);
assertThat(manager.resolveMediaTypes(this.webRequest).get(0)).isEqualTo(MediaType.APPLICATION_JSON);
assertThat(manager.resolveMediaTypes(this.webRequest)).element(0).isEqualTo(MediaType.APPLICATION_JSON);
}
@Test // SPR-15367

2
spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java
View File

@@ -45,7 +45,7 @@ public class MappingMediaTypeFileExtensionResolverTests {
.resolveFileExtensions(MediaType.APPLICATION_JSON);
assertThat(extensions).hasSize(1);
assertThat(extensions.get(0)).isEqualTo("json");
assertThat(extensions).element(0).isEqualTo("json");
}
@Test

4
spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
View File

@@ -525,8 +525,8 @@ class RestTemplateTests {
.toList();
assertThat(accepts).hasSize(1);
assertThat(accepts.get(0)).hasSize(1);
assertThat(accepts.get(0).get(0)).isEqualTo("application/json");
assertThat(accepts).element(0).asList().hasSize(1);
assertThat(accepts.get(0)).element(0).isEqualTo("application/json");
}
}

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

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

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

@@ -147,10 +147,10 @@ public class RequestParamMapMethodArgumentResolverTests {
MultiValueMap<String, MultipartFile> resultMap = (MultiValueMap<String, MultipartFile>) result;
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("mfilelist")).element(0).isEqualTo(expected1);
assertThat(resultMap.get("mfilelist")).element(1).isEqualTo(expected2);
assertThat(resultMap.get("other")).hasSize(1);
assertThat(resultMap.get("other").get(0)).isEqualTo(expected3);
assertThat(resultMap.get("other")).element(0).isEqualTo(expected3);
}
@Test
@@ -196,10 +196,10 @@ public class RequestParamMapMethodArgumentResolverTests {
MultiValueMap<String, Part> resultMap = (MultiValueMap<String, Part>) result;
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("mfilelist")).element(0).isEqualTo(expected1);
assertThat(resultMap.get("mfilelist")).element(1).isEqualTo(expected2);
assertThat(resultMap.get("other")).hasSize(1);
assertThat(resultMap.get("other").get(0)).isEqualTo(expected3);
assertThat(resultMap.get("other")).element(0).isEqualTo(expected3);
}

2
spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
View File

@@ -380,7 +380,7 @@ public class RequestParamMethodArgumentResolverTests {
Object actual = resolver.resolveArgument(param, null, webRequest, null);
boolean condition = actual instanceof List;
assertThat(condition).isTrue();
assertThat(((List<?>) actual).get(0)).isEqualTo(expected);
assertThat(((List<?>) actual)).element(0).isEqualTo(expected);
}
@Test

2
spring-web/src/test/java/org/springframework/web/service/invoker/HttpServiceMethodTests.java
View File

@@ -91,7 +91,7 @@ class HttpServiceMethodTests {
assertThat(voidEntity.getBody()).isNull();
List<String> list = service.getList();
assertThat(list.get(0)).isEqualTo("exchangeForBody");
assertThat(list).element(0).isEqualTo("exchangeForBody");
}
@Test

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

@@ -599,14 +599,14 @@ class UriComponentsBuilderTests {
void queryParamWithValueWithEquals() {
UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar=baz").build();
assertThat(uriComponents.toUriString()).isEqualTo("https://example.com/foo?bar=baz");
assertThat(uriComponents.getQueryParams().get("bar").get(0)).isEqualTo("baz");
assertThat(uriComponents.getQueryParams().get("bar")).element(0).isEqualTo("baz");
}
@Test
void queryParamWithoutValueWithEquals() {
UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar=").build();
assertThat(uriComponents.toUriString()).isEqualTo("https://example.com/foo?bar=");
assertThat(uriComponents.getQueryParams().get("bar").get(0)).isEmpty();
assertThat(uriComponents.getQueryParams().get("bar")).element(0).asString().isEmpty();
}
@Test
@@ -615,7 +615,7 @@ class UriComponentsBuilderTests {
assertThat(uriComponents.toUriString()).isEqualTo("https://example.com/foo?bar");
// TODO [SPR-13537] Change equalTo(null) to equalTo("").
assertThat(uriComponents.getQueryParams().get("bar").get(0)).isNull();
assertThat(uriComponents.getQueryParams().get("bar")).element(0).isNull();
}
@Test // gh-24444

10
spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternParserTests.java
View File

@@ -365,7 +365,7 @@ public class PathPatternParserTests {
patterns.add(p3);
patterns.add(p1);
Collections.sort(patterns);
assertThat(patterns.get(0)).isEqualTo(p1);
assertThat(patterns).element(0).isEqualTo(p1);
// Based purely on length
p1 = parse("/a/b/c");
@@ -377,7 +377,7 @@ public class PathPatternParserTests {
patterns.add(p3);
patterns.add(p1);
Collections.sort(patterns);
assertThat(patterns.get(0)).isEqualTo(p3);
assertThat(patterns).element(0).isEqualTo(p3);
// Based purely on 'wildness'
p1 = parse("/*");
@@ -389,7 +389,7 @@ public class PathPatternParserTests {
patterns.add(p3);
patterns.add(p1);
Collections.sort(patterns);
assertThat(patterns.get(0)).isEqualTo(p1);
assertThat(patterns).element(0).isEqualTo(p1);
// Based purely on catchAll
p1 = parse("{*foobar}");
@@ -410,8 +410,8 @@ public class PathPatternParserTests {
patterns.add(p3);
patterns.add(p1);
Collections.sort(patterns);
assertThat(patterns.get(0)).isEqualTo(p3);
assertThat(patterns.get(1)).isEqualTo(p2);
assertThat(patterns).element(0).isEqualTo(p3);
assertThat(patterns).element(1).isEqualTo(p2);
}
@Test

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

@@ -1043,15 +1043,15 @@ public class PathPatternTests {
paths.add(null);
paths.add(null);
paths.sort(comparator);
assertThat(paths.get(0)).isNull();
assertThat(paths.get(1)).isNull();
assertThat(paths).element(0).isNull();
assertThat(paths).element(1).isNull();
paths.clear();
paths.add(null);
paths.add(pp.parse("/hotels/new"));
paths.sort(comparator);
assertThat(paths.get(0).getPatternString()).isEqualTo("/hotels/new");
assertThat(paths.get(1)).isNull();
assertThat(paths).element(1).isNull();
paths.clear();
paths.add(pp.parse("/hotels/*"));