spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-21 21:39:05 +00:00
Code Issues Projects Releases Wiki Activity

Inline conditions in assertThat() statements

Browse Source 
Search: assertThat\(conditions?[0-9]?\)

See gh-36504
This commit is contained in:
Sam Brannen
2026-03-20 10:53:54 +01:00
parent 9e71dc6029
commit 4548f1ec66
76 changed files with 207 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
+4 -8
View File
@@ -204,8 +204,7 @@ class ServletRequestDataBinderTests {
request.addParameter("test_age", "" + 50);
ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request);
boolean condition = !pvs.contains("forname");
assertThat(condition).as("Didn't find normal when given prefix").isTrue();
assertThat(!pvs.contains("forname")).as("Didn't find normal when given prefix").isTrue();
assertThat(pvs.contains("test_forname")).as("Did treat prefix as normal when not given prefix").isTrue();
pvs = new ServletRequestParameterPropertyValues(request, "test");
@@ -227,8 +226,7 @@ class ServletRequestDataBinderTests {
ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request);
assertThat(pvs.getPropertyValues().length).as("Found 1 parameter").isEqualTo(1);
boolean condition = pvs.getPropertyValue("forname").getValue() instanceof String[];
assertThat(condition).as("Found array value").isTrue();
assertThat(pvs.getPropertyValue("forname").getValue() instanceof String[]).as("Found array value").isTrue();
String[] values = (String[]) pvs.getPropertyValue("forname").getValue();
assertThat(Arrays.asList(original)).as("Correct values").isEqualTo(Arrays.asList(values));
}
@@ -241,8 +239,7 @@ class ServletRequestDataBinderTests {
assertThat(pvs.contains("forname")).as("Contains forname").isTrue();
assertThat(pvs.contains("surname")).as("Contains surname").isTrue();
assertThat(pvs.contains("age")).as("Contains age").isTrue();
boolean condition1 = !pvs.contains("tory");
assertThat(condition1).as("Doesn't contain tory").isTrue();
assertThat(!pvs.contains("tory")).as("Doesn't contain tory").isTrue();
PropertyValue[] ps = pvs.getPropertyValues();
Map<String, String> m = new HashMap<>();
@@ -252,8 +249,7 @@ class ServletRequestDataBinderTests {
for (PropertyValue element : ps) {
Object val = m.get(element.getName());
assertThat(val).as("Can't have unexpected value").isNotNull();
boolean condition = val instanceof String;
assertThat(condition).as("Val i string").isTrue();
assertThat(val instanceof String).as("Val i string").isTrue();
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
+4 -8
View File
@@ -307,8 +307,7 @@ class WebRequestDataBinderTests {
request.addParameter("test_age", "" + 50);
ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request);
boolean condition = !pvs.contains("forname");
assertThat(condition).as("Didn't find normal when given prefix").isTrue();
assertThat(!pvs.contains("forname")).as("Didn't find normal when given prefix").isTrue();
assertThat(pvs.contains("test_forname")).as("Did treat prefix as normal when not given prefix").isTrue();
pvs = new ServletRequestParameterPropertyValues(request, "test");
@@ -323,8 +322,7 @@ class WebRequestDataBinderTests {
assertThat(pvs.contains("forname")).as("Contains forname").isTrue();
assertThat(pvs.contains("surname")).as("Contains surname").isTrue();
assertThat(pvs.contains("age")).as("Contains age").isTrue();
boolean condition1 = !pvs.contains("tory");
assertThat(condition1).as("Doesn't contain tory").isTrue();
assertThat(!pvs.contains("tory")).as("Doesn't contain tory").isTrue();
PropertyValue[] pvArray = pvs.getPropertyValues();
Map<String, String> m = new HashMap<>();
@@ -334,8 +332,7 @@ class WebRequestDataBinderTests {
for (PropertyValue pv : pvArray) {
Object val = m.get(pv.getName());
assertThat(val).as("Can't have unexpected value").isNotNull();
boolean condition = val instanceof String;
assertThat(condition).as("Val i string").isTrue();
assertThat(val instanceof String).as("Val i string").isTrue();
assertThat(val.equals(pv.getValue())).as("val matches expected").isTrue();
m.remove(pv.getName());
}
@@ -357,8 +354,7 @@ class WebRequestDataBinderTests {
ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request);
assertThat(pvs.getPropertyValues().length).as("Found 1 parameter").isEqualTo(1);
boolean condition = pvs.getPropertyValue("forname").getValue() instanceof String[];
assertThat(condition).as("Found array value").isTrue();
assertThat(pvs.getPropertyValue("forname").getValue() instanceof String[]).as("Found array value").isTrue();
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 -4
View File
@@ -55,8 +55,7 @@ class ContextLoaderInitializerTests {
void register() throws ServletException {
initializer.onStartup(servletContext);
boolean condition1 = eventListener instanceof ContextLoaderListener;
assertThat(condition1).isTrue();
assertThat(eventListener instanceof ContextLoaderListener).isTrue();
ContextLoaderListener cll = (ContextLoaderListener) eventListener;
cll.contextInitialized(new ServletContextEvent(servletContext));
@@ -64,8 +63,7 @@ class ContextLoaderInitializerTests {
.getRequiredWebApplicationContext(servletContext);
assertThat(applicationContext.containsBean(BEAN_NAME)).isTrue();
boolean condition = applicationContext.getBean(BEAN_NAME) instanceof MyBean;
assertThat(condition).isTrue();
assertThat(applicationContext.getBean(BEAN_NAME) instanceof MyBean).isTrue();
}
private class MyMockServletContext extends MockServletContext {
spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
+1 -2
View File
@@ -104,8 +104,7 @@ class RequestScopeTests {
String name = "requestScopedFactoryBean";
assertThat(request.getAttribute(name)).isNull();
TestBean bean = (TestBean) this.beanFactory.getBean(name);
boolean condition = request.getAttribute(name) instanceof FactoryBean;
assertThat(condition).isTrue();
assertThat(request.getAttribute(name) instanceof FactoryBean).isTrue();
assertThat(this.beanFactory.getBean(name)).isSameAs(bean);
}
spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java
+1 -2
View File
@@ -50,8 +50,7 @@ class SpringBeanAutowiringSupportTests {
InjectionTarget target = new InjectionTarget();
SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(target, sc);
boolean condition = target.testBean instanceof TestBean;
assertThat(condition).isTrue();
assertThat(target.testBean instanceof TestBean).isTrue();
assertThat(target.name).isEqualTo("tb");
}
spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java
+1 -2
View File
@@ -80,8 +80,7 @@ class CookieValueMethodArgumentResolverTests {
void resolveCookieDefaultValue() throws Exception {
Object result = resolver.resolveArgument(paramNamedDefaultValueString, null, webRequest, null);
boolean condition = result instanceof String;
assertThat(condition).isTrue();
assertThat(result instanceof String).isTrue();
assertThat(result).as("Invalid result").isEqualTo("bar");
}
spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java
+3 -6
View File
@@ -91,8 +91,7 @@ class RequestHeaderMapMethodArgumentResolverTests {
Object result = resolver.resolveArgument(paramMap, null, webRequest, null);
boolean condition = result instanceof Map;
assertThat(condition).isTrue();
assertThat(result instanceof Map).isTrue();
assertThat(result).as("Invalid result").isEqualTo(expected);
}
@@ -111,8 +110,7 @@ class RequestHeaderMapMethodArgumentResolverTests {
Object result = resolver.resolveArgument(paramMultiValueMap, null, webRequest, null);
boolean condition = result instanceof MultiValueMap;
assertThat(condition).isTrue();
assertThat(result instanceof MultiValueMap).isTrue();
assertThat(result).as("Invalid result").isEqualTo(expected);
}
@@ -131,8 +129,7 @@ class RequestHeaderMapMethodArgumentResolverTests {
Object result = resolver.resolveArgument(paramHttpHeaders, null, webRequest, null);
boolean condition = result instanceof HttpHeaders;
assertThat(condition).isTrue();
assertThat(result instanceof HttpHeaders).isTrue();
assertThat(result).as("Invalid result").isEqualTo(expected);
}
spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java
+6 -12
View File
@@ -82,8 +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);
boolean condition = result instanceof Map;
assertThat(condition).isTrue();
assertThat(result instanceof Map).isTrue();
assertThat(result).as("Invalid result").isEqualTo(expected);
}
@@ -101,8 +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);
boolean condition = result instanceof MultiValueMap;
assertThat(condition).isTrue();
assertThat(result instanceof MultiValueMap).isTrue();
assertThat(result).as("Invalid result").isEqualTo(expected);
}
@@ -119,8 +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);
boolean condition = result instanceof Map;
assertThat(condition).isTrue();
assertThat(result instanceof Map).isTrue();
Map<String, MultipartFile> resultMap = (Map<String, MultipartFile>) result;
assertThat(resultMap).hasSize(2);
assertThat(resultMap.get("mfile")).isEqualTo(expected1);
@@ -142,8 +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);
boolean condition = result instanceof MultiValueMap;
assertThat(condition).isTrue();
assertThat(result instanceof MultiValueMap).isTrue();
MultiValueMap<String, MultipartFile> resultMap = (MultiValueMap<String, MultipartFile>) result;
assertThat(resultMap).hasSize(2);
assertThat(resultMap.get("mfilelist")).containsExactly(expected1, expected2);
@@ -164,8 +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);
boolean condition = result instanceof Map;
assertThat(condition).isTrue();
assertThat(result instanceof Map).isTrue();
Map<String, Part> resultMap = (Map<String, Part>) result;
assertThat(resultMap).hasSize(2);
assertThat(resultMap.get("mfile")).isEqualTo(expected1);
@@ -188,8 +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);
boolean condition = result instanceof MultiValueMap;
assertThat(condition).isTrue();
assertThat(result instanceof MultiValueMap).isTrue();
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 -2
View File
@@ -104,8 +104,7 @@ class SessionAttributesHandlerTests {
assertThat(sessionAttributeStore.retrieveAttribute(request, "attr1")).isEqualTo("value1");
assertThat(sessionAttributeStore.retrieveAttribute(request, "attr2")).isEqualTo("value2");
boolean condition = sessionAttributeStore.retrieveAttribute(request, "attr3") instanceof TestBean;
assertThat(condition).isTrue();
assertThat(sessionAttributeStore.retrieveAttribute(request, "attr3") instanceof TestBean).isTrue();
}
spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java
+1 -2
View File
@@ -66,8 +66,7 @@ class WebHttpHandlerBuilderTests {
context.refresh();
HttpHandler httpHandler = WebHttpHandlerBuilder.applicationContext(context).build();
boolean condition = httpHandler instanceof HttpWebHandlerAdapter;
assertThat(condition).isTrue();
assertThat(httpHandler instanceof HttpWebHandlerAdapter).isTrue();
assertThat(((HttpWebHandlerAdapter) httpHandler).getApplicationContext()).isSameAs(context);
MockServerHttpRequest request = MockServerHttpRequest.get("/").build();