admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert assertThat(x instanceof X).isTrue() to assertThat(x).isInstanceOf()

Browse Source 
Search:  assertThat\((.+?) instanceof (.+?)\)(.*?)\.isTrue\(\)

Replace: assertThat($1)$3.isInstanceOf($2.class)

See gh-36504
This commit is contained in:
Sam Brannen
2026-03-19 15:13:12 +01:00
parent 4357bbd31b
commit a40ec44cb7
70 changed files with 176 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
+2 -2
View File
@@ -226,7 +226,7 @@ class ServletRequestDataBinderTests {
ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request);
assertThat(pvs.getPropertyValues().length).as("Found 1 parameter").isEqualTo(1);
assertThat(pvs.getPropertyValue("forname").getValue() instanceof String[]).as("Found array value").isTrue();
assertThat(pvs.getPropertyValue("forname").getValue()).as("Found array value").isInstanceOf(String[].class);
String[] values = (String[]) pvs.getPropertyValue("forname").getValue();
assertThat(Arrays.asList(original)).as("Correct values").isEqualTo(Arrays.asList(values));
}
@@ -249,7 +249,7 @@ class ServletRequestDataBinderTests {
for (PropertyValue element : ps) {
Object val = m.get(element.getName());
assertThat(val).as("Can't have unexpected value").isNotNull();
assertThat(val instanceof String).as("Val i string").isTrue();
assertThat(val).as("Val i string").isInstanceOf(String.class);
assertThat(val.equals(element.getValue())).as("val matches expected").isTrue();
m.remove(element.getName());
}
spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java
+2 -2
View File
@@ -332,7 +332,7 @@ class WebRequestDataBinderTests {
for (PropertyValue pv : pvArray) {
Object val = m.get(pv.getName());
assertThat(val).as("Can't have unexpected value").isNotNull();
assertThat(val instanceof String).as("Val i string").isTrue();
assertThat(val).as("Val i string").isInstanceOf(String.class);
assertThat(val.equals(pv.getValue())).as("val matches expected").isTrue();
m.remove(pv.getName());
}
@@ -354,7 +354,7 @@ class WebRequestDataBinderTests {
ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request);
assertThat(pvs.getPropertyValues().length).as("Found 1 parameter").isEqualTo(1);
assertThat(pvs.getPropertyValue("forname").getValue() instanceof String[]).as("Found array value").isTrue();
assertThat(pvs.getPropertyValue("forname").getValue()).as("Found array value").isInstanceOf(String[].class);
String[] values = (String[]) pvs.getPropertyValue("forname").getValue();
assertThat(Arrays.asList(original)).as("Correct values").isEqualTo(Arrays.asList(values));
}
spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java
+2 -2
View File
@@ -55,7 +55,7 @@ class ContextLoaderInitializerTests {
void register() throws ServletException {
initializer.onStartup(servletContext);
assertThat(eventListener instanceof ContextLoaderListener).isTrue();
assertThat(eventListener).isInstanceOf(ContextLoaderListener.class);
ContextLoaderListener cll = (ContextLoaderListener) eventListener;
cll.contextInitialized(new ServletContextEvent(servletContext));
@@ -63,7 +63,7 @@ class ContextLoaderInitializerTests {
.getRequiredWebApplicationContext(servletContext);
assertThat(applicationContext.containsBean(BEAN_NAME)).isTrue();
assertThat(applicationContext.getBean(BEAN_NAME) instanceof MyBean).isTrue();
assertThat(applicationContext.getBean(BEAN_NAME)).isInstanceOf(MyBean.class);
}
private class MyMockServletContext extends MockServletContext {
spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
+1 -1
View File
@@ -104,7 +104,7 @@ class RequestScopeTests {
String name = "requestScopedFactoryBean";
assertThat(request.getAttribute(name)).isNull();
TestBean bean = (TestBean) this.beanFactory.getBean(name);
assertThat(request.getAttribute(name) instanceof FactoryBean).isTrue();
assertThat(request.getAttribute(name)).isInstanceOf(FactoryBean.class);
assertThat(this.beanFactory.getBean(name)).isSameAs(bean);
}
spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java
+1 -1
View File
@@ -50,7 +50,7 @@ class SpringBeanAutowiringSupportTests {
InjectionTarget target = new InjectionTarget();
SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(target, sc);
assertThat(target.testBean instanceof TestBean).isTrue();
assertThat(target.testBean).isInstanceOf(TestBean.class);
assertThat(target.name).isEqualTo("tb");
}
spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java
+1 -1
View File
@@ -80,7 +80,7 @@ class CookieValueMethodArgumentResolverTests {
void resolveCookieDefaultValue() throws Exception {
Object result = resolver.resolveArgument(paramNamedDefaultValueString, null, webRequest, null);
assertThat(result instanceof String).isTrue();
assertThat(result).isInstanceOf(String.class);
assertThat(result).as("Invalid result").isEqualTo("bar");
}
spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java
+3 -3
View File
@@ -91,7 +91,7 @@ class RequestHeaderMapMethodArgumentResolverTests {
Object result = resolver.resolveArgument(paramMap, null, webRequest, null);
assertThat(result instanceof Map).isTrue();
assertThat(result).isInstanceOf(Map.class);
assertThat(result).as("Invalid result").isEqualTo(expected);
}
@@ -110,7 +110,7 @@ class RequestHeaderMapMethodArgumentResolverTests {
Object result = resolver.resolveArgument(paramMultiValueMap, null, webRequest, null);
assertThat(result instanceof MultiValueMap).isTrue();
assertThat(result).isInstanceOf(MultiValueMap.class);
assertThat(result).as("Invalid result").isEqualTo(expected);
}
@@ -129,7 +129,7 @@ class RequestHeaderMapMethodArgumentResolverTests {
Object result = resolver.resolveArgument(paramHttpHeaders, null, webRequest, null);
assertThat(result instanceof HttpHeaders).isTrue();
assertThat(result).isInstanceOf(HttpHeaders.class);
assertThat(result).as("Invalid result").isEqualTo(expected);
}
spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java
+6 -6
View File
@@ -82,7 +82,7 @@ class RequestParamMapMethodArgumentResolverTests {
MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(Map.class, String.class, String.class);
Object result = resolver.resolveArgument(param, null, webRequest, null);
assertThat(result instanceof Map).isTrue();
assertThat(result).isInstanceOf(Map.class);
assertThat(result).as("Invalid result").isEqualTo(expected);
}
@@ -100,7 +100,7 @@ class RequestParamMapMethodArgumentResolverTests {
MethodParameter param = this.testMethod.annotPresent(RequestParam.class).arg(MultiValueMap.class, String.class, String.class);
Object result = resolver.resolveArgument(param, null, webRequest, null);
assertThat(result instanceof MultiValueMap).isTrue();
assertThat(result).isInstanceOf(MultiValueMap.class);
assertThat(result).as("Invalid result").isEqualTo(expected);
}
@@ -117,7 +117,7 @@ class RequestParamMapMethodArgumentResolverTests {
MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(Map.class, String.class, MultipartFile.class);
Object result = resolver.resolveArgument(param, null, webRequest, null);
assertThat(result instanceof Map).isTrue();
assertThat(result).isInstanceOf(Map.class);
Map<String, MultipartFile> resultMap = (Map<String, MultipartFile>) result;
assertThat(resultMap).hasSize(2);
assertThat(resultMap.get("mfile")).isEqualTo(expected1);
@@ -139,7 +139,7 @@ class RequestParamMapMethodArgumentResolverTests {
MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(MultiValueMap.class, String.class, MultipartFile.class);
Object result = resolver.resolveArgument(param, null, webRequest, null);
assertThat(result instanceof MultiValueMap).isTrue();
assertThat(result).isInstanceOf(MultiValueMap.class);
MultiValueMap<String, MultipartFile> resultMap = (MultiValueMap<String, MultipartFile>) result;
assertThat(resultMap).hasSize(2);
assertThat(resultMap.get("mfilelist")).containsExactly(expected1, expected2);
@@ -160,7 +160,7 @@ class RequestParamMapMethodArgumentResolverTests {
MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(Map.class, String.class, Part.class);
Object result = resolver.resolveArgument(param, null, webRequest, null);
assertThat(result instanceof Map).isTrue();
assertThat(result).isInstanceOf(Map.class);
Map<String, Part> resultMap = (Map<String, Part>) result;
assertThat(resultMap).hasSize(2);
assertThat(resultMap.get("mfile")).isEqualTo(expected1);
@@ -183,7 +183,7 @@ class RequestParamMapMethodArgumentResolverTests {
MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(MultiValueMap.class, String.class, Part.class);
Object result = resolver.resolveArgument(param, null, webRequest, null);
assertThat(result instanceof MultiValueMap).isTrue();
assertThat(result).isInstanceOf(MultiValueMap.class);
MultiValueMap<String, Part> resultMap = (MultiValueMap<String, Part>) result;
assertThat(resultMap).hasSize(2);
assertThat(resultMap.get("mfilelist")).containsExactly(expected1, expected2);
spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java
+1 -1
View File
@@ -104,7 +104,7 @@ class SessionAttributesHandlerTests {
assertThat(sessionAttributeStore.retrieveAttribute(request, "attr1")).isEqualTo("value1");
assertThat(sessionAttributeStore.retrieveAttribute(request, "attr2")).isEqualTo("value2");
assertThat(sessionAttributeStore.retrieveAttribute(request, "attr3") instanceof TestBean).isTrue();
assertThat(sessionAttributeStore.retrieveAttribute(request, "attr3")).isInstanceOf(TestBean.class);
}
spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java
+1 -1
View File
@@ -66,7 +66,7 @@ class WebHttpHandlerBuilderTests {
context.refresh();
HttpHandler httpHandler = WebHttpHandlerBuilder.applicationContext(context).build();
assertThat(httpHandler instanceof HttpWebHandlerAdapter).isTrue();
assertThat(httpHandler).isInstanceOf(HttpWebHandlerAdapter.class);
assertThat(((HttpWebHandlerAdapter) httpHandler).getApplicationContext()).isSameAs(context);
MockServerHttpRequest request = MockServerHttpRequest.get("/").build();