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

Replace assertThat(x.contains(y)).isTrue() with assertThat(x).contains(y)

Browse Source 
Search for   : assertThat\((.+)\.contains\((.+)\)\)\.isTrue\(\)
Replace with : assertThat($1).contains($2)

Search for   : assertThat\((.+)\.contains\((.+)\)\)\.isFalse\(\)
Replace with : assertThat($1).doesNotContain($2)

Closes gh-31762
This commit is contained in:
Yanming Zhou
2023-12-06 12:45:06 +08:00
committed by Brian Clozel
parent 1a63257b12
commit e2852e7355
39 changed files with 234 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
View File

@@ -160,8 +160,8 @@ public class ServletContextSupportTests {
foundPaths.add(((ServletContextResource) resource).getPath());
}
assertThat(foundPaths).hasSize(2);
assertThat(foundPaths.contains("/WEB-INF/context1.xml")).isTrue();
assertThat(foundPaths.contains("/WEB-INF/context2.xml")).isTrue();
assertThat(foundPaths).contains("/WEB-INF/context1.xml");
assertThat(foundPaths).contains("/WEB-INF/context2.xml");
}
@Test
@@ -193,8 +193,8 @@ public class ServletContextSupportTests {
foundPaths.add(((ServletContextResource) resource).getPath());
}
assertThat(foundPaths).hasSize(2);
assertThat(foundPaths.contains("/WEB-INF/mydir1/context1.xml")).isTrue();
assertThat(foundPaths.contains("/WEB-INF/mydir2/context2.xml")).isTrue();
assertThat(foundPaths).contains("/WEB-INF/mydir1/context1.xml");
assertThat(foundPaths).contains("/WEB-INF/mydir2/context2.xml");
}
@Test
@@ -233,9 +233,9 @@ public class ServletContextSupportTests {
foundPaths.add(((ServletContextResource) resource).getPath());
}
assertThat(foundPaths).hasSize(3);
assertThat(foundPaths.contains("/WEB-INF/mydir1/context1.xml")).isTrue();
assertThat(foundPaths.contains("/WEB-INF/mydir2/context2.xml")).isTrue();
assertThat(foundPaths.contains("/WEB-INF/mydir2/mydir3/context3.xml")).isTrue();
assertThat(foundPaths).contains("/WEB-INF/mydir1/context1.xml");
assertThat(foundPaths).contains("/WEB-INF/mydir2/context2.xml");
assertThat(foundPaths).contains("/WEB-INF/mydir2/mydir3/context3.xml");
}
@Test
@@ -262,8 +262,8 @@ public class ServletContextSupportTests {
foundPaths.add(((ServletContextResource) resource).getPath());
}
assertThat(foundPaths).hasSize(2);
assertThat(foundPaths.contains("/WEB-INF/context1.xml")).isTrue();
assertThat(foundPaths.contains("/WEB-INF/context2.xml")).isTrue();
assertThat(foundPaths).contains("/WEB-INF/context1.xml");
assertThat(foundPaths).contains("/WEB-INF/context2.xml");
}
}

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

@@ -160,7 +160,7 @@ class DefaultEntityResponseBuilderTests {
EntityResponse<String> result =
EntityResponse.fromObject("foo").cookie(cookie)
.build();
assertThat(result.cookies().get("name").contains(cookie)).isTrue();
assertThat(result.cookies().get("name")).contains(cookie);
}
@Test

4
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
View File

@@ -120,7 +120,7 @@ public class ExceptionHandlerExceptionResolverTests {
this.resolver.setCustomArgumentResolvers(Collections.singletonList(argumentResolver));
this.resolver.afterPropertiesSet();
assertThat(this.resolver.getArgumentResolvers().getResolvers().contains(argumentResolver)).isTrue();
assertThat(this.resolver.getArgumentResolvers().getResolvers()).contains(argumentResolver);
assertMethodProcessorCount(DEFAULT_RESOLVER_COUNT + 1, DEFAULT_HANDLER_COUNT);
}
@@ -139,7 +139,7 @@ public class ExceptionHandlerExceptionResolverTests {
this.resolver.setCustomReturnValueHandlers(Collections.singletonList(handler));
this.resolver.afterPropertiesSet();
assertThat(this.resolver.getReturnValueHandlers().getHandlers().contains(handler)).isTrue();
assertThat(this.resolver.getReturnValueHandlers().getHandlers()).contains(handler);
assertMethodProcessorCount(DEFAULT_RESOLVER_COUNT, DEFAULT_HANDLER_COUNT + 1);
}

4
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java
View File

@@ -154,7 +154,7 @@ public class RequestMappingHandlerAdapterTests {
this.handlerAdapter.setCustomArgumentResolvers(Collections.singletonList(resolver));
this.handlerAdapter.afterPropertiesSet();
assertThat(this.handlerAdapter.getArgumentResolvers().contains(resolver)).isTrue();
assertThat(this.handlerAdapter.getArgumentResolvers()).contains(resolver);
assertMethodProcessorCount(RESOLVER_COUNT + 1, INIT_BINDER_RESOLVER_COUNT + 1, HANDLER_COUNT);
}
@@ -182,7 +182,7 @@ public class RequestMappingHandlerAdapterTests {
this.handlerAdapter.setCustomReturnValueHandlers(Collections.singletonList(handler));
this.handlerAdapter.afterPropertiesSet();
assertThat(this.handlerAdapter.getReturnValueHandlers().contains(handler)).isTrue();
assertThat(this.handlerAdapter.getReturnValueHandlers()).contains(handler);
assertMethodProcessorCount(RESOLVER_COUNT, INIT_BINDER_RESOLVER_COUNT, HANDLER_COUNT + 1);
}

10
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
View File

@@ -377,7 +377,7 @@ public class UrlTagTests extends AbstractTagTests {
String uri = tag.replaceUriTemplateParams("url/{name}", params, usedParams);
assertThat(uri).isEqualTo("url/value");
assertThat(usedParams).hasSize(1);
assertThat(usedParams.contains("name")).isTrue();
assertThat(usedParams).contains("name");
}
@Test
@@ -393,7 +393,7 @@ public class UrlTagTests extends AbstractTagTests {
String uri = tag.replaceUriTemplateParams("url/{n me}", params, usedParams);
assertThat(uri).isEqualTo("url/value");
assertThat(usedParams).hasSize(1);
assertThat(usedParams.contains("n me")).isTrue();
assertThat(usedParams).contains("n me");
}
@Test
@@ -411,7 +411,7 @@ public class UrlTagTests extends AbstractTagTests {
assertThat(uri).isEqualTo("url/v%20lue");
assertThat(usedParams).hasSize(1);
assertThat(usedParams.contains("name")).isTrue();
assertThat(usedParams).contains("name");
}
@Test // SPR-11401
@@ -428,7 +428,7 @@ public class UrlTagTests extends AbstractTagTests {
assertThat(uri).isEqualTo("url/my%2FId");
assertThat(usedParams).hasSize(1);
assertThat(usedParams.contains("name")).isTrue();
assertThat(usedParams).contains("name");
}
@Test
@@ -444,7 +444,7 @@ public class UrlTagTests extends AbstractTagTests {
String uri = tag.replaceUriTemplateParams("url/{name}", params, usedParams);
assertThat(uri).isEqualTo("url/my/Id");
assertThat(usedParams).hasSize(1);
assertThat(usedParams.contains("name")).isTrue();
assertThat(usedParams).contains("name");
}
@Test