Migrate JUnit 4 assertions to AssertJ

Migrate all existing JUnit 4 `assert...` based assertions to AssertJ
and add a checkstyle rule to ensure they don't return.

See gh-23022

spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java

@@ -47,11 +47,6 @@ import org.springframework.web.servlet.SimpleWebApplicationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Tests for {@link ContextLoader} and {@link ContextLoaderListener}.
@@ -75,19 +70,21 @@ public class ContextLoaderTests {
 		listener.contextInitialized(event);
 		String contextAttr = WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE;
 		WebApplicationContext context = (WebApplicationContext) sc.getAttribute(contextAttr);
-		assertTrue("Correct WebApplicationContext exposed in ServletContext", context instanceof XmlWebApplicationContext);
-		assertTrue(WebApplicationContextUtils.getRequiredWebApplicationContext(sc) instanceof XmlWebApplicationContext);
+		boolean condition1 = context instanceof XmlWebApplicationContext;
+		assertThat(condition1).as("Correct WebApplicationContext exposed in ServletContext").isTrue();
+		assertThat(WebApplicationContextUtils.getRequiredWebApplicationContext(sc) instanceof XmlWebApplicationContext).isTrue();
 		LifecycleBean lb = (LifecycleBean) context.getBean("lifecycle");
-		assertTrue("Has father", context.containsBean("father"));
-		assertTrue("Has rod", context.containsBean("rod"));
-		assertTrue("Has kerry", context.containsBean("kerry"));
-		assertTrue("Not destroyed", !lb.isDestroyed());
-		assertFalse(context.containsBean("beans1.bean1"));
-		assertFalse(context.containsBean("beans1.bean2"));
+		assertThat(context.containsBean("father")).as("Has father").isTrue();
+		assertThat(context.containsBean("rod")).as("Has rod").isTrue();
+		assertThat(context.containsBean("kerry")).as("Has kerry").isTrue();
+		boolean condition = !lb.isDestroyed();
+		assertThat(condition).as("Not destroyed").isTrue();
+		assertThat(context.containsBean("beans1.bean1")).isFalse();
+		assertThat(context.containsBean("beans1.bean2")).isFalse();
 		listener.contextDestroyed(event);
-		assertTrue("Destroyed", lb.isDestroyed());
-		assertNull(sc.getAttribute(contextAttr));
-		assertNull(WebApplicationContextUtils.getWebApplicationContext(sc));
+		assertThat(lb.isDestroyed()).as("Destroyed").isTrue();
+		assertThat(sc.getAttribute(contextAttr)).isNull();
+		assertThat(WebApplicationContextUtils.getWebApplicationContext(sc)).isNull();
 	}
 
 	/**
@@ -106,14 +103,14 @@ public class ContextLoaderTests {
 		ServletContextListener listener = new ContextLoaderListener() {
 			@Override
 			protected void customizeContext(ServletContext sc, ConfigurableWebApplicationContext wac) {
-				assertNotNull("The ServletContext should not be null.", sc);
-				assertEquals("Verifying that we received the expected ServletContext.", sc, sc);
-				assertFalse("The ApplicationContext should not yet have been refreshed.", wac.isActive());
+				assertThat(sc).as("The ServletContext should not be null.").isNotNull();
+				assertThat(sc).as("Verifying that we received the expected ServletContext.").isEqualTo(sc);
+				assertThat(wac.isActive()).as("The ApplicationContext should not yet have been refreshed.").isFalse();
 				buffer.append(expectedContents);
 			}
 		};
 		listener.contextInitialized(new ServletContextEvent(sc));
-		assertEquals("customizeContext() should have been called.", expectedContents, buffer.toString());
+		assertThat(buffer.toString()).as("customizeContext() should have been called.").isEqualTo(expectedContents);
 	}
 
 	@Test
@@ -243,8 +240,8 @@ public class ContextLoaderTests {
 		listener.contextInitialized(event);
 		String contextAttr = WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE;
 		WebApplicationContext wc = (WebApplicationContext) sc.getAttribute(contextAttr);
-		assertTrue("Correct WebApplicationContext exposed in ServletContext",
-				wc instanceof SimpleWebApplicationContext);
+		boolean condition = wc instanceof SimpleWebApplicationContext;
+		assertThat(condition).as("Correct WebApplicationContext exposed in ServletContext").isTrue();
 	}
 
 	@Test
@@ -297,8 +294,8 @@ public class ContextLoaderTests {
 		servlet.setContextConfigLocation("/org/springframework/web/context/WEB-INF/testNamespace.xml "
 				+ "/org/springframework/web/context/WEB-INF/context-addition.xml");
 		servlet.init(new MockServletConfig(new MockServletContext(""), "test"));
-		assertTrue(servlet.getWebApplicationContext().containsBean("kerry"));
-		assertTrue(servlet.getWebApplicationContext().containsBean("kerryX"));
+		assertThat(servlet.getWebApplicationContext().containsBean("kerry")).isTrue();
+		assertThat(servlet.getWebApplicationContext().containsBean("kerryX")).isTrue();
 	}
 
 	@Test
@@ -306,18 +303,18 @@ public class ContextLoaderTests {
 	public void testClassPathXmlApplicationContext() throws IOException {
 		ApplicationContext context = new ClassPathXmlApplicationContext(
 				"/org/springframework/web/context/WEB-INF/applicationContext.xml");
-		assertTrue("Has father", context.containsBean("father"));
-		assertTrue("Has rod", context.containsBean("rod"));
-		assertFalse("Hasn't kerry", context.containsBean("kerry"));
-		assertTrue("Doesn't have spouse", ((TestBean) context.getBean("rod")).getSpouse() == null);
-		assertTrue("myinit not evaluated", "Roderick".equals(((TestBean) context.getBean("rod")).getName()));
+		assertThat(context.containsBean("father")).as("Has father").isTrue();
+		assertThat(context.containsBean("rod")).as("Has rod").isTrue();
+		assertThat(context.containsBean("kerry")).as("Hasn't kerry").isFalse();
+		assertThat(((TestBean) context.getBean("rod")).getSpouse() == null).as("Doesn't have spouse").isTrue();
+		assertThat("Roderick".equals(((TestBean) context.getBean("rod")).getName())).as("myinit not evaluated").isTrue();
 
 		context = new ClassPathXmlApplicationContext(new String[] {
 			"/org/springframework/web/context/WEB-INF/applicationContext.xml",
 			"/org/springframework/web/context/WEB-INF/context-addition.xml" });
-		assertTrue("Has father", context.containsBean("father"));
-		assertTrue("Has rod", context.containsBean("rod"));
-		assertTrue("Has kerry", context.containsBean("kerry"));
+		assertThat(context.containsBean("father")).as("Has father").isTrue();
+		assertThat(context.containsBean("rod")).as("Has rod").isTrue();
+		assertThat(context.containsBean("kerry")).as("Has kerry").isTrue();
 	}
 
 	@Test
@@ -335,7 +332,7 @@ public class ContextLoaderTests {
 						}
 						catch (BeanCreationException ex) {
 							DefaultListableBeanFactory factory = (DefaultListableBeanFactory) getBeanFactory();
-							assertEquals(0, factory.getSingletonCount());
+							assertThat(factory.getSingletonCount()).isEqualTo(0);
 							throw ex;
 						}
 					}

spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareProcessorTests.java

@@ -25,9 +25,7 @@ import org.springframework.mock.web.test.MockServletConfig;
 import org.springframework.mock.web.test.MockServletContext;
 import org.springframework.web.context.support.ServletContextAwareProcessor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Juergen Hoeller
@@ -40,10 +38,10 @@ public class ServletContextAwareProcessorTests {
 		ServletContext servletContext = new MockServletContext();
 		ServletContextAwareProcessor processor = new ServletContextAwareProcessor(servletContext);
 		ServletContextAwareBean bean = new ServletContextAwareBean();
-		assertNull(bean.getServletContext());
+		assertThat(bean.getServletContext()).isNull();
 		processor.postProcessBeforeInitialization(bean, "testBean");
-		assertNotNull("ServletContext should have been set", bean.getServletContext());
-		assertEquals(servletContext, bean.getServletContext());
+		assertThat(bean.getServletContext()).as("ServletContext should have been set").isNotNull();
+		assertThat(bean.getServletContext()).isEqualTo(servletContext);
 	}
 
 	@Test
@@ -52,10 +50,10 @@ public class ServletContextAwareProcessorTests {
 		ServletConfig servletConfig = new MockServletConfig(servletContext);
 		ServletContextAwareProcessor processor = new ServletContextAwareProcessor(servletConfig);
 		ServletContextAwareBean bean = new ServletContextAwareBean();
-		assertNull(bean.getServletContext());
+		assertThat(bean.getServletContext()).isNull();
 		processor.postProcessBeforeInitialization(bean, "testBean");
-		assertNotNull("ServletContext should have been set", bean.getServletContext());
-		assertEquals(servletContext, bean.getServletContext());
+		assertThat(bean.getServletContext()).as("ServletContext should have been set").isNotNull();
+		assertThat(bean.getServletContext()).isEqualTo(servletContext);
 	}
 
 	@Test
@@ -64,10 +62,10 @@ public class ServletContextAwareProcessorTests {
 		ServletConfig servletConfig = new MockServletConfig(servletContext);
 		ServletContextAwareProcessor processor = new ServletContextAwareProcessor(servletContext, servletConfig);
 		ServletContextAwareBean bean = new ServletContextAwareBean();
-		assertNull(bean.getServletContext());
+		assertThat(bean.getServletContext()).isNull();
 		processor.postProcessBeforeInitialization(bean, "testBean");
-		assertNotNull("ServletContext should have been set", bean.getServletContext());
-		assertEquals(servletContext, bean.getServletContext());
+		assertThat(bean.getServletContext()).as("ServletContext should have been set").isNotNull();
+		assertThat(bean.getServletContext()).isEqualTo(servletContext);
 	}
 
 	@Test
@@ -76,10 +74,10 @@ public class ServletContextAwareProcessorTests {
 		ServletConfig servletConfig = new MockServletConfig(servletContext);
 		ServletContextAwareProcessor processor = new ServletContextAwareProcessor(null, servletConfig);
 		ServletContextAwareBean bean = new ServletContextAwareBean();
-		assertNull(bean.getServletContext());
+		assertThat(bean.getServletContext()).isNull();
 		processor.postProcessBeforeInitialization(bean, "testBean");
-		assertNotNull("ServletContext should have been set", bean.getServletContext());
-		assertEquals(servletContext, bean.getServletContext());
+		assertThat(bean.getServletContext()).as("ServletContext should have been set").isNotNull();
+		assertThat(bean.getServletContext()).isEqualTo(servletContext);
 	}
 
 	@Test
@@ -87,10 +85,10 @@ public class ServletContextAwareProcessorTests {
 		ServletContext servletContext = new MockServletContext();
 		ServletContextAwareProcessor processor = new ServletContextAwareProcessor(servletContext, null);
 		ServletContextAwareBean bean = new ServletContextAwareBean();
-		assertNull(bean.getServletContext());
+		assertThat(bean.getServletContext()).isNull();
 		processor.postProcessBeforeInitialization(bean, "testBean");
-		assertNotNull("ServletContext should have been set", bean.getServletContext());
-		assertEquals(servletContext, bean.getServletContext());
+		assertThat(bean.getServletContext()).as("ServletContext should have been set").isNotNull();
+		assertThat(bean.getServletContext()).isEqualTo(servletContext);
 	}
 
 	@Test
@@ -98,9 +96,9 @@ public class ServletContextAwareProcessorTests {
 		ServletContext servletContext = null;
 		ServletContextAwareProcessor processor = new ServletContextAwareProcessor(servletContext);
 		ServletContextAwareBean bean = new ServletContextAwareBean();
-		assertNull(bean.getServletContext());
+		assertThat(bean.getServletContext()).isNull();
 		processor.postProcessBeforeInitialization(bean, "testBean");
-		assertNull(bean.getServletContext());
+		assertThat(bean.getServletContext()).isNull();
 	}
 
 	@Test
@@ -108,9 +106,9 @@ public class ServletContextAwareProcessorTests {
 		ServletContext servletContext = new MockServletContext();
 		ServletContextAwareProcessor processor = new ServletContextAwareProcessor(servletContext);
 		ServletConfigAwareBean bean = new ServletConfigAwareBean();
-		assertNull(bean.getServletConfig());
+		assertThat(bean.getServletConfig()).isNull();
 		processor.postProcessBeforeInitialization(bean, "testBean");
-		assertNull(bean.getServletConfig());
+		assertThat(bean.getServletConfig()).isNull();
 	}
 
 	@Test
@@ -119,10 +117,10 @@ public class ServletContextAwareProcessorTests {
 		ServletConfig servletConfig = new MockServletConfig(servletContext);
 		ServletContextAwareProcessor processor = new ServletContextAwareProcessor(servletConfig);
 		ServletConfigAwareBean bean = new ServletConfigAwareBean();
-		assertNull(bean.getServletConfig());
+		assertThat(bean.getServletConfig()).isNull();
 		processor.postProcessBeforeInitialization(bean, "testBean");
-		assertNotNull("ServletConfig should have been set", bean.getServletConfig());
-		assertEquals(servletConfig, bean.getServletConfig());
+		assertThat(bean.getServletConfig()).as("ServletConfig should have been set").isNotNull();
+		assertThat(bean.getServletConfig()).isEqualTo(servletConfig);
 	}
 
 	@Test
@@ -131,10 +129,10 @@ public class ServletContextAwareProcessorTests {
 		ServletConfig servletConfig = new MockServletConfig(servletContext);
 		ServletContextAwareProcessor processor = new ServletContextAwareProcessor(servletContext, servletConfig);
 		ServletConfigAwareBean bean = new ServletConfigAwareBean();
-		assertNull(bean.getServletConfig());
+		assertThat(bean.getServletConfig()).isNull();
 		processor.postProcessBeforeInitialization(bean, "testBean");
-		assertNotNull("ServletConfig should have been set", bean.getServletConfig());
-		assertEquals(servletConfig, bean.getServletConfig());
+		assertThat(bean.getServletConfig()).as("ServletConfig should have been set").isNotNull();
+		assertThat(bean.getServletConfig()).isEqualTo(servletConfig);
 	}
 
 	@Test
@@ -143,10 +141,10 @@ public class ServletContextAwareProcessorTests {
 		ServletConfig servletConfig = new MockServletConfig(servletContext);
 		ServletContextAwareProcessor processor = new ServletContextAwareProcessor(null, servletConfig);
 		ServletConfigAwareBean bean = new ServletConfigAwareBean();
-		assertNull(bean.getServletConfig());
+		assertThat(bean.getServletConfig()).isNull();
 		processor.postProcessBeforeInitialization(bean, "testBean");
-		assertNotNull("ServletConfig should have been set", bean.getServletConfig());
-		assertEquals(servletConfig, bean.getServletConfig());
+		assertThat(bean.getServletConfig()).as("ServletConfig should have been set").isNotNull();
+		assertThat(bean.getServletConfig()).isEqualTo(servletConfig);
 	}
 
 	@Test
@@ -154,9 +152,9 @@ public class ServletContextAwareProcessorTests {
 		ServletContext servletContext = new MockServletContext();
 		ServletContextAwareProcessor processor = new ServletContextAwareProcessor(servletContext, null);
 		ServletConfigAwareBean bean = new ServletConfigAwareBean();
-		assertNull(bean.getServletConfig());
+		assertThat(bean.getServletConfig()).isNull();
 		processor.postProcessBeforeInitialization(bean, "testBean");
-		assertNull(bean.getServletConfig());
+		assertThat(bean.getServletConfig()).isNull();
 	}
 
 	@Test
@@ -164,9 +162,9 @@ public class ServletContextAwareProcessorTests {
 		ServletContext servletContext = null;
 		ServletContextAwareProcessor processor = new ServletContextAwareProcessor(servletContext);
 		ServletConfigAwareBean bean = new ServletConfigAwareBean();
-		assertNull(bean.getServletConfig());
+		assertThat(bean.getServletConfig()).isNull();
 		processor.postProcessBeforeInitialization(bean, "testBean");
-		assertNull(bean.getServletConfig());
+		assertThat(bean.getServletConfig()).isNull();
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java

@@ -38,8 +38,6 @@ import org.springframework.web.context.support.XmlWebApplicationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Rod Johnson
@@ -110,8 +108,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes
 	@Test
 	@Override
 	public void count() {
-		assertTrue("should have 14 beans, not "+ this.applicationContext.getBeanDefinitionCount(),
-			this.applicationContext.getBeanDefinitionCount() == 14);
+		assertThat(this.applicationContext.getBeanDefinitionCount() == 14).as("should have 14 beans, not "+ this.applicationContext.getBeanDefinitionCount()).isTrue();
 	}
 
 	@Test
@@ -127,39 +124,39 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes
 		assertThatExceptionOfType(NoSuchMessageException.class).isThrownBy(() ->
 				wac.getMessage("someMessage", null, Locale.getDefault()));
 		String msg = wac.getMessage("someMessage", null, "default", Locale.getDefault());
-		assertTrue("Default message returned", "default".equals(msg));
+		assertThat("default".equals(msg)).as("Default message returned").isTrue();
 	}
 
 	@Test
 	public void contextNesting() {
 		TestBean father = (TestBean) this.applicationContext.getBean("father");
-		assertTrue("Bean from root context", father != null);
-		assertTrue("Custom BeanPostProcessor applied", father.getFriends().contains("myFriend"));
+		assertThat(father != null).as("Bean from root context").isTrue();
+		assertThat(father.getFriends().contains("myFriend")).as("Custom BeanPostProcessor applied").isTrue();
 
 		TestBean rod = (TestBean) this.applicationContext.getBean("rod");
-		assertTrue("Bean from child context", "Rod".equals(rod.getName()));
-		assertTrue("Bean has external reference", rod.getSpouse() == father);
-		assertTrue("Custom BeanPostProcessor not applied", !rod.getFriends().contains("myFriend"));
+		assertThat("Rod".equals(rod.getName())).as("Bean from child context").isTrue();
+		assertThat(rod.getSpouse() == father).as("Bean has external reference").isTrue();
+		assertThat(!rod.getFriends().contains("myFriend")).as("Custom BeanPostProcessor not applied").isTrue();
 
 		rod = (TestBean) this.root.getBean("rod");
-		assertTrue("Bean from root context", "Roderick".equals(rod.getName()));
-		assertTrue("Custom BeanPostProcessor applied", rod.getFriends().contains("myFriend"));
+		assertThat("Roderick".equals(rod.getName())).as("Bean from root context").isTrue();
+		assertThat(rod.getFriends().contains("myFriend")).as("Custom BeanPostProcessor applied").isTrue();
 	}
 
 	@Test
 	public void initializingBeanAndInitMethod() throws Exception {
-		assertFalse(InitAndIB.constructed);
+		assertThat(InitAndIB.constructed).isFalse();
 		InitAndIB iib = (InitAndIB) this.applicationContext.getBean("init-and-ib");
-		assertTrue(InitAndIB.constructed);
-		assertTrue(iib.afterPropertiesSetInvoked && iib.initMethodInvoked);
-		assertTrue(!iib.destroyed && !iib.customDestroyed);
+		assertThat(InitAndIB.constructed).isTrue();
+		assertThat(iib.afterPropertiesSetInvoked && iib.initMethodInvoked).isTrue();
+		assertThat(!iib.destroyed && !iib.customDestroyed).isTrue();
 		this.applicationContext.close();
-		assertTrue(!iib.destroyed && !iib.customDestroyed);
+		assertThat(!iib.destroyed && !iib.customDestroyed).isTrue();
 		ConfigurableApplicationContext parent = (ConfigurableApplicationContext) this.applicationContext.getParent();
 		parent.close();
-		assertTrue(iib.destroyed && iib.customDestroyed);
+		assertThat(iib.destroyed && iib.customDestroyed).isTrue();
 		parent.close();
-		assertTrue(iib.destroyed && iib.customDestroyed);
+		assertThat(iib.destroyed && iib.customDestroyed).isTrue();
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java

@@ -31,10 +31,9 @@ import org.springframework.mock.web.test.MockServletContext;
 import org.springframework.web.HttpRequestHandler;
 import org.springframework.web.context.WebApplicationContext;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIOException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
 
 /**
  * @author Juergen Hoeller
@@ -53,8 +52,8 @@ public class HttpRequestHandlerTests {
 		wac.getBeanFactory().registerSingleton("myHandler", new HttpRequestHandler() {
 			@Override
 			public void handleRequest(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-				assertSame(request, req);
-				assertSame(response, res);
+				assertThat(req).isSameAs(request);
+				assertThat(res).isSameAs(response);
 				String exception = request.getParameter("exception");
 				if ("ServletException".equals(exception)) {
 					throw new ServletException("test");
@@ -73,7 +72,7 @@ public class HttpRequestHandlerTests {
 		servlet.init(new MockServletConfig(servletContext, "myHandler"));
 
 		servlet.service(request, response);
-		assertEquals("myResponse", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("myResponse");
 
 		request.setParameter("exception", "ServletException");
 		assertThatExceptionOfType(ServletException.class).isThrownBy(() ->

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

@@ -31,10 +31,8 @@ import org.springframework.core.io.Resource;
 import org.springframework.mock.web.test.MockServletContext;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Tests for various ServletContext-related support classes.
@@ -59,7 +57,7 @@ public class ServletContextSupportTests {
 		wac.refresh();
 
 		Object value = wac.getBean("importedAttr");
-		assertEquals("myValue", value);
+		assertThat(value).isEqualTo("myValue");
 	}
 
 	@Test
@@ -93,7 +91,7 @@ public class ServletContextSupportTests {
 		wac.refresh();
 
 		Object value = wac.getBean("importedParam");
-		assertEquals("myValue", value);
+		assertThat(value).isEqualTo("myValue");
 	}
 
 	@Test
@@ -125,18 +123,18 @@ public class ServletContextSupportTests {
 		exporter.setAttributes(attributes);
 		exporter.setServletContext(sc);
 
-		assertEquals("value1", sc.getAttribute("attr1"));
-		assertSame(tb, sc.getAttribute("attr2"));
+		assertThat(sc.getAttribute("attr1")).isEqualTo("value1");
+		assertThat(sc.getAttribute("attr2")).isSameAs(tb);
 	}
 
 	@Test
 	public void testServletContextResourceLoader() {
 		MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context");
 		ServletContextResourceLoader rl = new ServletContextResourceLoader(sc);
-		assertTrue(rl.getResource("/WEB-INF/web.xml").exists());
-		assertTrue(rl.getResource("WEB-INF/web.xml").exists());
-		assertTrue(rl.getResource("../context/WEB-INF/web.xml").exists());
-		assertTrue(rl.getResource("/../context/WEB-INF/web.xml").exists());
+		assertThat(rl.getResource("/WEB-INF/web.xml").exists()).isTrue();
+		assertThat(rl.getResource("WEB-INF/web.xml").exists()).isTrue();
+		assertThat(rl.getResource("../context/WEB-INF/web.xml").exists()).isTrue();
+		assertThat(rl.getResource("/../context/WEB-INF/web.xml").exists()).isTrue();
 	}
 
 	@Test
@@ -161,9 +159,9 @@ public class ServletContextSupportTests {
 		for (Resource resource : found) {
 			foundPaths.add(((ServletContextResource) resource).getPath());
 		}
-		assertEquals(2, foundPaths.size());
-		assertTrue(foundPaths.contains("/WEB-INF/context1.xml"));
-		assertTrue(foundPaths.contains("/WEB-INF/context2.xml"));
+		assertThat(foundPaths.size()).isEqualTo(2);
+		assertThat(foundPaths.contains("/WEB-INF/context1.xml")).isTrue();
+		assertThat(foundPaths.contains("/WEB-INF/context2.xml")).isTrue();
 	}
 
 	@Test
@@ -194,9 +192,9 @@ public class ServletContextSupportTests {
 		for (Resource resource : found) {
 			foundPaths.add(((ServletContextResource) resource).getPath());
 		}
-		assertEquals(2, foundPaths.size());
-		assertTrue(foundPaths.contains("/WEB-INF/mydir1/context1.xml"));
-		assertTrue(foundPaths.contains("/WEB-INF/mydir2/context2.xml"));
+		assertThat(foundPaths.size()).isEqualTo(2);
+		assertThat(foundPaths.contains("/WEB-INF/mydir1/context1.xml")).isTrue();
+		assertThat(foundPaths.contains("/WEB-INF/mydir2/context2.xml")).isTrue();
 	}
 
 	@Test
@@ -234,10 +232,10 @@ public class ServletContextSupportTests {
 		for (Resource resource : found) {
 			foundPaths.add(((ServletContextResource) resource).getPath());
 		}
-		assertEquals(3, foundPaths.size());
-		assertTrue(foundPaths.contains("/WEB-INF/mydir1/context1.xml"));
-		assertTrue(foundPaths.contains("/WEB-INF/mydir2/context2.xml"));
-		assertTrue(foundPaths.contains("/WEB-INF/mydir2/mydir3/context3.xml"));
+		assertThat(foundPaths.size()).isEqualTo(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();
 	}
 
 	@Test
@@ -263,9 +261,9 @@ public class ServletContextSupportTests {
 		for (Resource resource : found) {
 			foundPaths.add(((ServletContextResource) resource).getPath());
 		}
-		assertEquals(2, foundPaths.size());
-		assertTrue(foundPaths.contains("/WEB-INF/context1.xml"));
-		assertTrue(foundPaths.contains("/WEB-INF/context2.xml"));
+		assertThat(foundPaths.size()).isEqualTo(2);
+		assertThat(foundPaths.contains("/WEB-INF/context1.xml")).isTrue();
+		assertThat(foundPaths.contains("/WEB-INF/context2.xml")).isTrue();
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java

@@ -25,8 +25,8 @@ import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.mock.web.test.MockServletContext;
 import org.springframework.web.util.WebUtils;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.junit.Assert.assertEquals;
 
 /**
  * @author Juergen Hoeller
@@ -45,8 +45,8 @@ public class WebApplicationObjectSupportTests {
 		wac.registerBeanDefinition("test", new RootBeanDefinition(TestWebApplicationObject.class));
 		wac.refresh();
 		WebApplicationObjectSupport wao = (WebApplicationObjectSupport) wac.getBean("test");
-		assertEquals(wao.getServletContext(), wac.getServletContext());
-		assertEquals(wao.getTempDir(), tempDir);
+		assertThat(wac.getServletContext()).isEqualTo(wao.getServletContext());
+		assertThat(tempDir).isEqualTo(wao.getTempDir());
 	}
 
 	@Test

spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java

@@ -61,13 +61,6 @@ import org.springframework.web.util.WebUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -114,18 +107,16 @@ public class DispatcherServletTests {
 
 	@Test
 	public void configuredDispatcherServlets() {
-		assertTrue("Correct namespace",
-				("simple" + FrameworkServlet.DEFAULT_NAMESPACE_SUFFIX).equals(simpleDispatcherServlet.getNamespace()));
-		assertTrue("Correct attribute", (FrameworkServlet.SERVLET_CONTEXT_PREFIX + "simple").equals(
-				simpleDispatcherServlet.getServletContextAttributeName()));
-		assertTrue("Context published", simpleDispatcherServlet.getWebApplicationContext() ==
-				getServletContext().getAttribute(FrameworkServlet.SERVLET_CONTEXT_PREFIX + "simple"));
+		assertThat(("simple" + FrameworkServlet.DEFAULT_NAMESPACE_SUFFIX).equals(simpleDispatcherServlet.getNamespace())).as("Correct namespace").isTrue();
+		assertThat((FrameworkServlet.SERVLET_CONTEXT_PREFIX + "simple").equals(
+		simpleDispatcherServlet.getServletContextAttributeName())).as("Correct attribute").isTrue();
+		assertThat(simpleDispatcherServlet.getWebApplicationContext() ==
+		getServletContext().getAttribute(FrameworkServlet.SERVLET_CONTEXT_PREFIX + "simple")).as("Context published").isTrue();
 
-		assertTrue("Correct namespace", "test".equals(complexDispatcherServlet.getNamespace()));
-		assertTrue("Correct attribute", (FrameworkServlet.SERVLET_CONTEXT_PREFIX + "complex").equals(
-				complexDispatcherServlet.getServletContextAttributeName()));
-		assertTrue("Context not published",
-				getServletContext().getAttribute(FrameworkServlet.SERVLET_CONTEXT_PREFIX + "complex") == null);
+		assertThat("test".equals(complexDispatcherServlet.getNamespace())).as("Correct namespace").isTrue();
+		assertThat((FrameworkServlet.SERVLET_CONTEXT_PREFIX + "complex").equals(
+		complexDispatcherServlet.getServletContextAttributeName())).as("Correct attribute").isTrue();
+		assertThat(getServletContext().getAttribute(FrameworkServlet.SERVLET_CONTEXT_PREFIX + "complex") == null).as("Context not published").isTrue();
 
 		simpleDispatcherServlet.destroy();
 		complexDispatcherServlet.destroy();
@@ -136,8 +127,8 @@ public class DispatcherServletTests {
 		MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/invalid.do");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		simpleDispatcherServlet.service(request, response);
-		assertTrue("Not forwarded", response.getForwardedUrl() == null);
-		assertTrue("correct error code", response.getStatus() == HttpServletResponse.SC_NOT_FOUND);
+		assertThat(response.getForwardedUrl() == null).as("Not forwarded").isTrue();
+		assertThat(response.getStatus() == HttpServletResponse.SC_NOT_FOUND).as("correct error code").isTrue();
 	}
 
 	@Test
@@ -148,7 +139,7 @@ public class DispatcherServletTests {
 		ComplexWebApplicationContext.TestApplicationListener listener =
 				(ComplexWebApplicationContext.TestApplicationListener) complexDispatcherServlet
 						.getWebApplicationContext().getBean("testListener");
-		assertEquals(1, listener.counter);
+		assertThat(listener.counter).isEqualTo(1);
 	}
 
 	@Test
@@ -160,7 +151,7 @@ public class DispatcherServletTests {
 		ComplexWebApplicationContext.TestApplicationListener listener =
 				(ComplexWebApplicationContext.TestApplicationListener) complexDispatcherServlet
 						.getWebApplicationContext().getBean("testListener");
-		assertEquals(0, listener.counter);
+		assertThat(listener.counter).isEqualTo(0);
 	}
 
 	@Test
@@ -169,7 +160,7 @@ public class DispatcherServletTests {
 		request.addUserRole("role1");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertTrue("forwarded to form", "myform.jsp".equals(response.getForwardedUrl()));
+		assertThat("myform.jsp".equals(response.getForwardedUrl())).as("forwarded to form").isTrue();
 	}
 
 	@Test
@@ -179,7 +170,7 @@ public class DispatcherServletTests {
 		request.addParameter("noView", "true");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertTrue("Not forwarded", response.getForwardedUrl() == null);
+		assertThat(response.getForwardedUrl() == null).as("Not forwarded").isTrue();
 	}
 
 	@Test
@@ -188,8 +179,8 @@ public class DispatcherServletTests {
 		request.addPreferredLocale(Locale.CANADA);
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		simpleDispatcherServlet.service(request, response);
-		assertTrue("Not forwarded", response.getForwardedUrl() == null);
-		assertEquals("Wed, 01 Apr 2015 00:00:00 GMT", response.getHeader("Last-Modified"));
+		assertThat(response.getForwardedUrl() == null).as("Not forwarded").isTrue();
+		assertThat(response.getHeader("Last-Modified")).isEqualTo("Wed, 01 Apr 2015 00:00:00 GMT");
 	}
 
 	@Test
@@ -197,8 +188,8 @@ public class DispatcherServletTests {
 		MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/unknown.do");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals("forwarded to failed", "failed0.jsp", response.getForwardedUrl());
-		assertTrue("Exception exposed", request.getAttribute("exception").getClass().equals(ServletException.class));
+		assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed0.jsp");
+		assertThat(request.getAttribute("exception").getClass().equals(ServletException.class)).as("Exception exposed").isTrue();
 	}
 
 	@Test
@@ -209,17 +200,17 @@ public class DispatcherServletTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
 
-		assertTrue("Not forwarded", response.getForwardedUrl() == null);
-		assertTrue(request.getAttribute("test1") != null);
-		assertTrue(request.getAttribute("test1x") == null);
-		assertTrue(request.getAttribute("test1y") == null);
-		assertTrue(request.getAttribute("test2") != null);
-		assertTrue(request.getAttribute("test2x") == null);
-		assertTrue(request.getAttribute("test2y") == null);
-		assertTrue(request.getAttribute("test3") != null);
-		assertTrue(request.getAttribute("test3x") != null);
-		assertTrue(request.getAttribute("test3y") != null);
-		assertEquals("Wed, 01 Apr 2015 00:00:01 GMT", response.getHeader("Last-Modified"));
+		assertThat(response.getForwardedUrl() == null).as("Not forwarded").isTrue();
+		assertThat(request.getAttribute("test1") != null).isTrue();
+		assertThat(request.getAttribute("test1x") == null).isTrue();
+		assertThat(request.getAttribute("test1y") == null).isTrue();
+		assertThat(request.getAttribute("test2") != null).isTrue();
+		assertThat(request.getAttribute("test2x") == null).isTrue();
+		assertThat(request.getAttribute("test2y") == null).isTrue();
+		assertThat(request.getAttribute("test3") != null).isTrue();
+		assertThat(request.getAttribute("test3x") != null).isTrue();
+		assertThat(request.getAttribute("test3y") != null).isTrue();
+		assertThat(response.getHeader("Last-Modified")).isEqualTo("Wed, 01 Apr 2015 00:00:01 GMT");
 	}
 
 	@Test
@@ -234,8 +225,8 @@ public class DispatcherServletTests {
 		MultipartHttpServletRequest multipartRequest = multipartResolver.resolveMultipart(request);
 		complexDispatcherServlet.service(multipartRequest, response);
 		multipartResolver.cleanupMultipart(multipartRequest);
-		assertNull(request.getAttribute(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE));
-		assertNotNull(request.getAttribute("cleanedUp"));
+		assertThat(request.getAttribute(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE)).isNull();
+		assertThat(request.getAttribute("cleanedUp")).isNotNull();
 	}
 
 	@Test
@@ -250,8 +241,8 @@ public class DispatcherServletTests {
 		MultipartHttpServletRequest multipartRequest = multipartResolver.resolveMultipart(request);
 		complexDispatcherServlet.service(new HttpServletRequestWrapper(multipartRequest), response);
 		multipartResolver.cleanupMultipart(multipartRequest);
-		assertNull(request.getAttribute(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE));
-		assertNotNull(request.getAttribute("cleanedUp"));
+		assertThat(request.getAttribute(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE)).isNull();
+		assertThat(request.getAttribute("cleanedUp")).isNotNull();
 	}
 
 	@Test
@@ -262,10 +253,10 @@ public class DispatcherServletTests {
 		request.setAttribute("fail", Boolean.TRUE);
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertTrue("forwarded to failed", "failed0.jsp".equals(response.getForwardedUrl()));
-		assertEquals(200, response.getStatus());
-		assertTrue("correct exception", request.getAttribute(
-				SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE) instanceof MaxUploadSizeExceededException);
+		assertThat("failed0.jsp".equals(response.getForwardedUrl())).as("forwarded to failed").isTrue();
+		assertThat(response.getStatus()).isEqualTo(200);
+		assertThat(request.getAttribute(
+		SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE) instanceof MaxUploadSizeExceededException).as("correct exception").isTrue();
 	}
 
 	@Test
@@ -276,13 +267,13 @@ public class DispatcherServletTests {
 		request.addUserRole("role1");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertTrue("Not forwarded", response.getForwardedUrl() == null);
-		assertTrue(request.getAttribute("test1") != null);
-		assertTrue(request.getAttribute("test1x") != null);
-		assertTrue(request.getAttribute("test1y") == null);
-		assertTrue(request.getAttribute("test2") == null);
-		assertTrue(request.getAttribute("test2x") == null);
-		assertTrue(request.getAttribute("test2y") == null);
+		assertThat(response.getForwardedUrl() == null).as("Not forwarded").isTrue();
+		assertThat(request.getAttribute("test1") != null).isTrue();
+		assertThat(request.getAttribute("test1x") != null).isTrue();
+		assertThat(request.getAttribute("test1y") == null).isTrue();
+		assertThat(request.getAttribute("test2") == null).isTrue();
+		assertThat(request.getAttribute("test2x") == null).isTrue();
+		assertThat(request.getAttribute("test2y") == null).isTrue();
 	}
 
 	@Test
@@ -293,8 +284,8 @@ public class DispatcherServletTests {
 		request.addParameter("fail", "yes");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals(200, response.getStatus());
-		assertTrue("forwarded to failed", "failed1.jsp".equals(response.getForwardedUrl()));
+		assertThat(response.getStatus()).isEqualTo(200);
+		assertThat("failed1.jsp".equals(response.getForwardedUrl())).as("forwarded to failed").isTrue();
 	}
 
 	@Test
@@ -305,9 +296,9 @@ public class DispatcherServletTests {
 		request.addParameter("access", "yes");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals(200, response.getStatus());
-		assertEquals("forwarded to failed", "failed2.jsp", response.getForwardedUrl());
-		assertTrue("Exception exposed", request.getAttribute("exception") instanceof IllegalAccessException);
+		assertThat(response.getStatus()).isEqualTo(200);
+		assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed2.jsp");
+		assertThat(request.getAttribute("exception") instanceof IllegalAccessException).as("Exception exposed").isTrue();
 	}
 
 	@Test
@@ -318,9 +309,9 @@ public class DispatcherServletTests {
 		request.addParameter("servlet", "yes");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals(200, response.getStatus());
-		assertEquals("forwarded to failed", "failed3.jsp", response.getForwardedUrl());
-		assertTrue("Exception exposed", request.getAttribute("exception") instanceof ServletException);
+		assertThat(response.getStatus()).isEqualTo(200);
+		assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed3.jsp");
+		assertThat(request.getAttribute("exception") instanceof ServletException).as("Exception exposed").isTrue();
 	}
 
 	@Test
@@ -331,9 +322,9 @@ public class DispatcherServletTests {
 		request.addParameter("access", "yes");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals(500, response.getStatus());
-		assertEquals("forwarded to failed", "failed1.jsp", response.getForwardedUrl());
-		assertTrue("Exception exposed", request.getAttribute("exception") instanceof IllegalAccessException);
+		assertThat(response.getStatus()).isEqualTo(500);
+		assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed1.jsp");
+		assertThat(request.getAttribute("exception") instanceof IllegalAccessException).as("Exception exposed").isTrue();
 	}
 
 	@Test
@@ -344,9 +335,9 @@ public class DispatcherServletTests {
 		request.addParameter("servlet", "yes");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals(500, response.getStatus());
-		assertEquals("forwarded to failed", "failed1.jsp", response.getForwardedUrl());
-		assertTrue("Exception exposed", request.getAttribute("exception") instanceof ServletException);
+		assertThat(response.getStatus()).isEqualTo(500);
+		assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed1.jsp");
+		assertThat(request.getAttribute("exception") instanceof ServletException).as("Exception exposed").isTrue();
 	}
 
 	@Test
@@ -357,9 +348,9 @@ public class DispatcherServletTests {
 		request.addParameter("exception", "yes");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals(200, response.getStatus());
-		assertEquals("forwarded to failed", "failed0.jsp", response.getForwardedUrl());
-		assertTrue("Exception exposed", request.getAttribute("exception").getClass().equals(RuntimeException.class));
+		assertThat(response.getStatus()).isEqualTo(200);
+		assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed0.jsp");
+		assertThat(request.getAttribute("exception").getClass().equals(RuntimeException.class)).as("Exception exposed").isTrue();
 	}
 
 	@Test
@@ -370,9 +361,9 @@ public class DispatcherServletTests {
 		request.addParameter("locale", "en");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals(200, response.getStatus());
-		assertEquals("forwarded to failed", "failed0.jsp", response.getForwardedUrl());
-		assertTrue("Exception exposed", request.getAttribute("exception").getClass().equals(ServletException.class));
+		assertThat(response.getStatus()).isEqualTo(200);
+		assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed0.jsp");
+		assertThat(request.getAttribute("exception").getClass().equals(ServletException.class)).as("Exception exposed").isTrue();
 	}
 
 	@Test
@@ -384,7 +375,7 @@ public class DispatcherServletTests {
 		request.addParameter("locale2", "en_CA");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertTrue("Not forwarded", response.getForwardedUrl() == null);
+		assertThat(response.getForwardedUrl() == null).as("Not forwarded").isTrue();
 	}
 
 	@Test
@@ -395,9 +386,9 @@ public class DispatcherServletTests {
 		request.addParameter("theme", "mytheme");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals(200, response.getStatus());
-		assertEquals("forwarded to failed", "failed0.jsp", response.getForwardedUrl());
-		assertTrue("Exception exposed", request.getAttribute("exception").getClass().equals(ServletException.class));
+		assertThat(response.getStatus()).isEqualTo(200);
+		assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed0.jsp");
+		assertThat(request.getAttribute("exception").getClass().equals(ServletException.class)).as("Exception exposed").isTrue();
 	}
 
 	@Test
@@ -409,7 +400,7 @@ public class DispatcherServletTests {
 		request.addParameter("theme2", "theme");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertTrue("Not forwarded", response.getForwardedUrl() == null);
+		assertThat(response.getForwardedUrl() == null).as("Not forwarded").isTrue();
 	}
 
 	@Test
@@ -418,7 +409,7 @@ public class DispatcherServletTests {
 		request.addPreferredLocale(Locale.CANADA);
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertTrue("Correct response", response.getStatus() == HttpServletResponse.SC_FORBIDDEN);
+		assertThat(response.getStatus() == HttpServletResponse.SC_FORBIDDEN).as("Correct response").isTrue();
 	}
 
 	@Test
@@ -426,12 +417,12 @@ public class DispatcherServletTests {
 		MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "HEAD", "/head.do");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals(5, response.getContentLength());
+		assertThat(response.getContentLength()).isEqualTo(5);
 
 		request = new MockHttpServletRequest(getServletContext(), "GET", "/head.do");
 		response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals("", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("");
 	}
 
 	@Test
@@ -439,12 +430,12 @@ public class DispatcherServletTests {
 		MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "HEAD", "/body.do");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals(4, response.getContentLength());
+		assertThat(response.getContentLength()).isEqualTo(4);
 
 		request = new MockHttpServletRequest(getServletContext(), "GET", "/body.do");
 		response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals("body", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("body");
 	}
 
 	@Test
@@ -458,7 +449,7 @@ public class DispatcherServletTests {
 		MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/unknown.do");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertTrue(response.getStatus() == HttpServletResponse.SC_NOT_FOUND);
+		assertThat(response.getStatus() == HttpServletResponse.SC_NOT_FOUND).isTrue();
 	}
 
 	@Test
@@ -472,7 +463,7 @@ public class DispatcherServletTests {
 		MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", URL_KNOWN_ONLY_PARENT);
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals(HttpServletResponse.SC_NOT_FOUND, response.getStatus());
+		assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_NOT_FOUND);
 	}
 
 	@Test
@@ -501,8 +492,7 @@ public class DispatcherServletTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
 
-		assertFalse("Matched through parent controller/handler pair: not response=" + response.getStatus(),
-				response.getStatus() == HttpServletResponse.SC_NOT_FOUND);
+		assertThat(response.getStatus() == HttpServletResponse.SC_NOT_FOUND).as("Matched through parent controller/handler pair: not response=" + response.getStatus()).isFalse();
 	}
 
 	@Test
@@ -515,7 +505,7 @@ public class DispatcherServletTests {
 		MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/servlet.do");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals("body", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("body");
 
 		request = new MockHttpServletRequest(getServletContext(), "GET", "/form.do");
 		response = new MockHttpServletResponse();
@@ -534,14 +524,14 @@ public class DispatcherServletTests {
 		MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/servlet.do");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals("body", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("body");
 
 		// SimpleControllerHandlerAdapter not detected
 		request = new MockHttpServletRequest(getServletContext(), "GET", "/form.do");
 		response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals("forwarded to failed", "failed0.jsp", response.getForwardedUrl());
-		assertTrue("Exception exposed", request.getAttribute("exception").getClass().equals(ServletException.class));
+		assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed0.jsp");
+		assertThat(request.getAttribute("exception").getClass().equals(ServletException.class)).as("Exception exposed").isTrue();
 	}
 
 	@Test
@@ -586,7 +576,7 @@ public class DispatcherServletTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		complexDispatcherServlet.service(request, response);
-		assertTrue("correct error code", response.getStatus() == HttpServletResponse.SC_NOT_FOUND);
+		assertThat(response.getStatus() == HttpServletResponse.SC_NOT_FOUND).as("correct error code").isTrue();
 	}
 
 	// SPR-12984
@@ -596,8 +586,8 @@ public class DispatcherServletTests {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("foo", "bar");
 		NoHandlerFoundException ex = new NoHandlerFoundException("GET", "/foo", headers);
-		assertTrue(!ex.getMessage().contains("bar"));
-		assertTrue(!ex.toString().contains("bar"));
+		assertThat(!ex.getMessage().contains("bar")).isTrue();
+		assertThat(!ex.toString().contains("bar")).isTrue();
 	}
 
 	@Test
@@ -613,11 +603,11 @@ public class DispatcherServletTests {
 		request.setAttribute(WebUtils.INCLUDE_REQUEST_URI_ATTRIBUTE, "/form.do");
 		simpleDispatcherServlet.service(request, response);
 
-		assertEquals("value1", request.getAttribute("test1"));
-		assertEquals("value2", request.getAttribute("test2"));
-		assertEquals(wac, request.getAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE));
-		assertNull(request.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE));
-		assertNull(request.getAttribute("command"));
+		assertThat(request.getAttribute("test1")).isEqualTo("value1");
+		assertThat(request.getAttribute("test2")).isEqualTo("value2");
+		assertThat(request.getAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE)).isEqualTo(wac);
+		assertThat(request.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isNull();
+		assertThat(request.getAttribute("command")).isNull();
 	}
 
 	@Test
@@ -635,9 +625,9 @@ public class DispatcherServletTests {
 		request.setAttribute(WebUtils.INCLUDE_REQUEST_URI_ATTRIBUTE, "/form.do");
 		simpleDispatcherServlet.service(request, response);
 
-		assertEquals("value1", request.getAttribute("test1"));
-		assertEquals("value2", request.getAttribute("test2"));
-		assertSame(wac, request.getAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE));
+		assertThat(request.getAttribute("test1")).isEqualTo("value1");
+		assertThat(request.getAttribute("test2")).isEqualTo("value2");
+		assertThat(request.getAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE)).isSameAs(wac);
 	}
 
 	@Test
@@ -656,9 +646,9 @@ public class DispatcherServletTests {
 		simpleDispatcherServlet.setCleanupAfterInclude(false);
 		simpleDispatcherServlet.service(request, response);
 
-		assertEquals("value1", request.getAttribute("test1"));
-		assertEquals("value2", request.getAttribute("test2"));
-		assertSame(wac, request.getAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE));
+		assertThat(request.getAttribute("test1")).isEqualTo("value1");
+		assertThat(request.getAttribute("test2")).isEqualTo("value2");
+		assertThat(request.getAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE)).isSameAs(wac);
 	}
 
 	@Test
@@ -666,13 +656,13 @@ public class DispatcherServletTests {
 		MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/servlet.do");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		complexDispatcherServlet.service(request, response);
-		assertEquals("body", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("body");
 
 		Servlet myServlet = (Servlet) complexDispatcherServlet.getWebApplicationContext().getBean("myServlet");
-		assertEquals("complex", myServlet.getServletConfig().getServletName());
-		assertEquals(getServletContext(), myServlet.getServletConfig().getServletContext());
+		assertThat(myServlet.getServletConfig().getServletName()).isEqualTo("complex");
+		assertThat(myServlet.getServletConfig().getServletContext()).isEqualTo(getServletContext());
 		complexDispatcherServlet.destroy();
-		assertNull(myServlet.getServletConfig());
+		assertThat((Object) myServlet.getServletConfig()).isNull();
 	}
 
 	@Test
@@ -682,7 +672,7 @@ public class DispatcherServletTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		complexDispatcherServlet.service(request, response);
-		assertEquals("noview.jsp", response.getForwardedUrl());
+		assertThat(response.getForwardedUrl()).isEqualTo("noview.jsp");
 	}
 
 	@Test
@@ -692,7 +682,7 @@ public class DispatcherServletTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		complexDispatcherServlet.service(request, response);
-		assertEquals("noview/simple.jsp", response.getForwardedUrl());
+		assertThat(response.getForwardedUrl()).isEqualTo("noview/simple.jsp");
 	}
 
 	@Test
@@ -719,10 +709,10 @@ public class DispatcherServletTests {
 				(ServletContextAwareBean) servlet.getWebApplicationContext().getBean("servletContextAwareBean");
 		ServletConfigAwareBean configBean =
 				(ServletConfigAwareBean) servlet.getWebApplicationContext().getBean("servletConfigAwareBean");
-		assertSame(servletContext, contextBean.getServletContext());
-		assertSame(servlet.getServletConfig(), configBean.getServletConfig());
+		assertThat(contextBean.getServletContext()).isSameAs(servletContext);
+		assertThat(configBean.getServletConfig()).isSameAs(servlet.getServletConfig());
 		MultipartResolver multipartResolver = servlet.getMultipartResolver();
-		assertNotNull(multipartResolver);
+		assertThat(multipartResolver).isNotNull();
 
 		servlet.refresh();
 
@@ -730,12 +720,12 @@ public class DispatcherServletTests {
 				(ServletContextAwareBean) servlet.getWebApplicationContext().getBean("servletContextAwareBean");
 		ServletConfigAwareBean configBean2 =
 				(ServletConfigAwareBean) servlet.getWebApplicationContext().getBean("servletConfigAwareBean");
-		assertSame(servletContext, contextBean2.getServletContext());
-		assertSame(servlet.getServletConfig(), configBean2.getServletConfig());
-		assertNotSame(contextBean, contextBean2);
-		assertNotSame(configBean, configBean2);
+		assertThat(contextBean2.getServletContext()).isSameAs(servletContext);
+		assertThat(configBean2.getServletConfig()).isSameAs(servlet.getServletConfig());
+		assertThat(contextBean2).isNotSameAs(contextBean);
+		assertThat(configBean2).isNotSameAs(configBean);
 		MultipartResolver multipartResolver2 = servlet.getMultipartResolver();
-		assertNotSame(multipartResolver, multipartResolver2);
+		assertThat(multipartResolver2).isNotSameAs(multipartResolver);
 
 		servlet.destroy();
 	}
@@ -750,10 +740,10 @@ public class DispatcherServletTests {
 				(ServletContextAwareBean) servlet.getWebApplicationContext().getBean("servletContextAwareBean");
 		ServletConfigAwareBean configBean =
 				(ServletConfigAwareBean) servlet.getWebApplicationContext().getBean("servletConfigAwareBean");
-		assertSame(servletContext, contextBean.getServletContext());
-		assertSame(servlet.getServletConfig(), configBean.getServletConfig());
+		assertThat(contextBean.getServletContext()).isSameAs(servletContext);
+		assertThat(configBean.getServletConfig()).isSameAs(servlet.getServletConfig());
 		MultipartResolver multipartResolver = servlet.getMultipartResolver();
-		assertNotNull(multipartResolver);
+		assertThat(multipartResolver).isNotNull();
 
 		((ConfigurableApplicationContext) servlet.getWebApplicationContext()).refresh();
 
@@ -761,12 +751,12 @@ public class DispatcherServletTests {
 				(ServletContextAwareBean) servlet.getWebApplicationContext().getBean("servletContextAwareBean");
 		ServletConfigAwareBean configBean2 =
 				(ServletConfigAwareBean) servlet.getWebApplicationContext().getBean("servletConfigAwareBean");
-		assertSame(servletContext, contextBean2.getServletContext());
-		assertSame(servlet.getServletConfig(), configBean2.getServletConfig());
-		assertTrue(contextBean != contextBean2);
-		assertTrue(configBean != configBean2);
+		assertThat(contextBean2.getServletContext()).isSameAs(servletContext);
+		assertThat(configBean2.getServletConfig()).isSameAs(servlet.getServletConfig());
+		assertThat(contextBean != contextBean2).isTrue();
+		assertThat(configBean != configBean2).isTrue();
 		MultipartResolver multipartResolver2 = servlet.getMultipartResolver();
-		assertTrue(multipartResolver != multipartResolver2);
+		assertThat(multipartResolver != multipartResolver2).isTrue();
 
 		servlet.destroy();
 	}
@@ -809,8 +799,8 @@ public class DispatcherServletTests {
 		servlet.setContextClass(SimpleWebApplicationContext.class);
 		servlet.setContextInitializers(new TestWebContextInitializer(), new OtherWebContextInitializer());
 		servlet.init(servletConfig);
-		assertEquals("true", getServletContext().getAttribute("initialized"));
-		assertEquals("true", getServletContext().getAttribute("otherInitialized"));
+		assertThat(getServletContext().getAttribute("initialized")).isEqualTo("true");
+		assertThat(getServletContext().getAttribute("otherInitialized")).isEqualTo("true");
 	}
 
 	@Test
@@ -820,8 +810,8 @@ public class DispatcherServletTests {
 		servlet.setContextInitializerClasses(
 				TestWebContextInitializer.class.getName() + "," + OtherWebContextInitializer.class.getName());
 		servlet.init(servletConfig);
-		assertEquals("true", getServletContext().getAttribute("initialized"));
-		assertEquals("true", getServletContext().getAttribute("otherInitialized"));
+		assertThat(getServletContext().getAttribute("initialized")).isEqualTo("true");
+		assertThat(getServletContext().getAttribute("otherInitialized")).isEqualTo("true");
 	}
 
 	@Test
@@ -831,8 +821,8 @@ public class DispatcherServletTests {
 		getServletContext().setInitParameter(ContextLoader.GLOBAL_INITIALIZER_CLASSES_PARAM,
 				TestWebContextInitializer.class.getName() + "," + OtherWebContextInitializer.class.getName());
 		servlet.init(servletConfig);
-		assertEquals("true", getServletContext().getAttribute("initialized"));
-		assertEquals("true", getServletContext().getAttribute("otherInitialized"));
+		assertThat(getServletContext().getAttribute("initialized")).isEqualTo("true");
+		assertThat(getServletContext().getAttribute("otherInitialized")).isEqualTo("true");
 	}
 
 	@Test
@@ -843,8 +833,8 @@ public class DispatcherServletTests {
 				TestWebContextInitializer.class.getName());
 		servlet.setContextInitializerClasses(OtherWebContextInitializer.class.getName());
 		servlet.init(servletConfig);
-		assertEquals("true", getServletContext().getAttribute("initialized"));
-		assertEquals("true", getServletContext().getAttribute("otherInitialized"));
+		assertThat(getServletContext().getAttribute("initialized")).isEqualTo("true");
+		assertThat(getServletContext().getAttribute("otherInitialized")).isEqualTo("true");
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java

@@ -21,9 +21,7 @@ import org.junit.Test;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture for {@link FlashMap} tests.
@@ -34,13 +32,13 @@ public class FlashMapTests {
 
 	@Test
 	public void isExpired() throws InterruptedException {
-		assertFalse(new FlashMap().isExpired());
+		assertThat(new FlashMap().isExpired()).isFalse();
 
 		FlashMap flashMap = new FlashMap();
 		flashMap.startExpirationPeriod(0);
 		Thread.sleep(100);
 
-		assertTrue(flashMap.isExpired());
+		assertThat(flashMap.isExpired()).isTrue();
 	}
 
 	@Test
@@ -49,28 +47,28 @@ public class FlashMapTests {
 		flashMap.startExpirationPeriod(10);
 		Thread.sleep(100);
 
-		assertFalse(flashMap.isExpired());
+		assertThat(flashMap.isExpired()).isFalse();
 	}
 
 	@Test
 	public void compareTo() {
 		FlashMap flashMap1 = new FlashMap();
 		FlashMap flashMap2 = new FlashMap();
-		assertEquals(0, flashMap1.compareTo(flashMap2));
+		assertThat(flashMap1.compareTo(flashMap2)).isEqualTo(0);
 
 		flashMap1.setTargetRequestPath("/path1");
-		assertEquals(-1, flashMap1.compareTo(flashMap2));
-		assertEquals(1, flashMap2.compareTo(flashMap1));
+		assertThat(flashMap1.compareTo(flashMap2)).isEqualTo(-1);
+		assertThat(flashMap2.compareTo(flashMap1)).isEqualTo(1);
 
 		flashMap2.setTargetRequestPath("/path2");
-		assertEquals(0, flashMap1.compareTo(flashMap2));
+		assertThat(flashMap1.compareTo(flashMap2)).isEqualTo(0);
 
 		flashMap1.addTargetRequestParam("id", "1");
-		assertEquals(-1, flashMap1.compareTo(flashMap2));
-		assertEquals(1, flashMap2.compareTo(flashMap1));
+		assertThat(flashMap1.compareTo(flashMap2)).isEqualTo(-1);
+		assertThat(flashMap2.compareTo(flashMap1)).isEqualTo(1);
 
 		flashMap2.addTargetRequestParam("id", "2");
-		assertEquals(0, flashMap1.compareTo(flashMap2));
+		assertThat(flashMap1.compareTo(flashMap2)).isEqualTo(0);
 	}
 
 	@Test
@@ -80,8 +78,8 @@ public class FlashMapTests {
 		flashMap.addTargetRequestParam("empty", " ");
 		flashMap.addTargetRequestParam("null", null);
 
-		assertEquals(1, flashMap.getTargetRequestParams().size());
-		assertEquals("abc", flashMap.getTargetRequestParams().getFirst("text"));
+		assertThat(flashMap.getTargetRequestParams().size()).isEqualTo(1);
+		assertThat(flashMap.getTargetRequestParams().getFirst("text")).isEqualTo("abc");
 	}
 
 	@Test
@@ -94,9 +92,9 @@ public class FlashMapTests {
 		FlashMap flashMap = new FlashMap();
 		flashMap.addTargetRequestParams(params);
 
-		assertEquals(1, flashMap.getTargetRequestParams().size());
-		assertEquals(1, flashMap.getTargetRequestParams().get("key").size());
-		assertEquals("abc", flashMap.getTargetRequestParams().getFirst("key"));
+		assertThat(flashMap.getTargetRequestParams().size()).isEqualTo(1);
+		assertThat(flashMap.getTargetRequestParams().get("key").size()).isEqualTo(1);
+		assertThat(flashMap.getTargetRequestParams().getFirst("key")).isEqualTo("abc");
 	}
 
 	@Test
@@ -105,7 +103,7 @@ public class FlashMapTests {
 		flashMap.addTargetRequestParam(" ", "abc");
 		flashMap.addTargetRequestParam(null, "abc");
 
-		assertTrue(flashMap.getTargetRequestParams().isEmpty());
+		assertThat(flashMap.getTargetRequestParams().isEmpty()).isTrue();
 	}
 
 	@Test
@@ -117,7 +115,7 @@ public class FlashMapTests {
 		FlashMap flashMap = new FlashMap();
 		flashMap.addTargetRequestParams(params);
 
-		assertTrue(flashMap.getTargetRequestParams().isEmpty());
+		assertThat(flashMap.getTargetRequestParams().isEmpty()).isTrue();
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/HandlerExecutionChainTests.java

@@ -22,8 +22,7 @@ import org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -66,9 +65,9 @@ public class HandlerExecutionChainTests {
 
 		this.chain.addInterceptor(this.interceptor1);
 		this.chain.addInterceptor(this.interceptor2);
-		assertEquals(2, this.chain.getInterceptors().length);
+		assertThat(this.chain.getInterceptors().length).isEqualTo(2);
 		this.chain.addInterceptor(this.interceptor3);
-		assertEquals(3, this.chain.getInterceptors().length);
+		assertThat(this.chain.getInterceptors().length).isEqualTo(3);
 	}
 
 
@@ -135,7 +134,7 @@ public class HandlerExecutionChainTests {
 			this.chain.applyPreHandle(request, response);
 		}
 		catch (Exception actual) {
-			assertSame(ex, actual);
+			assertThat(actual).isSameAs(ex);
 		}
 		this.chain.triggerAfterCompletion(this.request, this.response, ex);
 

spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java

@@ -50,11 +50,6 @@ import org.springframework.web.servlet.mvc.method.annotation.ServletWebArgumentR
 import org.springframework.web.util.UrlPathHelper;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Test fixture for the configuration in mvc-config-annotation-driven.xml.
@@ -71,24 +66,24 @@ public class AnnotationDrivenBeanDefinitionParserTests {
 	public void testMessageCodesResolver() {
 		loadBeanDefinitions("mvc-config-message-codes-resolver.xml");
 		RequestMappingHandlerAdapter adapter = this.appContext.getBean(RequestMappingHandlerAdapter.class);
-		assertNotNull(adapter);
+		assertThat(adapter).isNotNull();
 		Object initializer = adapter.getWebBindingInitializer();
-		assertNotNull(initializer);
+		assertThat(initializer).isNotNull();
 		MessageCodesResolver resolver =
 				((ConfigurableWebBindingInitializer) initializer).getMessageCodesResolver();
-		assertNotNull(resolver);
-		assertEquals(TestMessageCodesResolver.class, resolver.getClass());
-		assertEquals(false, new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect"));
+		assertThat(resolver).isNotNull();
+		assertThat(resolver.getClass()).isEqualTo(TestMessageCodesResolver.class);
+		assertThat(new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect")).isEqualTo(false);
 	}
 
 	@Test
 	public void testPathMatchingConfiguration() {
 		loadBeanDefinitions("mvc-config-path-matching.xml");
 		RequestMappingHandlerMapping hm = this.appContext.getBean(RequestMappingHandlerMapping.class);
-		assertNotNull(hm);
-		assertTrue(hm.useSuffixPatternMatch());
-		assertFalse(hm.useTrailingSlashMatch());
-		assertTrue(hm.useRegisteredSuffixPatternMatch());
+		assertThat(hm).isNotNull();
+		assertThat(hm.useSuffixPatternMatch()).isTrue();
+		assertThat(hm.useTrailingSlashMatch()).isFalse();
+		assertThat(hm.useRegisteredSuffixPatternMatch()).isTrue();
 		assertThat(hm.getUrlPathHelper()).isInstanceOf(TestPathHelper.class);
 		assertThat(hm.getPathMatcher()).isInstanceOf(TestPathMatcher.class);
 		List<String> fileExtensions = hm.getContentNegotiationManager().getAllFileExtensions();
@@ -119,17 +114,17 @@ public class AnnotationDrivenBeanDefinitionParserTests {
 	}
 
 	private void testArgumentResolvers(Object bean) {
-		assertNotNull(bean);
+		assertThat(bean).isNotNull();
 		Object value = new DirectFieldAccessor(bean).getPropertyValue("customArgumentResolvers");
-		assertNotNull(value);
-		assertTrue(value instanceof List);
+		assertThat(value).isNotNull();
+		assertThat(value instanceof List).isTrue();
 		@SuppressWarnings("unchecked")
 		List<HandlerMethodArgumentResolver> resolvers = (List<HandlerMethodArgumentResolver>) value;
-		assertEquals(3, resolvers.size());
-		assertTrue(resolvers.get(0) instanceof ServletWebArgumentResolverAdapter);
-		assertTrue(resolvers.get(1) instanceof TestHandlerMethodArgumentResolver);
-		assertTrue(resolvers.get(2) instanceof TestHandlerMethodArgumentResolver);
-		assertNotSame(resolvers.get(1), resolvers.get(2));
+		assertThat(resolvers.size()).isEqualTo(3);
+		assertThat(resolvers.get(0) instanceof ServletWebArgumentResolverAdapter).isTrue();
+		assertThat(resolvers.get(1) instanceof TestHandlerMethodArgumentResolver).isTrue();
+		assertThat(resolvers.get(2) instanceof TestHandlerMethodArgumentResolver).isTrue();
+		assertThat(resolvers.get(2)).isNotSameAs(resolvers.get(1));
 	}
 
 	@Test
@@ -140,24 +135,24 @@ public class AnnotationDrivenBeanDefinitionParserTests {
 	}
 
 	private void testReturnValueHandlers(Object bean) {
-		assertNotNull(bean);
+		assertThat(bean).isNotNull();
 		Object value = new DirectFieldAccessor(bean).getPropertyValue("customReturnValueHandlers");
-		assertNotNull(value);
-		assertTrue(value instanceof List);
+		assertThat(value).isNotNull();
+		assertThat(value instanceof List).isTrue();
 		@SuppressWarnings("unchecked")
 		List<HandlerMethodReturnValueHandler> handlers = (List<HandlerMethodReturnValueHandler>) value;
-		assertEquals(2, handlers.size());
-		assertEquals(TestHandlerMethodReturnValueHandler.class, handlers.get(0).getClass());
-		assertEquals(TestHandlerMethodReturnValueHandler.class, handlers.get(1).getClass());
-		assertNotSame(handlers.get(0), handlers.get(1));
+		assertThat(handlers.size()).isEqualTo(2);
+		assertThat(handlers.get(0).getClass()).isEqualTo(TestHandlerMethodReturnValueHandler.class);
+		assertThat(handlers.get(1).getClass()).isEqualTo(TestHandlerMethodReturnValueHandler.class);
+		assertThat(handlers.get(1)).isNotSameAs(handlers.get(0));
 	}
 
 	@Test
 	public void beanNameUrlHandlerMapping() {
 		loadBeanDefinitions("mvc-config.xml");
 		BeanNameUrlHandlerMapping mapping = this.appContext.getBean(BeanNameUrlHandlerMapping.class);
-		assertNotNull(mapping);
-		assertEquals(2, mapping.getOrder());
+		assertThat(mapping).isNotNull();
+		assertThat(mapping.getOrder()).isEqualTo(2);
 	}
 
 	private void loadBeanDefinitions(String fileName) {
@@ -169,40 +164,40 @@ public class AnnotationDrivenBeanDefinitionParserTests {
 
 	@SuppressWarnings("unchecked")
 	private void verifyMessageConverters(Object bean, boolean hasDefaultRegistrations) {
-		assertNotNull(bean);
+		assertThat(bean).isNotNull();
 		Object value = new DirectFieldAccessor(bean).getPropertyValue("messageConverters");
-		assertNotNull(value);
-		assertTrue(value instanceof List);
+		assertThat(value).isNotNull();
+		assertThat(value instanceof List).isTrue();
 		List<HttpMessageConverter<?>> converters = (List<HttpMessageConverter<?>>) value;
 		if (hasDefaultRegistrations) {
-			assertTrue("Default and custom converter expected", converters.size() > 2);
+			assertThat(converters.size() > 2).as("Default and custom converter expected").isTrue();
 		}
 		else {
-			assertTrue("Only custom converters expected", converters.size() == 2);
+			assertThat(converters.size() == 2).as("Only custom converters expected").isTrue();
 		}
-		assertTrue(converters.get(0) instanceof StringHttpMessageConverter);
-		assertTrue(converters.get(1) instanceof ResourceHttpMessageConverter);
+		assertThat(converters.get(0) instanceof StringHttpMessageConverter).isTrue();
+		assertThat(converters.get(1) instanceof ResourceHttpMessageConverter).isTrue();
 	}
 
 	@SuppressWarnings("unchecked")
 	private void verifyResponseBodyAdvice(Object bean) {
-		assertNotNull(bean);
+		assertThat(bean).isNotNull();
 		Object value = new DirectFieldAccessor(bean).getPropertyValue("responseBodyAdvice");
-		assertNotNull(value);
-		assertTrue(value instanceof List);
+		assertThat(value).isNotNull();
+		assertThat(value instanceof List).isTrue();
 		List<ResponseBodyAdvice<?>> converters = (List<ResponseBodyAdvice<?>>) value;
-		assertTrue(converters.get(0) instanceof JsonViewResponseBodyAdvice);
+		assertThat(converters.get(0) instanceof JsonViewResponseBodyAdvice).isTrue();
 	}
 
 	@SuppressWarnings("unchecked")
 	private void verifyRequestResponseBodyAdvice(Object bean) {
-		assertNotNull(bean);
+		assertThat(bean).isNotNull();
 		Object value = new DirectFieldAccessor(bean).getPropertyValue("requestResponseBodyAdvice");
-		assertNotNull(value);
-		assertTrue(value instanceof List);
+		assertThat(value).isNotNull();
+		assertThat(value instanceof List).isTrue();
 		List<ResponseBodyAdvice<?>> converters = (List<ResponseBodyAdvice<?>>) value;
-		assertTrue(converters.get(0) instanceof JsonViewRequestBodyAdvice);
-		assertTrue(converters.get(1) instanceof JsonViewResponseBodyAdvice);
+		assertThat(converters.get(0) instanceof JsonViewRequestBodyAdvice).isTrue();
+		assertThat(converters.get(1) instanceof JsonViewResponseBodyAdvice).isTrue();
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java

@@ -142,13 +142,6 @@ import org.springframework.web.util.UrlPathHelper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Tests loading actual MVC namespace configuration.
@@ -195,38 +188,38 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config.xml");
 
 		RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class);
-		assertNotNull(mapping);
-		assertEquals(0, mapping.getOrder());
-		assertTrue(mapping.getUrlPathHelper().shouldRemoveSemicolonContent());
+		assertThat(mapping).isNotNull();
+		assertThat(mapping.getOrder()).isEqualTo(0);
+		assertThat(mapping.getUrlPathHelper().shouldRemoveSemicolonContent()).isTrue();
 		mapping.setDefaultHandler(handlerMethod);
 
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo.json");
 		NativeWebRequest webRequest = new ServletWebRequest(request);
 		ContentNegotiationManager manager = mapping.getContentNegotiationManager();
-		assertEquals(Collections.singletonList(MediaType.APPLICATION_JSON), manager.resolveMediaTypes(webRequest));
+		assertThat(manager.resolveMediaTypes(webRequest)).isEqualTo(Collections.singletonList(MediaType.APPLICATION_JSON));
 
 		RequestMappingHandlerAdapter adapter = appContext.getBean(RequestMappingHandlerAdapter.class);
-		assertNotNull(adapter);
-		assertEquals(false, new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect"));
+		assertThat(adapter).isNotNull();
+		assertThat(new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect")).isEqualTo(false);
 
 		List<HttpMessageConverter<?>> converters = adapter.getMessageConverters();
-		assertTrue(converters.size() > 0);
+		assertThat(converters.size() > 0).isTrue();
 		for (HttpMessageConverter<?> converter : converters) {
 			if (converter instanceof AbstractJackson2HttpMessageConverter) {
 				ObjectMapper objectMapper = ((AbstractJackson2HttpMessageConverter) converter).getObjectMapper();
-				assertFalse(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
-				assertFalse(objectMapper.getSerializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
-				assertFalse(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
+				assertThat(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION)).isFalse();
+				assertThat(objectMapper.getSerializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION)).isFalse();
+				assertThat(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)).isFalse();
 				if (converter instanceof MappingJackson2XmlHttpMessageConverter) {
-					assertEquals(XmlMapper.class, objectMapper.getClass());
+					assertThat(objectMapper.getClass()).isEqualTo(XmlMapper.class);
 				}
 			}
 		}
 
-		assertNotNull(appContext.getBean(FormattingConversionServiceFactoryBean.class));
-		assertNotNull(appContext.getBean(ConversionService.class));
-		assertNotNull(appContext.getBean(LocalValidatorFactoryBean.class));
-		assertNotNull(appContext.getBean(Validator.class));
+		assertThat(appContext.getBean(FormattingConversionServiceFactoryBean.class)).isNotNull();
+		assertThat(appContext.getBean(ConversionService.class)).isNotNull();
+		assertThat(appContext.getBean(LocalValidatorFactoryBean.class)).isNotNull();
+		assertThat(appContext.getBean(Validator.class)).isNotNull();
 
 		// default web binding initializer behavior test
 		request = new MockHttpServletRequest("GET", "/");
@@ -235,29 +228,29 @@ public class MvcNamespaceTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		HandlerExecutionChain chain = mapping.getHandler(request);
-		assertEquals(1, chain.getInterceptors().length);
-		assertTrue(chain.getInterceptors()[0] instanceof ConversionServiceExposingInterceptor);
+		assertThat(chain.getInterceptors().length).isEqualTo(1);
+		assertThat(chain.getInterceptors()[0] instanceof ConversionServiceExposingInterceptor).isTrue();
 		ConversionServiceExposingInterceptor interceptor = (ConversionServiceExposingInterceptor) chain.getInterceptors()[0];
 		interceptor.preHandle(request, response, handlerMethod);
-		assertSame(appContext.getBean(ConversionService.class), request.getAttribute(ConversionService.class.getName()));
+		assertThat(request.getAttribute(ConversionService.class.getName())).isSameAs(appContext.getBean(ConversionService.class));
 
 		adapter.handle(request, response, handlerMethod);
-		assertTrue(handler.recordedValidationError);
-		assertEquals(LocalDate.parse("2009-10-31").toDate(), handler.date);
-		assertEquals(Double.valueOf(0.9999), handler.percent);
+		assertThat(handler.recordedValidationError).isTrue();
+		assertThat(handler.date).isEqualTo(LocalDate.parse("2009-10-31").toDate());
+		assertThat(handler.percent).isEqualTo(Double.valueOf(0.9999));
 
 		CompositeUriComponentsContributor uriComponentsContributor = this.appContext.getBean(
 				MvcUriComponentsBuilder.MVC_URI_COMPONENTS_CONTRIBUTOR_BEAN_NAME,
 				CompositeUriComponentsContributor.class);
 
-		assertNotNull(uriComponentsContributor);
+		assertThat(uriComponentsContributor).isNotNull();
 
 		String name = "mvcHandlerMappingIntrospector";
 		HandlerMappingIntrospector introspector = this.appContext.getBean(name, HandlerMappingIntrospector.class);
-		assertNotNull(introspector);
-		assertEquals(2, introspector.getHandlerMappings().size());
-		assertSame(mapping, introspector.getHandlerMappings().get(0));
-		assertEquals(BeanNameUrlHandlerMapping.class, introspector.getHandlerMappings().get(1).getClass());
+		assertThat(introspector).isNotNull();
+		assertThat(introspector.getHandlerMappings().size()).isEqualTo(2);
+		assertThat(introspector.getHandlerMappings().get(0)).isSameAs(mapping);
+		assertThat(introspector.getHandlerMappings().get(1).getClass()).isEqualTo(BeanNameUrlHandlerMapping.class);
 	}
 
 	@Test
@@ -265,7 +258,7 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-custom-conversion-service.xml");
 
 		RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class);
-		assertNotNull(mapping);
+		assertThat(mapping).isNotNull();
 		mapping.setDefaultHandler(handlerMethod);
 
 		// default web binding initializer behavior test
@@ -275,14 +268,14 @@ public class MvcNamespaceTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		HandlerExecutionChain chain = mapping.getHandler(request);
-		assertEquals(1, chain.getInterceptors().length);
-		assertTrue(chain.getInterceptors()[0] instanceof ConversionServiceExposingInterceptor);
+		assertThat(chain.getInterceptors().length).isEqualTo(1);
+		assertThat(chain.getInterceptors()[0] instanceof ConversionServiceExposingInterceptor).isTrue();
 		ConversionServiceExposingInterceptor interceptor = (ConversionServiceExposingInterceptor) chain.getInterceptors()[0];
 		interceptor.preHandle(request, response, handler);
-		assertSame(appContext.getBean("conversionService"), request.getAttribute(ConversionService.class.getName()));
+		assertThat(request.getAttribute(ConversionService.class.getName())).isSameAs(appContext.getBean("conversionService"));
 
 		RequestMappingHandlerAdapter adapter = appContext.getBean(RequestMappingHandlerAdapter.class);
-		assertNotNull(adapter);
+		assertThat(adapter).isNotNull();
 		assertThatExceptionOfType(TypeMismatchException.class).isThrownBy(() ->
 				adapter.handle(request, response, handlerMethod));
 	}
@@ -296,12 +289,12 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions(xml);
 
 		RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class);
-		assertNotNull(mapping);
-		assertFalse(mapping.getUrlPathHelper().shouldRemoveSemicolonContent());
+		assertThat(mapping).isNotNull();
+		assertThat(mapping.getUrlPathHelper().shouldRemoveSemicolonContent()).isFalse();
 
 		RequestMappingHandlerAdapter adapter = appContext.getBean(RequestMappingHandlerAdapter.class);
-		assertNotNull(adapter);
-		assertEquals(true, new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect"));
+		assertThat(adapter).isNotNull();
+		assertThat(new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect")).isEqualTo(true);
 
 		// default web binding initializer behavior test
 		MockHttpServletRequest request = new MockHttpServletRequest();
@@ -309,8 +302,8 @@ public class MvcNamespaceTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		adapter.handle(request, response, handlerMethod);
 
-		assertTrue(appContext.getBean(TestValidator.class).validatorInvoked);
-		assertFalse(handler.recordedValidationError);
+		assertThat(appContext.getBean(TestValidator.class).validatorInvoked).isTrue();
+		assertThat(handler.recordedValidationError).isFalse();
 	}
 
 	@Test
@@ -318,7 +311,7 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-interceptors.xml");
 
 		RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class);
-		assertNotNull(mapping);
+		assertThat(mapping).isNotNull();
 		mapping.setDefaultHandler(handlerMethod);
 
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/");
@@ -327,50 +320,49 @@ public class MvcNamespaceTests {
 		request.addParameter("theme", "green");
 
 		HandlerExecutionChain chain = mapping.getHandler(request);
-		assertEquals(4, chain.getInterceptors().length);
-		assertTrue(chain.getInterceptors()[0] instanceof ConversionServiceExposingInterceptor);
-		assertTrue(chain.getInterceptors()[1] instanceof LocaleChangeInterceptor);
-		assertTrue(chain.getInterceptors()[2] instanceof ThemeChangeInterceptor);
-		assertTrue(chain.getInterceptors()[3] instanceof UserRoleAuthorizationInterceptor);
+		assertThat(chain.getInterceptors().length).isEqualTo(4);
+		assertThat(chain.getInterceptors()[0] instanceof ConversionServiceExposingInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[1] instanceof LocaleChangeInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[2] instanceof ThemeChangeInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[3] instanceof UserRoleAuthorizationInterceptor).isTrue();
 
 		request.setRequestURI("/admin/users");
 		chain = mapping.getHandler(request);
-		assertEquals(2, chain.getInterceptors().length);
+		assertThat(chain.getInterceptors().length).isEqualTo(2);
 
 		request.setRequestURI("/logged/accounts/12345");
 		chain = mapping.getHandler(request);
-		assertEquals(3, chain.getInterceptors().length);
+		assertThat(chain.getInterceptors().length).isEqualTo(3);
 
 		request.setRequestURI("/foo/logged");
 		chain = mapping.getHandler(request);
-		assertEquals(3, chain.getInterceptors().length);
+		assertThat(chain.getInterceptors().length).isEqualTo(3);
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	public void testResources() throws Exception {
 		loadBeanDefinitions("mvc-config-resources.xml");
 
 		HttpRequestHandlerAdapter adapter = appContext.getBean(HttpRequestHandlerAdapter.class);
-		assertNotNull(adapter);
+		assertThat(adapter).isNotNull();
 
 		RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class);
 		ContentNegotiationManager manager = mapping.getContentNegotiationManager();
 
 		ResourceHttpRequestHandler handler = appContext.getBean(ResourceHttpRequestHandler.class);
-		assertNotNull(handler);
-		assertSame(manager, handler.getContentNegotiationManager());
+		assertThat(handler).isNotNull();
+		assertThat(handler.getContentNegotiationManager()).isSameAs(manager);
 
 		SimpleUrlHandlerMapping resourceMapping = appContext.getBean(SimpleUrlHandlerMapping.class);
-		assertNotNull(resourceMapping);
-		assertEquals(Ordered.LOWEST_PRECEDENCE - 1, resourceMapping.getOrder());
+		assertThat(resourceMapping).isNotNull();
+		assertThat(resourceMapping.getOrder()).isEqualTo(Ordered.LOWEST_PRECEDENCE - 1);
 
 		BeanNameUrlHandlerMapping beanNameMapping = appContext.getBean(BeanNameUrlHandlerMapping.class);
-		assertNotNull(beanNameMapping);
-		assertEquals(2, beanNameMapping.getOrder());
+		assertThat(beanNameMapping).isNotNull();
+		assertThat(beanNameMapping.getOrder()).isEqualTo(2);
 
 		ResourceUrlProvider urlProvider = appContext.getBean(ResourceUrlProvider.class);
-		assertNotNull(urlProvider);
+		assertThat(urlProvider).isNotNull();
 
 		Map<String, MappedInterceptor> beans = appContext.getBeansOfType(MappedInterceptor.class);
 		List<Class<?>> interceptors = beans.values().stream()
@@ -384,15 +376,15 @@ public class MvcNamespaceTests {
 		request.setMethod("GET");
 
 		HandlerExecutionChain chain = resourceMapping.getHandler(request);
-		assertNotNull(chain);
-		assertTrue(chain.getHandler() instanceof ResourceHttpRequestHandler);
+		assertThat(chain).isNotNull();
+		assertThat(chain.getHandler() instanceof ResourceHttpRequestHandler).isTrue();
 
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		for (HandlerInterceptor interceptor : chain.getInterceptors()) {
 			interceptor.preHandle(request, response, chain.getHandler());
 		}
 		ModelAndView mv = adapter.handle(request, response, chain.getHandler());
-		assertNull(mv);
+		assertThat((Object) mv).isNull();
 	}
 
 	@Test
@@ -400,14 +392,14 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-resources-optional-attrs.xml");
 
 		SimpleUrlHandlerMapping mapping = appContext.getBean(SimpleUrlHandlerMapping.class);
-		assertNotNull(mapping);
-		assertEquals(5, mapping.getOrder());
-		assertNotNull(mapping.getUrlMap().get("/resources/**"));
+		assertThat(mapping).isNotNull();
+		assertThat(mapping.getOrder()).isEqualTo(5);
+		assertThat(mapping.getUrlMap().get("/resources/**")).isNotNull();
 
 		ResourceHttpRequestHandler handler = appContext.getBean((String) mapping.getUrlMap().get("/resources/**"),
 				ResourceHttpRequestHandler.class);
-		assertNotNull(handler);
-		assertEquals(3600, handler.getCacheSeconds());
+		assertThat(handler).isNotNull();
+		assertThat(handler.getCacheSeconds()).isEqualTo(3600);
 	}
 
 	@Test
@@ -415,13 +407,13 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-resources-chain.xml");
 
 		SimpleUrlHandlerMapping mapping = appContext.getBean(SimpleUrlHandlerMapping.class);
-		assertNotNull(mapping);
-		assertNotNull(mapping.getUrlMap().get("/resources/**"));
+		assertThat(mapping).isNotNull();
+		assertThat(mapping.getUrlMap().get("/resources/**")).isNotNull();
 		String beanName = (String) mapping.getUrlMap().get("/resources/**");
 		ResourceHttpRequestHandler handler = appContext.getBean(beanName, ResourceHttpRequestHandler.class);
-		assertNotNull(handler);
+		assertThat(handler).isNotNull();
 
-		assertNotNull(handler.getUrlPathHelper());
+		assertThat(handler.getUrlPathHelper()).isNotNull();
 
 		List<ResourceResolver> resolvers = handler.getResourceResolvers();
 		assertThat(resolvers).hasSize(4);
@@ -432,7 +424,7 @@ public class MvcNamespaceTests {
 
 		CachingResourceResolver cachingResolver = (CachingResourceResolver) resolvers.get(0);
 		assertThat(cachingResolver.getCache()).isInstanceOf(ConcurrentMapCache.class);
-		assertEquals("test-resource-cache", cachingResolver.getCache().getName());
+		assertThat(cachingResolver.getCache().getName()).isEqualTo("test-resource-cache");
 
 		VersionResourceResolver versionResolver = (VersionResourceResolver) resolvers.get(1);
 		assertThat(versionResolver.getStrategyMap().get("/**/*.js"))
@@ -442,8 +434,8 @@ public class MvcNamespaceTests {
 
 		PathResourceResolver pathResolver = (PathResourceResolver) resolvers.get(3);
 		Map<Resource, Charset> locationCharsets = pathResolver.getLocationCharsets();
-		assertEquals(1, locationCharsets.size());
-		assertEquals(StandardCharsets.ISO_8859_1, locationCharsets.values().iterator().next());
+		assertThat(locationCharsets.size()).isEqualTo(1);
+		assertThat(locationCharsets.values().iterator().next()).isEqualTo(StandardCharsets.ISO_8859_1);
 
 		List<ResourceTransformer> transformers = handler.getResourceTransformers();
 		assertThat(transformers).hasSize(3);
@@ -453,7 +445,7 @@ public class MvcNamespaceTests {
 
 		CachingResourceTransformer cachingTransformer = (CachingResourceTransformer) transformers.get(0);
 		assertThat(cachingTransformer.getCache()).isInstanceOf(ConcurrentMapCache.class);
-		assertEquals("test-resource-cache", cachingTransformer.getCache().getName());
+		assertThat(cachingTransformer.getCache().getName()).isEqualTo("test-resource-cache");
 	}
 
 	@Test
@@ -461,11 +453,11 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-resources-chain-no-auto.xml");
 
 		SimpleUrlHandlerMapping mapping = appContext.getBean(SimpleUrlHandlerMapping.class);
-		assertNotNull(mapping);
-		assertNotNull(mapping.getUrlMap().get("/resources/**"));
+		assertThat(mapping).isNotNull();
+		assertThat(mapping.getUrlMap().get("/resources/**")).isNotNull();
 		ResourceHttpRequestHandler handler = appContext.getBean((String) mapping.getUrlMap().get("/resources/**"),
 				ResourceHttpRequestHandler.class);
-		assertNotNull(handler);
+		assertThat(handler).isNotNull();
 
 		assertThat(handler.getCacheControl().getHeaderValue())
 				.isEqualTo(CacheControl.maxAge(1, TimeUnit.HOURS)
@@ -494,25 +486,25 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-default-servlet.xml");
 
 		HttpRequestHandlerAdapter adapter = appContext.getBean(HttpRequestHandlerAdapter.class);
-		assertNotNull(adapter);
+		assertThat(adapter).isNotNull();
 
 		DefaultServletHttpRequestHandler handler = appContext.getBean(DefaultServletHttpRequestHandler.class);
-		assertNotNull(handler);
+		assertThat(handler).isNotNull();
 
 		SimpleUrlHandlerMapping mapping = appContext.getBean(SimpleUrlHandlerMapping.class);
-		assertNotNull(mapping);
-		assertEquals(Ordered.LOWEST_PRECEDENCE, mapping.getOrder());
+		assertThat(mapping).isNotNull();
+		assertThat(mapping.getOrder()).isEqualTo(Ordered.LOWEST_PRECEDENCE);
 
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setRequestURI("/foo.css");
 		request.setMethod("GET");
 
 		HandlerExecutionChain chain = mapping.getHandler(request);
-		assertTrue(chain.getHandler() instanceof DefaultServletHttpRequestHandler);
+		assertThat(chain.getHandler() instanceof DefaultServletHttpRequestHandler).isTrue();
 
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = adapter.handle(request, response, chain.getHandler());
-		assertNull(mv);
+		assertThat((Object) mv).isNull();
 	}
 
 	@Test
@@ -520,25 +512,25 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-default-servlet-optional-attrs.xml");
 
 		HttpRequestHandlerAdapter adapter = appContext.getBean(HttpRequestHandlerAdapter.class);
-		assertNotNull(adapter);
+		assertThat(adapter).isNotNull();
 
 		DefaultServletHttpRequestHandler handler = appContext.getBean(DefaultServletHttpRequestHandler.class);
-		assertNotNull(handler);
+		assertThat(handler).isNotNull();
 
 		SimpleUrlHandlerMapping mapping = appContext.getBean(SimpleUrlHandlerMapping.class);
-		assertNotNull(mapping);
-		assertEquals(Ordered.LOWEST_PRECEDENCE, mapping.getOrder());
+		assertThat(mapping).isNotNull();
+		assertThat(mapping.getOrder()).isEqualTo(Ordered.LOWEST_PRECEDENCE);
 
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setRequestURI("/foo.css");
 		request.setMethod("GET");
 
 		HandlerExecutionChain chain = mapping.getHandler(request);
-		assertTrue(chain.getHandler() instanceof DefaultServletHttpRequestHandler);
+		assertThat(chain.getHandler() instanceof DefaultServletHttpRequestHandler).isTrue();
 
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = adapter.handle(request, response, chain.getHandler());
-		assertNull(mv);
+		assertThat((Object) mv).isNull();
 	}
 
 	@Test
@@ -546,20 +538,20 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-bean-decoration.xml");
 
 		RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class);
-		assertNotNull(mapping);
+		assertThat(mapping).isNotNull();
 		mapping.setDefaultHandler(handlerMethod);
 
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/");
 
 		HandlerExecutionChain chain = mapping.getHandler(request);
-		assertEquals(3, chain.getInterceptors().length);
-		assertTrue(chain.getInterceptors()[0] instanceof ConversionServiceExposingInterceptor);
-		assertTrue(chain.getInterceptors()[1] instanceof LocaleChangeInterceptor);
-		assertTrue(chain.getInterceptors()[2] instanceof ThemeChangeInterceptor);
+		assertThat(chain.getInterceptors().length).isEqualTo(3);
+		assertThat(chain.getInterceptors()[0] instanceof ConversionServiceExposingInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[1] instanceof LocaleChangeInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[2] instanceof ThemeChangeInterceptor).isTrue();
 		LocaleChangeInterceptor interceptor = (LocaleChangeInterceptor) chain.getInterceptors()[1];
-		assertEquals("lang", interceptor.getParamName());
+		assertThat(interceptor.getParamName()).isEqualTo("lang");
 		ThemeChangeInterceptor interceptor2 = (ThemeChangeInterceptor) chain.getInterceptors()[2];
-		assertEquals("style", interceptor2.getParamName());
+		assertThat(interceptor2.getParamName()).isEqualTo("style");
 	}
 
 	@Test
@@ -567,58 +559,58 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-view-controllers.xml");
 
 		RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class);
-		assertNotNull(mapping);
+		assertThat(mapping).isNotNull();
 		mapping.setDefaultHandler(handlerMethod);
 
 		BeanNameUrlHandlerMapping beanNameMapping = appContext.getBean(BeanNameUrlHandlerMapping.class);
-		assertNotNull(beanNameMapping);
-		assertEquals(2, beanNameMapping.getOrder());
+		assertThat(beanNameMapping).isNotNull();
+		assertThat(beanNameMapping.getOrder()).isEqualTo(2);
 
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("GET");
 
 		HandlerExecutionChain chain = mapping.getHandler(request);
-		assertEquals(3, chain.getInterceptors().length);
-		assertTrue(chain.getInterceptors()[0] instanceof ConversionServiceExposingInterceptor);
-		assertTrue(chain.getInterceptors()[1] instanceof LocaleChangeInterceptor);
-		assertTrue(chain.getInterceptors()[2] instanceof ThemeChangeInterceptor);
+		assertThat(chain.getInterceptors().length).isEqualTo(3);
+		assertThat(chain.getInterceptors()[0] instanceof ConversionServiceExposingInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[1] instanceof LocaleChangeInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[2] instanceof ThemeChangeInterceptor).isTrue();
 
 		SimpleUrlHandlerMapping mapping2 = appContext.getBean(SimpleUrlHandlerMapping.class);
-		assertNotNull(mapping2);
+		assertThat(mapping2).isNotNull();
 
 		SimpleControllerHandlerAdapter adapter = appContext.getBean(SimpleControllerHandlerAdapter.class);
-		assertNotNull(adapter);
+		assertThat(adapter).isNotNull();
 
 		request = new MockHttpServletRequest("GET", "/foo");
 		chain = mapping2.getHandler(request);
-		assertEquals(4, chain.getInterceptors().length);
-		assertTrue(chain.getInterceptors()[1] instanceof ConversionServiceExposingInterceptor);
-		assertTrue(chain.getInterceptors()[2] instanceof LocaleChangeInterceptor);
-		assertTrue(chain.getInterceptors()[3] instanceof ThemeChangeInterceptor);
+		assertThat(chain.getInterceptors().length).isEqualTo(4);
+		assertThat(chain.getInterceptors()[1] instanceof ConversionServiceExposingInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[2] instanceof LocaleChangeInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[3] instanceof ThemeChangeInterceptor).isTrue();
 		ModelAndView mv = adapter.handle(request, new MockHttpServletResponse(), chain.getHandler());
-		assertNull(mv.getViewName());
+		assertThat((Object) mv.getViewName()).isNull();
 
 		request = new MockHttpServletRequest("GET", "/myapp/app/bar");
 		request.setContextPath("/myapp");
 		request.setServletPath("/app");
 		chain = mapping2.getHandler(request);
-		assertEquals(4, chain.getInterceptors().length);
-		assertTrue(chain.getInterceptors()[1] instanceof ConversionServiceExposingInterceptor);
-		assertTrue(chain.getInterceptors()[2] instanceof LocaleChangeInterceptor);
-		assertTrue(chain.getInterceptors()[3] instanceof ThemeChangeInterceptor);
+		assertThat(chain.getInterceptors().length).isEqualTo(4);
+		assertThat(chain.getInterceptors()[1] instanceof ConversionServiceExposingInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[2] instanceof LocaleChangeInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[3] instanceof ThemeChangeInterceptor).isTrue();
 		mv = adapter.handle(request, new MockHttpServletResponse(), chain.getHandler());
-		assertEquals("baz", mv.getViewName());
+		assertThat(mv.getViewName()).isEqualTo("baz");
 
 		request = new MockHttpServletRequest("GET", "/myapp/app/");
 		request.setContextPath("/myapp");
 		request.setServletPath("/app");
 		chain = mapping2.getHandler(request);
-		assertEquals(4, chain.getInterceptors().length);
-		assertTrue(chain.getInterceptors()[1] instanceof ConversionServiceExposingInterceptor);
-		assertTrue(chain.getInterceptors()[2] instanceof LocaleChangeInterceptor);
-		assertTrue(chain.getInterceptors()[3] instanceof ThemeChangeInterceptor);
+		assertThat(chain.getInterceptors().length).isEqualTo(4);
+		assertThat(chain.getInterceptors()[1] instanceof ConversionServiceExposingInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[2] instanceof LocaleChangeInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[3] instanceof ThemeChangeInterceptor).isTrue();
 		mv = adapter.handle(request, new MockHttpServletResponse(), chain.getHandler());
-		assertEquals("root", mv.getViewName());
+		assertThat(mv.getViewName()).isEqualTo("root");
 
 		request = new MockHttpServletRequest("GET", "/myapp/app/old");
 		request.setContextPath("/myapp");
@@ -626,20 +618,20 @@ public class MvcNamespaceTests {
 		request.setQueryString("a=b");
 		chain = mapping2.getHandler(request);
 		mv = adapter.handle(request, new MockHttpServletResponse(), chain.getHandler());
-		assertNotNull(mv.getView());
-		assertEquals(RedirectView.class, mv.getView().getClass());
+		assertThat(mv.getView()).isNotNull();
+		assertThat(mv.getView().getClass()).isEqualTo(RedirectView.class);
 		RedirectView redirectView = (RedirectView) mv.getView();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		redirectView.render(Collections.emptyMap(), request, response);
-		assertEquals("/new?a=b", response.getRedirectedUrl());
-		assertEquals(308, response.getStatus());
+		assertThat(response.getRedirectedUrl()).isEqualTo("/new?a=b");
+		assertThat(response.getStatus()).isEqualTo(308);
 
 		request = new MockHttpServletRequest("GET", "/bad");
 		chain = mapping2.getHandler(request);
 		response = new MockHttpServletResponse();
 		mv = adapter.handle(request, response, chain.getHandler());
-		assertNull(mv);
-		assertEquals(404, response.getStatus());
+		assertThat(mv).isNull();
+		assertThat(response.getStatus()).isEqualTo(404);
 	}
 
 	/** WebSphere gives trailing servlet path slashes by default!! */
@@ -657,34 +649,34 @@ public class MvcNamespaceTests {
 		request.setServletPath("/app/");
 		request.setAttribute("com.ibm.websphere.servlet.uri_non_decoded", "/myapp/app/bar");
 		HandlerExecutionChain chain = mapping2.getHandler(request);
-		assertEquals(4, chain.getInterceptors().length);
-		assertTrue(chain.getInterceptors()[1] instanceof ConversionServiceExposingInterceptor);
-		assertTrue(chain.getInterceptors()[2] instanceof LocaleChangeInterceptor);
-		assertTrue(chain.getInterceptors()[3] instanceof ThemeChangeInterceptor);
+		assertThat(chain.getInterceptors().length).isEqualTo(4);
+		assertThat(chain.getInterceptors()[1] instanceof ConversionServiceExposingInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[2] instanceof LocaleChangeInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[3] instanceof ThemeChangeInterceptor).isTrue();
 		ModelAndView mv2 = adapter.handle(request, new MockHttpServletResponse(), chain.getHandler());
-		assertEquals("baz", mv2.getViewName());
+		assertThat(mv2.getViewName()).isEqualTo("baz");
 
 		request.setRequestURI("/myapp/app/");
 		request.setContextPath("/myapp");
 		request.setServletPath("/app/");
 		chain = mapping2.getHandler(request);
-		assertEquals(4, chain.getInterceptors().length);
-		assertTrue(chain.getInterceptors()[1] instanceof ConversionServiceExposingInterceptor);
-		assertTrue(chain.getInterceptors()[2] instanceof LocaleChangeInterceptor);
-		assertTrue(chain.getInterceptors()[3] instanceof ThemeChangeInterceptor);
+		assertThat(chain.getInterceptors().length).isEqualTo(4);
+		assertThat(chain.getInterceptors()[1] instanceof ConversionServiceExposingInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[2] instanceof LocaleChangeInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[3] instanceof ThemeChangeInterceptor).isTrue();
 		ModelAndView mv3 = adapter.handle(request, new MockHttpServletResponse(), chain.getHandler());
-		assertEquals("root", mv3.getViewName());
+		assertThat(mv3.getViewName()).isEqualTo("root");
 
 		request.setRequestURI("/myapp/");
 		request.setContextPath("/myapp");
 		request.setServletPath("/");
 		chain = mapping2.getHandler(request);
-		assertEquals(4, chain.getInterceptors().length);
-		assertTrue(chain.getInterceptors()[1] instanceof ConversionServiceExposingInterceptor);
-		assertTrue(chain.getInterceptors()[2] instanceof LocaleChangeInterceptor);
-		assertTrue(chain.getInterceptors()[3] instanceof ThemeChangeInterceptor);
+		assertThat(chain.getInterceptors().length).isEqualTo(4);
+		assertThat(chain.getInterceptors()[1] instanceof ConversionServiceExposingInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[2] instanceof LocaleChangeInterceptor).isTrue();
+		assertThat(chain.getInterceptors()[3] instanceof ThemeChangeInterceptor).isTrue();
 		mv3 = adapter.handle(request, new MockHttpServletResponse(), chain.getHandler());
-		assertEquals("root", mv3.getViewName());
+		assertThat(mv3.getViewName()).isEqualTo("root");
 	}
 
 	@Test
@@ -692,22 +684,22 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-view-controllers-minimal.xml");
 
 		SimpleUrlHandlerMapping hm = this.appContext.getBean(SimpleUrlHandlerMapping.class);
-		assertNotNull(hm);
+		assertThat(hm).isNotNull();
 		ParameterizableViewController viewController = (ParameterizableViewController) hm.getUrlMap().get("/path");
-		assertNotNull(viewController);
-		assertEquals("home", viewController.getViewName());
+		assertThat(viewController).isNotNull();
+		assertThat(viewController.getViewName()).isEqualTo("home");
 
 		ParameterizableViewController redirectViewController = (ParameterizableViewController) hm.getUrlMap().get("/old");
-		assertNotNull(redirectViewController);
+		assertThat(redirectViewController).isNotNull();
 		assertThat(redirectViewController.getView()).isInstanceOf(RedirectView.class);
 
 		ParameterizableViewController statusViewController = (ParameterizableViewController) hm.getUrlMap().get("/bad");
-		assertNotNull(statusViewController);
-		assertEquals(404, statusViewController.getStatusCode().value());
+		assertThat(statusViewController).isNotNull();
+		assertThat(statusViewController.getStatusCode().value()).isEqualTo(404);
 
 		BeanNameUrlHandlerMapping beanNameMapping = this.appContext.getBean(BeanNameUrlHandlerMapping.class);
-		assertNotNull(beanNameMapping);
-		assertEquals(2, beanNameMapping.getOrder());
+		assertThat(beanNameMapping).isNotNull();
+		assertThat(beanNameMapping.getOrder()).isEqualTo(2);
 	}
 
 	@Test
@@ -719,17 +711,16 @@ public class MvcNamespaceTests {
 
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo.xml");
 		NativeWebRequest webRequest = new ServletWebRequest(request);
-		assertEquals(Collections.singletonList(MediaType.valueOf("application/rss+xml")),
-				manager.resolveMediaTypes(webRequest));
+		assertThat(manager.resolveMediaTypes(webRequest)).isEqualTo(Collections.singletonList(MediaType.valueOf("application/rss+xml")));
 
 		ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class);
-		assertNotNull(compositeResolver);
-		assertEquals("Actual: " + compositeResolver.getViewResolvers(), 1, compositeResolver.getViewResolvers().size());
+		assertThat(compositeResolver).isNotNull();
+		assertThat(compositeResolver.getViewResolvers().size()).as("Actual: " + compositeResolver.getViewResolvers()).isEqualTo(1);
 
 		ViewResolver resolver = compositeResolver.getViewResolvers().get(0);
-		assertEquals(ContentNegotiatingViewResolver.class, resolver.getClass());
+		assertThat(resolver.getClass()).isEqualTo(ContentNegotiatingViewResolver.class);
 		ContentNegotiatingViewResolver cnvr = (ContentNegotiatingViewResolver) resolver;
-		assertSame(manager, cnvr.getContentNegotiationManager());
+		assertThat(cnvr.getContentNegotiationManager()).isSameAs(manager);
 	}
 
 	@Test
@@ -737,19 +728,19 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-async-support.xml");
 
 		RequestMappingHandlerAdapter adapter = appContext.getBean(RequestMappingHandlerAdapter.class);
-		assertNotNull(adapter);
+		assertThat(adapter).isNotNull();
 
 		DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(adapter);
-		assertEquals(ConcurrentTaskExecutor.class, fieldAccessor.getPropertyValue("taskExecutor").getClass());
-		assertEquals(2500L, fieldAccessor.getPropertyValue("asyncRequestTimeout"));
+		assertThat(fieldAccessor.getPropertyValue("taskExecutor").getClass()).isEqualTo(ConcurrentTaskExecutor.class);
+		assertThat(fieldAccessor.getPropertyValue("asyncRequestTimeout")).isEqualTo(2500L);
 
 		CallableProcessingInterceptor[] callableInterceptors =
 				(CallableProcessingInterceptor[]) fieldAccessor.getPropertyValue("callableInterceptors");
-		assertEquals(1, callableInterceptors.length);
+		assertThat(callableInterceptors.length).isEqualTo(1);
 
 		DeferredResultProcessingInterceptor[] deferredResultInterceptors =
 				(DeferredResultProcessingInterceptor[]) fieldAccessor.getPropertyValue("deferredResultInterceptors");
-		assertEquals(1, deferredResultInterceptors.length);
+		assertThat(deferredResultInterceptors.length).isEqualTo(1);
 	}
 
 	@Test
@@ -757,78 +748,78 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-view-resolution.xml");
 
 		ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class);
-		assertNotNull(compositeResolver);
-		assertEquals("Actual: " + compositeResolver.getViewResolvers(), 8, compositeResolver.getViewResolvers().size());
-		assertEquals(Ordered.LOWEST_PRECEDENCE, compositeResolver.getOrder());
+		assertThat(compositeResolver).isNotNull();
+		assertThat(compositeResolver.getViewResolvers().size()).as("Actual: " + compositeResolver.getViewResolvers()).isEqualTo(8);
+		assertThat(compositeResolver.getOrder()).isEqualTo(Ordered.LOWEST_PRECEDENCE);
 
 		List<ViewResolver> resolvers = compositeResolver.getViewResolvers();
-		assertEquals(BeanNameViewResolver.class, resolvers.get(0).getClass());
+		assertThat(resolvers.get(0).getClass()).isEqualTo(BeanNameViewResolver.class);
 
 		ViewResolver resolver = resolvers.get(1);
-		assertEquals(InternalResourceViewResolver.class, resolver.getClass());
+		assertThat(resolver.getClass()).isEqualTo(InternalResourceViewResolver.class);
 		DirectFieldAccessor accessor = new DirectFieldAccessor(resolver);
-		assertEquals(InternalResourceView.class, accessor.getPropertyValue("viewClass"));
+		assertThat(accessor.getPropertyValue("viewClass")).isEqualTo(InternalResourceView.class);
 
-		assertEquals(TilesViewResolver.class, resolvers.get(2).getClass());
+		assertThat(resolvers.get(2).getClass()).isEqualTo(TilesViewResolver.class);
 
 		resolver = resolvers.get(3);
 		assertThat(resolver).isInstanceOf(FreeMarkerViewResolver.class);
 		accessor = new DirectFieldAccessor(resolver);
-		assertEquals("freemarker-", accessor.getPropertyValue("prefix"));
-		assertEquals(".freemarker", accessor.getPropertyValue("suffix"));
-		assertArrayEquals(new String[] {"my*", "*Report"}, (String[]) accessor.getPropertyValue("viewNames"));
-		assertEquals(1024, accessor.getPropertyValue("cacheLimit"));
+		assertThat(accessor.getPropertyValue("prefix")).isEqualTo("freemarker-");
+		assertThat(accessor.getPropertyValue("suffix")).isEqualTo(".freemarker");
+		assertThat((String[]) accessor.getPropertyValue("viewNames")).isEqualTo(new String[] {"my*", "*Report"});
+		assertThat(accessor.getPropertyValue("cacheLimit")).isEqualTo(1024);
 
 		resolver = resolvers.get(4);
 		assertThat(resolver).isInstanceOf(GroovyMarkupViewResolver.class);
 		accessor = new DirectFieldAccessor(resolver);
-		assertEquals("", accessor.getPropertyValue("prefix"));
-		assertEquals(".tpl", accessor.getPropertyValue("suffix"));
-		assertEquals(1024, accessor.getPropertyValue("cacheLimit"));
+		assertThat(accessor.getPropertyValue("prefix")).isEqualTo("");
+		assertThat(accessor.getPropertyValue("suffix")).isEqualTo(".tpl");
+		assertThat(accessor.getPropertyValue("cacheLimit")).isEqualTo(1024);
 
 		resolver = resolvers.get(5);
 		assertThat(resolver).isInstanceOf(ScriptTemplateViewResolver.class);
 		accessor = new DirectFieldAccessor(resolver);
-		assertEquals("", accessor.getPropertyValue("prefix"));
-		assertEquals("", accessor.getPropertyValue("suffix"));
-		assertEquals(1024, accessor.getPropertyValue("cacheLimit"));
+		assertThat(accessor.getPropertyValue("prefix")).isEqualTo("");
+		assertThat(accessor.getPropertyValue("suffix")).isEqualTo("");
+		assertThat(accessor.getPropertyValue("cacheLimit")).isEqualTo(1024);
 
-		assertEquals(InternalResourceViewResolver.class, resolvers.get(6).getClass());
-		assertEquals(InternalResourceViewResolver.class, resolvers.get(7).getClass());
+		assertThat(resolvers.get(6).getClass()).isEqualTo(InternalResourceViewResolver.class);
+		assertThat(resolvers.get(7).getClass()).isEqualTo(InternalResourceViewResolver.class);
 
 		TilesConfigurer tilesConfigurer = appContext.getBean(TilesConfigurer.class);
-		assertNotNull(tilesConfigurer);
+		assertThat(tilesConfigurer).isNotNull();
 		String[] definitions = {
 				"/org/springframework/web/servlet/resource/tiles/tiles1.xml",
 				"/org/springframework/web/servlet/resource/tiles/tiles2.xml"
 		};
 		accessor = new DirectFieldAccessor(tilesConfigurer);
-		assertArrayEquals(definitions, (String[]) accessor.getPropertyValue("definitions"));
-		assertTrue((boolean) accessor.getPropertyValue("checkRefresh"));
-		assertEquals(UnresolvingLocaleDefinitionsFactory.class, accessor.getPropertyValue("definitionsFactoryClass"));
-		assertEquals(SpringBeanPreparerFactory.class, accessor.getPropertyValue("preparerFactoryClass"));
+		assertThat((String[]) accessor.getPropertyValue("definitions")).isEqualTo(definitions);
+		assertThat((boolean) accessor.getPropertyValue("checkRefresh")).isTrue();
+		assertThat(accessor.getPropertyValue("definitionsFactoryClass")).isEqualTo(UnresolvingLocaleDefinitionsFactory.class);
+		assertThat(accessor.getPropertyValue("preparerFactoryClass")).isEqualTo(SpringBeanPreparerFactory.class);
 
 		FreeMarkerConfigurer freeMarkerConfigurer = appContext.getBean(FreeMarkerConfigurer.class);
-		assertNotNull(freeMarkerConfigurer);
+		assertThat(freeMarkerConfigurer).isNotNull();
 		accessor = new DirectFieldAccessor(freeMarkerConfigurer);
-		assertArrayEquals(new String[] {"/", "/test"}, (String[]) accessor.getPropertyValue("templateLoaderPaths"));
+		assertThat((String[]) accessor.getPropertyValue("templateLoaderPaths")).isEqualTo(new String[] {"/", "/test"});
 
 		GroovyMarkupConfigurer groovyMarkupConfigurer = appContext.getBean(GroovyMarkupConfigurer.class);
-		assertNotNull(groovyMarkupConfigurer);
-		assertEquals("/test", groovyMarkupConfigurer.getResourceLoaderPath());
-		assertTrue(groovyMarkupConfigurer.isAutoIndent());
-		assertFalse(groovyMarkupConfigurer.isCacheTemplates());
+		assertThat(groovyMarkupConfigurer).isNotNull();
+		assertThat(groovyMarkupConfigurer.getResourceLoaderPath()).isEqualTo("/test");
+		assertThat(groovyMarkupConfigurer.isAutoIndent()).isTrue();
+		assertThat(groovyMarkupConfigurer.isCacheTemplates()).isFalse();
 
 		ScriptTemplateConfigurer scriptTemplateConfigurer = appContext.getBean(ScriptTemplateConfigurer.class);
-		assertNotNull(scriptTemplateConfigurer);
-		assertEquals("render", scriptTemplateConfigurer.getRenderFunction());
-		assertEquals(MediaType.TEXT_PLAIN_VALUE, scriptTemplateConfigurer.getContentType());
-		assertEquals(StandardCharsets.ISO_8859_1, scriptTemplateConfigurer.getCharset());
-		assertEquals("classpath:", scriptTemplateConfigurer.getResourceLoaderPath());
-		assertFalse(scriptTemplateConfigurer.isSharedEngine());
+		assertThat(scriptTemplateConfigurer).isNotNull();
+		assertThat(scriptTemplateConfigurer.getRenderFunction()).isEqualTo("render");
+		assertThat(scriptTemplateConfigurer.getContentType()).isEqualTo(MediaType.TEXT_PLAIN_VALUE);
+		assertThat(scriptTemplateConfigurer.getCharset()).isEqualTo(StandardCharsets.ISO_8859_1);
+		assertThat(scriptTemplateConfigurer.getResourceLoaderPath()).isEqualTo("classpath:");
+		assertThat(scriptTemplateConfigurer.isSharedEngine()).isFalse();
 		String[] scripts = { "org/springframework/web/servlet/view/script/nashorn/render.js" };
 		accessor = new DirectFieldAccessor(scriptTemplateConfigurer);
-		assertArrayEquals(scripts, (String[]) accessor.getPropertyValue("scripts"));
+		assertThat((String[]) accessor.getPropertyValue("scripts")).isEqualTo(scripts);
 	}
 
 	@Test
@@ -836,23 +827,23 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-view-resolution-content-negotiation.xml");
 
 		ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class);
-		assertNotNull(compositeResolver);
-		assertEquals(1, compositeResolver.getViewResolvers().size());
-		assertEquals(Ordered.HIGHEST_PRECEDENCE, compositeResolver.getOrder());
+		assertThat(compositeResolver).isNotNull();
+		assertThat(compositeResolver.getViewResolvers().size()).isEqualTo(1);
+		assertThat(compositeResolver.getOrder()).isEqualTo(Ordered.HIGHEST_PRECEDENCE);
 
 		List<ViewResolver> resolvers = compositeResolver.getViewResolvers();
-		assertEquals(ContentNegotiatingViewResolver.class, resolvers.get(0).getClass());
+		assertThat(resolvers.get(0).getClass()).isEqualTo(ContentNegotiatingViewResolver.class);
 		ContentNegotiatingViewResolver cnvr = (ContentNegotiatingViewResolver) resolvers.get(0);
-		assertEquals(6, cnvr.getViewResolvers().size());
-		assertEquals(1, cnvr.getDefaultViews().size());
-		assertTrue(cnvr.isUseNotAcceptableStatusCode());
+		assertThat(cnvr.getViewResolvers().size()).isEqualTo(6);
+		assertThat(cnvr.getDefaultViews().size()).isEqualTo(1);
+		assertThat(cnvr.isUseNotAcceptableStatusCode()).isTrue();
 
 		String beanName = "contentNegotiationManager";
 		DirectFieldAccessor accessor = new DirectFieldAccessor(cnvr);
 		ContentNegotiationManager manager = (ContentNegotiationManager) accessor.getPropertyValue(beanName);
-		assertNotNull(manager);
-		assertSame(manager, this.appContext.getBean(ContentNegotiationManager.class));
-		assertSame(manager, this.appContext.getBean("mvcContentNegotiationManager"));
+		assertThat(manager).isNotNull();
+		assertThat(this.appContext.getBean(ContentNegotiationManager.class)).isSameAs(manager);
+		assertThat(this.appContext.getBean("mvcContentNegotiationManager")).isSameAs(manager);
 	}
 
 	@Test
@@ -860,9 +851,9 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-view-resolution-custom-order.xml");
 
 		ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class);
-		assertNotNull(compositeResolver);
-		assertEquals("Actual: " + compositeResolver.getViewResolvers(), 1, compositeResolver.getViewResolvers().size());
-		assertEquals(123, compositeResolver.getOrder());
+		assertThat(compositeResolver).isNotNull();
+		assertThat(compositeResolver.getViewResolvers().size()).as("Actual: " + compositeResolver.getViewResolvers()).isEqualTo(1);
+		assertThat(compositeResolver.getOrder()).isEqualTo(123);
 	}
 
 	@Test
@@ -870,19 +861,19 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-path-matching-mappings.xml");
 
 		RequestMappingHandlerMapping requestMapping = appContext.getBean(RequestMappingHandlerMapping.class);
-		assertNotNull(requestMapping);
-		assertEquals(TestPathHelper.class, requestMapping.getUrlPathHelper().getClass());
-		assertEquals(TestPathMatcher.class, requestMapping.getPathMatcher().getClass());
+		assertThat(requestMapping).isNotNull();
+		assertThat(requestMapping.getUrlPathHelper().getClass()).isEqualTo(TestPathHelper.class);
+		assertThat(requestMapping.getPathMatcher().getClass()).isEqualTo(TestPathMatcher.class);
 
 		SimpleUrlHandlerMapping viewController = appContext.getBean(VIEWCONTROLLER_BEAN_NAME, SimpleUrlHandlerMapping.class);
-		assertNotNull(viewController);
-		assertEquals(TestPathHelper.class, viewController.getUrlPathHelper().getClass());
-		assertEquals(TestPathMatcher.class, viewController.getPathMatcher().getClass());
+		assertThat(viewController).isNotNull();
+		assertThat(viewController.getUrlPathHelper().getClass()).isEqualTo(TestPathHelper.class);
+		assertThat(viewController.getPathMatcher().getClass()).isEqualTo(TestPathMatcher.class);
 
 		for (SimpleUrlHandlerMapping handlerMapping : appContext.getBeansOfType(SimpleUrlHandlerMapping.class).values()) {
-			assertNotNull(handlerMapping);
-			assertEquals(TestPathHelper.class, handlerMapping.getUrlPathHelper().getClass());
-			assertEquals(TestPathMatcher.class, handlerMapping.getPathMatcher().getClass());
+			assertThat(handlerMapping).isNotNull();
+			assertThat(handlerMapping.getUrlPathHelper().getClass()).isEqualTo(TestPathHelper.class);
+			assertThat(handlerMapping.getPathMatcher().getClass()).isEqualTo(TestPathMatcher.class);
 		}
 	}
 
@@ -891,23 +882,23 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-cors-minimal.xml");
 
 		String[] beanNames = appContext.getBeanNamesForType(AbstractHandlerMapping.class);
-		assertEquals(2, beanNames.length);
+		assertThat(beanNames.length).isEqualTo(2);
 		for (String beanName : beanNames) {
 			AbstractHandlerMapping handlerMapping = (AbstractHandlerMapping)appContext.getBean(beanName);
-			assertNotNull(handlerMapping);
+			assertThat(handlerMapping).isNotNull();
 			DirectFieldAccessor accessor = new DirectFieldAccessor(handlerMapping);
 			Map<String, CorsConfiguration> configs = ((UrlBasedCorsConfigurationSource) accessor
 					.getPropertyValue("corsConfigurationSource")).getCorsConfigurations();
-			assertNotNull(configs);
-			assertEquals(1, configs.size());
+			assertThat(configs).isNotNull();
+			assertThat(configs.size()).isEqualTo(1);
 			CorsConfiguration config = configs.get("/**");
-			assertNotNull(config);
-			assertArrayEquals(new String[]{"*"}, config.getAllowedOrigins().toArray());
-			assertArrayEquals(new String[]{"GET", "HEAD", "POST"}, config.getAllowedMethods().toArray());
-			assertArrayEquals(new String[]{"*"}, config.getAllowedHeaders().toArray());
-			assertNull(config.getExposedHeaders());
-			assertNull(config.getAllowCredentials());
-			assertEquals(Long.valueOf(1800), config.getMaxAge());
+			assertThat(config).isNotNull();
+			assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[]{"*"});
+			assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[]{"GET", "HEAD", "POST"});
+			assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[]{"*"});
+			assertThat(config.getExposedHeaders()).isNull();
+			assertThat(config.getAllowCredentials()).isNull();
+			assertThat(config.getMaxAge()).isEqualTo(Long.valueOf(1800));
 		}
 	}
 
@@ -916,30 +907,30 @@ public class MvcNamespaceTests {
 		loadBeanDefinitions("mvc-config-cors.xml");
 
 		String[] beanNames = appContext.getBeanNamesForType(AbstractHandlerMapping.class);
-		assertEquals(2, beanNames.length);
+		assertThat(beanNames.length).isEqualTo(2);
 		for (String beanName : beanNames) {
 			AbstractHandlerMapping handlerMapping = (AbstractHandlerMapping)appContext.getBean(beanName);
-			assertNotNull(handlerMapping);
+			assertThat(handlerMapping).isNotNull();
 			DirectFieldAccessor accessor = new DirectFieldAccessor(handlerMapping);
 			Map<String, CorsConfiguration> configs = ((UrlBasedCorsConfigurationSource) accessor
 					.getPropertyValue("corsConfigurationSource")).getCorsConfigurations();
-			assertNotNull(configs);
-			assertEquals(2, configs.size());
+			assertThat(configs).isNotNull();
+			assertThat(configs.size()).isEqualTo(2);
 			CorsConfiguration config = configs.get("/api/**");
-			assertNotNull(config);
-			assertArrayEquals(new String[]{"https://domain1.com", "https://domain2.com"}, config.getAllowedOrigins().toArray());
-			assertArrayEquals(new String[]{"GET", "PUT"}, config.getAllowedMethods().toArray());
-			assertArrayEquals(new String[]{"header1", "header2", "header3"}, config.getAllowedHeaders().toArray());
-			assertArrayEquals(new String[]{"header1", "header2"}, config.getExposedHeaders().toArray());
-			assertFalse(config.getAllowCredentials());
-			assertEquals(Long.valueOf(123), config.getMaxAge());
+			assertThat(config).isNotNull();
+			assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[]{"https://domain1.com", "https://domain2.com"});
+			assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[]{"GET", "PUT"});
+			assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[]{"header1", "header2", "header3"});
+			assertThat(config.getExposedHeaders().toArray()).isEqualTo(new String[]{"header1", "header2"});
+			assertThat(config.getAllowCredentials()).isFalse();
+			assertThat(config.getMaxAge()).isEqualTo(Long.valueOf(123));
 			config = configs.get("/resources/**");
-			assertArrayEquals(new String[]{"https://domain1.com"}, config.getAllowedOrigins().toArray());
-			assertArrayEquals(new String[]{"GET", "HEAD", "POST"}, config.getAllowedMethods().toArray());
-			assertArrayEquals(new String[]{"*"}, config.getAllowedHeaders().toArray());
-			assertNull(config.getExposedHeaders());
-			assertNull(config.getAllowCredentials());
-			assertEquals(Long.valueOf(1800), config.getMaxAge());
+			assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[]{"https://domain1.com"});
+			assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[]{"GET", "HEAD", "POST"});
+			assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[]{"*"});
+			assertThat(config.getExposedHeaders()).isNull();
+			assertThat(config.getAllowCredentials()).isNull();
+			assertThat(config.getMaxAge()).isEqualTo(1800L);
 		}
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurerTests.java

@@ -30,7 +30,7 @@ import org.springframework.web.accept.FixedContentNegotiationStrategy;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.ServletWebRequest;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture for {@link ContentNegotiationConfigurer} tests.
@@ -59,20 +59,17 @@ public class ContentNegotiationConfigurerTests {
 
 		this.servletRequest.setRequestURI("/flower.gif");
 
-		assertEquals("Should be able to resolve file extensions by default",
-				MediaType.IMAGE_GIF, manager.resolveMediaTypes(this.webRequest).get(0));
+		assertThat(manager.resolveMediaTypes(this.webRequest).get(0)).as("Should be able to resolve file extensions by default").isEqualTo(MediaType.IMAGE_GIF);
 
 		this.servletRequest.setRequestURI("/flower?format=gif");
 		this.servletRequest.addParameter("format", "gif");
 
-		assertEquals("Should not resolve request parameters by default",
-				ContentNegotiationStrategy.MEDIA_TYPE_ALL_LIST, manager.resolveMediaTypes(this.webRequest));
+		assertThat(manager.resolveMediaTypes(this.webRequest)).as("Should not resolve request parameters by default").isEqualTo(ContentNegotiationStrategy.MEDIA_TYPE_ALL_LIST);
 
 		this.servletRequest.setRequestURI("/flower");
 		this.servletRequest.addHeader("Accept", MediaType.IMAGE_GIF_VALUE);
 
-		assertEquals("Should resolve Accept header by default",
-				MediaType.IMAGE_GIF, manager.resolveMediaTypes(this.webRequest).get(0));
+		assertThat(manager.resolveMediaTypes(this.webRequest).get(0)).as("Should resolve Accept header by default").isEqualTo(MediaType.IMAGE_GIF);
 	}
 
 	@Test
@@ -81,7 +78,7 @@ public class ContentNegotiationConfigurerTests {
 		ContentNegotiationManager manager = this.configurer.buildContentNegotiationManager();
 
 		this.servletRequest.setRequestURI("/flower.json");
-		assertEquals(MediaType.APPLICATION_JSON, manager.resolveMediaTypes(this.webRequest).get(0));
+		assertThat(manager.resolveMediaTypes(this.webRequest).get(0)).isEqualTo(MediaType.APPLICATION_JSON);
 	}
 
 	@Test
@@ -94,7 +91,7 @@ public class ContentNegotiationConfigurerTests {
 		this.servletRequest.setRequestURI("/flower");
 		this.servletRequest.addParameter("f", "json");
 
-		assertEquals(MediaType.APPLICATION_JSON, manager.resolveMediaTypes(this.webRequest).get(0));
+		assertThat(manager.resolveMediaTypes(this.webRequest).get(0)).isEqualTo(MediaType.APPLICATION_JSON);
 	}
 
 	@Test
@@ -105,7 +102,7 @@ public class ContentNegotiationConfigurerTests {
 		this.servletRequest.setRequestURI("/flower");
 		this.servletRequest.addHeader("Accept", MediaType.IMAGE_GIF_VALUE);
 
-		assertEquals(ContentNegotiationStrategy.MEDIA_TYPE_ALL_LIST, manager.resolveMediaTypes(this.webRequest));
+		assertThat(manager.resolveMediaTypes(this.webRequest)).isEqualTo(ContentNegotiationStrategy.MEDIA_TYPE_ALL_LIST);
 	}
 
 	@Test
@@ -113,7 +110,7 @@ public class ContentNegotiationConfigurerTests {
 		this.configurer.defaultContentType(MediaType.APPLICATION_JSON);
 		ContentNegotiationManager manager = this.configurer.buildContentNegotiationManager();
 
-		assertEquals(MediaType.APPLICATION_JSON, manager.resolveMediaTypes(this.webRequest).get(0));
+		assertThat(manager.resolveMediaTypes(this.webRequest).get(0)).isEqualTo(MediaType.APPLICATION_JSON);
 	}
 
 	@Test
@@ -121,7 +118,7 @@ public class ContentNegotiationConfigurerTests {
 		this.configurer.defaultContentType(MediaType.APPLICATION_JSON, MediaType.ALL);
 		ContentNegotiationManager manager = this.configurer.buildContentNegotiationManager();
 
-		assertEquals(Arrays.asList(MediaType.APPLICATION_JSON, MediaType.ALL), manager.resolveMediaTypes(this.webRequest));
+		assertThat(manager.resolveMediaTypes(this.webRequest)).isEqualTo(Arrays.asList(MediaType.APPLICATION_JSON, MediaType.ALL));
 	}
 
 	@Test
@@ -129,7 +126,7 @@ public class ContentNegotiationConfigurerTests {
 		this.configurer.defaultContentTypeStrategy(new FixedContentNegotiationStrategy(MediaType.APPLICATION_JSON));
 		ContentNegotiationManager manager = this.configurer.buildContentNegotiationManager();
 
-		assertEquals(MediaType.APPLICATION_JSON, manager.resolveMediaTypes(this.webRequest).get(0));
+		assertThat(manager.resolveMediaTypes(this.webRequest).get(0)).isEqualTo(MediaType.APPLICATION_JSON);
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/CorsRegistryTests.java

@@ -24,8 +24,7 @@ import org.junit.Test;
 
 import org.springframework.web.cors.CorsConfiguration;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture with a {@link CorsRegistry}.
@@ -43,14 +42,14 @@ public class CorsRegistryTests {
 
 	@Test
 	public void noMapping() {
-		assertTrue(this.registry.getCorsConfigurations().isEmpty());
+		assertThat(this.registry.getCorsConfigurations().isEmpty()).isTrue();
 	}
 
 	@Test
 	public void multipleMappings() {
 		this.registry.addMapping("/foo");
 		this.registry.addMapping("/bar");
-		assertEquals(2, this.registry.getCorsConfigurations().size());
+		assertThat(this.registry.getCorsConfigurations().size()).isEqualTo(2);
 	}
 
 	@Test
@@ -59,14 +58,14 @@ public class CorsRegistryTests {
 				.allowedMethods("DELETE").allowCredentials(false).allowedHeaders("header1", "header2")
 				.exposedHeaders("header3", "header4").maxAge(3600);
 		Map<String, CorsConfiguration> configs = this.registry.getCorsConfigurations();
-		assertEquals(1, configs.size());
+		assertThat(configs.size()).isEqualTo(1);
 		CorsConfiguration config = configs.get("/foo");
-		assertEquals(Arrays.asList("https://domain2.com", "https://domain2.com"), config.getAllowedOrigins());
-		assertEquals(Arrays.asList("DELETE"), config.getAllowedMethods());
-		assertEquals(Arrays.asList("header1", "header2"), config.getAllowedHeaders());
-		assertEquals(Arrays.asList("header3", "header4"), config.getExposedHeaders());
-		assertEquals(false, config.getAllowCredentials());
-		assertEquals(Long.valueOf(3600), config.getMaxAge());
+		assertThat(config.getAllowedOrigins()).isEqualTo(Arrays.asList("https://domain2.com", "https://domain2.com"));
+		assertThat(config.getAllowedMethods()).isEqualTo(Arrays.asList("DELETE"));
+		assertThat(config.getAllowedHeaders()).isEqualTo(Arrays.asList("header1", "header2"));
+		assertThat(config.getExposedHeaders()).isEqualTo(Arrays.asList("header3", "header4"));
+		assertThat(config.getAllowCredentials()).isEqualTo(false);
+		assertThat(config.getMaxAge()).isEqualTo(Long.valueOf(3600));
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java

@@ -28,9 +28,7 @@ import org.springframework.mock.web.test.MockServletContext;
 import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 import org.springframework.web.servlet.resource.DefaultServletHttpRequestHandler;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture with a {@link DefaultServletHandlerConfigurer}.
@@ -56,7 +54,7 @@ public class DefaultServletHandlerConfigurerTests {
 
 	@Test
 	public void notEnabled() {
-		assertNull(configurer.buildHandlerMapping());
+		assertThat(configurer.buildHandlerMapping()).isNull();
 	}
 
 	@Test
@@ -65,14 +63,14 @@ public class DefaultServletHandlerConfigurerTests {
 		SimpleUrlHandlerMapping handlerMapping = configurer.buildHandlerMapping();
 		DefaultServletHttpRequestHandler handler = (DefaultServletHttpRequestHandler) handlerMapping.getUrlMap().get("/**");
 
-		assertNotNull(handler);
-		assertEquals(Integer.MAX_VALUE, handlerMapping.getOrder());
+		assertThat(handler).isNotNull();
+		assertThat(handlerMapping.getOrder()).isEqualTo(Integer.MAX_VALUE);
 
 		handler.handleRequest(new MockHttpServletRequest(), response);
 
 		String expected = "default";
-		assertEquals("The ServletContext was not called with the default servlet name", expected, servletContext.url);
-		assertEquals("The request was not forwarded", expected, response.getForwardedUrl());
+		assertThat(servletContext.url).as("The ServletContext was not called with the default servlet name").isEqualTo(expected);
+		assertThat(response.getForwardedUrl()).as("The request was not forwarded").isEqualTo(expected);
 	}
 
 	@Test
@@ -81,14 +79,14 @@ public class DefaultServletHandlerConfigurerTests {
 		SimpleUrlHandlerMapping handlerMapping = configurer.buildHandlerMapping();
 		DefaultServletHttpRequestHandler handler = (DefaultServletHttpRequestHandler) handlerMapping.getUrlMap().get("/**");
 
-		assertNotNull(handler);
-		assertEquals(Integer.MAX_VALUE, handlerMapping.getOrder());
+		assertThat(handler).isNotNull();
+		assertThat(handlerMapping.getOrder()).isEqualTo(Integer.MAX_VALUE);
 
 		handler.handleRequest(new MockHttpServletRequest(), response);
 
 		String expected = "defaultServlet";
-		assertEquals("The ServletContext was not called with the default servlet name", expected, servletContext.url);
-		assertEquals("The request was not forwarded", expected, response.getForwardedUrl());
+		assertThat(servletContext.url).as("The ServletContext was not called with the default servlet name").isEqualTo(expected);
+		assertThat(response.getForwardedUrl()).as("The request was not forwarded").isEqualTo(expected);
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java

@@ -45,10 +45,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
 import org.springframework.web.util.UrlPathHelper;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -111,13 +108,14 @@ public class DelegatingWebMvcConfigurationTests {
 		verify(webMvcConfigurer).addReturnValueHandlers(handlers.capture());
 		verify(webMvcConfigurer).configureAsyncSupport(asyncConfigurer.capture());
 
-		assertNotNull(initializer);
-		assertSame(conversionService.getValue(), initializer.getConversionService());
-		assertTrue(initializer.getValidator() instanceof LocalValidatorFactoryBean);
-		assertEquals(0, resolvers.getValue().size());
-		assertEquals(0, handlers.getValue().size());
-		assertEquals(converters.getValue(), adapter.getMessageConverters());
-		assertNotNull(asyncConfigurer);
+		assertThat(initializer).isNotNull();
+		assertThat(initializer.getConversionService()).isSameAs(conversionService.getValue());
+		boolean condition = initializer.getValidator() instanceof LocalValidatorFactoryBean;
+		assertThat(condition).isTrue();
+		assertThat(resolvers.getValue().size()).isEqualTo(0);
+		assertThat(handlers.getValue().size()).isEqualTo(0);
+		assertThat(adapter.getMessageConverters()).isEqualTo(converters.getValue());
+		assertThat(asyncConfigurer).isNotNull();
 	}
 
 	@Test
@@ -142,9 +140,9 @@ public class DelegatingWebMvcConfigurationTests {
 		RequestMappingHandlerAdapter adapter = delegatingConfig.requestMappingHandlerAdapter(
 				this.delegatingConfig.mvcContentNegotiationManager(), this.delegatingConfig.mvcConversionService(),
 				this.delegatingConfig.mvcValidator());
-		assertEquals("Only one custom converter should be registered", 2, adapter.getMessageConverters().size());
-		assertSame(customConverter, adapter.getMessageConverters().get(0));
-		assertSame(stringConverter, adapter.getMessageConverters().get(1));
+		assertThat(adapter.getMessageConverters().size()).as("Only one custom converter should be registered").isEqualTo(2);
+		assertThat(adapter.getMessageConverters().get(0)).isSameAs(customConverter);
+		assertThat(adapter.getMessageConverters().get(1)).isSameAs(stringConverter);
 	}
 
 	@Test
@@ -176,11 +174,14 @@ public class DelegatingWebMvcConfigurationTests {
 		verify(webMvcConfigurer).configureContentNegotiation(contentNegotiationConfigurer.capture());
 		verify(webMvcConfigurer).configureHandlerExceptionResolvers(exceptionResolvers.capture());
 
-		assertEquals(3, exceptionResolvers.getValue().size());
-		assertTrue(exceptionResolvers.getValue().get(0) instanceof ExceptionHandlerExceptionResolver);
-		assertTrue(exceptionResolvers.getValue().get(1) instanceof ResponseStatusExceptionResolver);
-		assertTrue(exceptionResolvers.getValue().get(2) instanceof DefaultHandlerExceptionResolver);
-		assertTrue(converters.getValue().size() > 0);
+		assertThat(exceptionResolvers.getValue().size()).isEqualTo(3);
+		boolean condition2 = exceptionResolvers.getValue().get(0) instanceof ExceptionHandlerExceptionResolver;
+		assertThat(condition2).isTrue();
+		boolean condition1 = exceptionResolvers.getValue().get(1) instanceof ResponseStatusExceptionResolver;
+		assertThat(condition1).isTrue();
+		boolean condition = exceptionResolvers.getValue().get(2) instanceof DefaultHandlerExceptionResolver;
+		assertThat(condition).isTrue();
+		assertThat(converters.getValue().size() > 0).isTrue();
 	}
 
 	@Test
@@ -197,7 +198,7 @@ public class DelegatingWebMvcConfigurationTests {
 		HandlerExceptionResolverComposite composite =
 				(HandlerExceptionResolverComposite) delegatingConfig
 						.handlerExceptionResolver(delegatingConfig.mvcContentNegotiationManager());
-		assertEquals("Only one custom converter is expected", 1, composite.getExceptionResolvers().size());
+		assertThat(composite.getExceptionResolvers().size()).as("Only one custom converter is expected").isEqualTo(1);
 	}
 
 	@Test
@@ -220,17 +221,12 @@ public class DelegatingWebMvcConfigurationTests {
 		RequestMappingHandlerMapping handlerMapping = delegatingConfig.requestMappingHandlerMapping(
 				delegatingConfig.mvcContentNegotiationManager(), delegatingConfig.mvcConversionService(),
 				delegatingConfig.mvcResourceUrlProvider());
-		assertNotNull(handlerMapping);
-		assertEquals("PathMatchConfigurer should configure RegisteredSuffixPatternMatch",
-				true, handlerMapping.useRegisteredSuffixPatternMatch());
-		assertEquals("PathMatchConfigurer should configure SuffixPatternMatch",
-				true, handlerMapping.useSuffixPatternMatch());
-		assertEquals("PathMatchConfigurer should configure TrailingSlashMatch",
-				false, handlerMapping.useTrailingSlashMatch());
-		assertEquals("PathMatchConfigurer should configure UrlPathHelper",
-				pathHelper, handlerMapping.getUrlPathHelper());
-		assertEquals("PathMatchConfigurer should configure PathMatcher",
-				pathMatcher, handlerMapping.getPathMatcher());
+		assertThat(handlerMapping).isNotNull();
+		assertThat(handlerMapping.useRegisteredSuffixPatternMatch()).as("PathMatchConfigurer should configure RegisteredSuffixPatternMatch").isEqualTo(true);
+		assertThat(handlerMapping.useSuffixPatternMatch()).as("PathMatchConfigurer should configure SuffixPatternMatch").isEqualTo(true);
+		assertThat(handlerMapping.useTrailingSlashMatch()).as("PathMatchConfigurer should configure TrailingSlashMatch").isEqualTo(false);
+		assertThat(handlerMapping.getUrlPathHelper()).as("PathMatchConfigurer should configure UrlPathHelper").isEqualTo(pathHelper);
+		assertThat(handlerMapping.getPathMatcher()).as("PathMatchConfigurer should configure PathMatcher").isEqualTo(pathMatcher);
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java

@@ -40,10 +40,8 @@ import org.springframework.web.servlet.handler.WebRequestHandlerInterceptorAdapt
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.theme.ThemeChangeInterceptor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 /**
  * Test fixture with a {@link InterceptorRegistry}, two {@link HandlerInterceptor}s and two
@@ -80,7 +78,7 @@ public class InterceptorRegistryTests {
 	public void addInterceptor() {
 		this.registry.addInterceptor(this.interceptor1);
 		List<HandlerInterceptor> interceptors = getInterceptorsForPath(null);
-		assertEquals(Arrays.asList(this.interceptor1), interceptors);
+		assertThat(interceptors).isEqualTo(Arrays.asList(this.interceptor1));
 	}
 
 	@Test
@@ -88,7 +86,7 @@ public class InterceptorRegistryTests {
 		this.registry.addInterceptor(this.interceptor1);
 		this.registry.addInterceptor(this.interceptor2);
 		List<HandlerInterceptor> interceptors = getInterceptorsForPath(null);
-		assertEquals(Arrays.asList(this.interceptor1, this.interceptor2), interceptors);
+		assertThat(interceptors).isEqualTo(Arrays.asList(this.interceptor1, this.interceptor2));
 	}
 
 	@Test
@@ -96,9 +94,9 @@ public class InterceptorRegistryTests {
 		this.registry.addInterceptor(this.interceptor1).addPathPatterns("/path1/**").excludePathPatterns("/path1/secret");
 		this.registry.addInterceptor(this.interceptor2).addPathPatterns("/path2");
 
-		assertEquals(Arrays.asList(this.interceptor1), getInterceptorsForPath("/path1/test"));
-		assertEquals(Arrays.asList(this.interceptor2), getInterceptorsForPath("/path2"));
-		assertEquals(Collections.emptyList(), getInterceptorsForPath("/path1/secret"));
+		assertThat(getInterceptorsForPath("/path1/test")).isEqualTo(Arrays.asList(this.interceptor1));
+		assertThat(getInterceptorsForPath("/path2")).isEqualTo(Arrays.asList(this.interceptor2));
+		assertThat(getInterceptorsForPath("/path1/secret")).isEqualTo(Collections.emptyList());
 	}
 
 	@Test
@@ -106,7 +104,7 @@ public class InterceptorRegistryTests {
 		this.registry.addWebRequestInterceptor(this.webInterceptor1);
 		List<HandlerInterceptor> interceptors = getInterceptorsForPath(null);
 
-		assertEquals(1, interceptors.size());
+		assertThat(interceptors.size()).isEqualTo(1);
 		verifyWebInterceptor(interceptors.get(0), this.webInterceptor1);
 	}
 
@@ -116,7 +114,7 @@ public class InterceptorRegistryTests {
 		this.registry.addWebRequestInterceptor(this.webInterceptor2);
 		List<HandlerInterceptor> interceptors = getInterceptorsForPath(null);
 
-		assertEquals(2, interceptors.size());
+		assertThat(interceptors.size()).isEqualTo(2);
 		verifyWebInterceptor(interceptors.get(0), this.webInterceptor1);
 		verifyWebInterceptor(interceptors.get(1), this.webInterceptor2);
 	}
@@ -127,7 +125,7 @@ public class InterceptorRegistryTests {
 		this.registry.addInterceptor(interceptor1).addPathPatterns("/path1/**").pathMatcher(pathMatcher);
 
 		MappedInterceptor mappedInterceptor = (MappedInterceptor) this.registry.getInterceptors().get(0);
-		assertSame(pathMatcher, mappedInterceptor.getPathMatcher());
+		assertThat(mappedInterceptor.getPathMatcher()).isSameAs(pathMatcher);
 	}
 
 	@Test
@@ -136,11 +134,11 @@ public class InterceptorRegistryTests {
 		this.registry.addWebRequestInterceptor(this.webInterceptor2).addPathPatterns("/path2");
 
 		List<HandlerInterceptor> interceptors = getInterceptorsForPath("/path1");
-		assertEquals(1, interceptors.size());
+		assertThat(interceptors.size()).isEqualTo(1);
 		verifyWebInterceptor(interceptors.get(0), this.webInterceptor1);
 
 		interceptors = getInterceptorsForPath("/path2");
-		assertEquals(1, interceptors.size());
+		assertThat(interceptors.size()).isEqualTo(1);
 		verifyWebInterceptor(interceptors.get(0), this.webInterceptor2);
 	}
 
@@ -149,9 +147,9 @@ public class InterceptorRegistryTests {
 		this.registry.addInterceptor(this.interceptor1).excludePathPatterns("/path1/secret");
 		this.registry.addInterceptor(this.interceptor2).addPathPatterns("/path2");
 
-		assertEquals(Collections.singletonList(this.interceptor1), getInterceptorsForPath("/path1"));
-		assertEquals(Arrays.asList(this.interceptor1, this.interceptor2), getInterceptorsForPath("/path2"));
-		assertEquals(Collections.emptyList(), getInterceptorsForPath("/path1/secret"));
+		assertThat(getInterceptorsForPath("/path1")).isEqualTo(Collections.singletonList(this.interceptor1));
+		assertThat(getInterceptorsForPath("/path2")).isEqualTo(Arrays.asList(this.interceptor1, this.interceptor2));
+		assertThat(getInterceptorsForPath("/path1/secret")).isEqualTo(Collections.emptyList());
 	}
 
 	@Test
@@ -160,10 +158,10 @@ public class InterceptorRegistryTests {
 		this.registry.addInterceptor(this.interceptor2).order(Ordered.HIGHEST_PRECEDENCE);
 
 		List<Object> interceptors = this.registry.getInterceptors();
-		assertEquals(2, interceptors.size());
+		assertThat(interceptors.size()).isEqualTo(2);
 
-		assertSame(this.interceptor2, interceptors.get(0));
-		assertSame(this.interceptor1, interceptors.get(1));
+		assertThat(interceptors.get(0)).isSameAs(this.interceptor2);
+		assertThat(interceptors.get(1)).isSameAs(this.interceptor1);
 	}
 
 	@Test
@@ -172,10 +170,10 @@ public class InterceptorRegistryTests {
 		this.registry.addInterceptor(this.interceptor2).order(0);
 
 		List<Object> interceptors = this.registry.getInterceptors();
-		assertEquals(2, interceptors.size());
+		assertThat(interceptors.size()).isEqualTo(2);
 
-		assertSame(this.interceptor1, interceptors.get(0));
-		assertSame(this.interceptor2, interceptors.get(1));
+		assertThat(interceptors.get(0)).isSameAs(this.interceptor1);
+		assertThat(interceptors.get(1)).isSameAs(this.interceptor2);
 	}
 
 
@@ -202,9 +200,10 @@ public class InterceptorRegistryTests {
 	private void verifyWebInterceptor(HandlerInterceptor interceptor,
 			TestWebRequestInterceptor webInterceptor) throws Exception {
 
-		assertTrue(interceptor instanceof WebRequestHandlerInterceptorAdapter);
+		boolean condition = interceptor instanceof WebRequestHandlerInterceptorAdapter;
+		assertThat(condition).isTrue();
 		interceptor.preHandle(this.request, this.response, null);
-		assertTrue(webInterceptor.preHandleInvoked);
+		assertThat(webInterceptor.preHandleInvoked).isTrue();
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java

@@ -49,11 +49,6 @@ import org.springframework.web.servlet.resource.WebJarsResourceResolver;
 import org.springframework.web.util.UrlPathHelper;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Unit tests for {@link ResourceHandlerRegistry}.
@@ -85,7 +80,7 @@ public class ResourceHandlerRegistryTests {
 	@Test
 	public void noResourceHandlers() throws Exception {
 		this.registry = new ResourceHandlerRegistry(new GenericWebApplicationContext(), new MockServletContext());
-		assertNull(this.registry.getHandlerMapping());
+		assertThat((Object) this.registry.getHandlerMapping()).isNull();
 	}
 
 	@Test
@@ -97,15 +92,15 @@ public class ResourceHandlerRegistryTests {
 		ResourceHttpRequestHandler handler = getHandler("/resources/**");
 		handler.handleRequest(request, this.response);
 
-		assertEquals("test stylesheet content", this.response.getContentAsString());
+		assertThat(this.response.getContentAsString()).isEqualTo("test stylesheet content");
 	}
 
 	@Test
 	public void cachePeriod() {
-		assertEquals(-1, getHandler("/resources/**").getCacheSeconds());
+		assertThat(getHandler("/resources/**").getCacheSeconds()).isEqualTo(-1);
 
 		this.registration.setCachePeriod(0);
-		assertEquals(0, getHandler("/resources/**").getCacheSeconds());
+		assertThat(getHandler("/resources/**").getCacheSeconds()).isEqualTo(0);
 	}
 
 	@Test
@@ -119,16 +114,16 @@ public class ResourceHandlerRegistryTests {
 
 	@Test
 	public void order() {
-		assertEquals(Integer.MAX_VALUE -1, registry.getHandlerMapping().getOrder());
+		assertThat(registry.getHandlerMapping().getOrder()).isEqualTo(Integer.MAX_VALUE -1);
 
 		registry.setOrder(0);
-		assertEquals(0, registry.getHandlerMapping().getOrder());
+		assertThat(registry.getHandlerMapping().getOrder()).isEqualTo(0);
 	}
 
 	@Test
 	public void hasMappingForPattern() {
-		assertTrue(this.registry.hasMappingForPattern("/resources/**"));
-		assertFalse(this.registry.hasMappingForPattern("/whatever"));
+		assertThat(this.registry.hasMappingForPattern("/resources/**")).isTrue();
+		assertThat(this.registry.hasMappingForPattern("/whatever")).isFalse();
 	}
 
 	@Test
@@ -233,14 +228,14 @@ public class ResourceHandlerRegistryTests {
 
 		ResourceHttpRequestHandler handler = getHandler("/resources/**");
 		UrlResource resource = (UrlResource) handler.getLocations().get(1);
-		assertEquals("file:/tmp", resource.getURL().toString());
-		assertNotNull(handler.getUrlPathHelper());
+		assertThat(resource.getURL().toString()).isEqualTo("file:/tmp");
+		assertThat(handler.getUrlPathHelper()).isNotNull();
 
 		List<ResourceResolver> resolvers = handler.getResourceResolvers();
 		PathResourceResolver resolver = (PathResourceResolver) resolvers.get(resolvers.size()-1);
 		Map<Resource, Charset> locationCharsets = resolver.getLocationCharsets();
-		assertEquals(1, locationCharsets.size());
-		assertEquals(StandardCharsets.ISO_8859_1, locationCharsets.values().iterator().next());
+		assertThat(locationCharsets.size()).isEqualTo(1);
+		assertThat(locationCharsets.values().iterator().next()).isEqualTo(StandardCharsets.ISO_8859_1);
 	}
 
 	private ResourceHttpRequestHandler getHandler(String pathPattern) {

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java

@@ -30,11 +30,7 @@ import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 import org.springframework.web.servlet.mvc.ParameterizableViewController;
 import org.springframework.web.servlet.view.RedirectView;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture with a {@link ViewControllerRegistry}.
@@ -60,7 +56,7 @@ public class ViewControllerRegistryTests {
 
 	@Test
 	public void noViewControllers() {
-		assertNull(this.registry.buildHandlerMapping());
+		assertThat(this.registry.buildHandlerMapping()).isNull();
 	}
 
 	@Test
@@ -68,10 +64,10 @@ public class ViewControllerRegistryTests {
 		this.registry.addViewController("/path").setViewName("viewName");
 		ParameterizableViewController controller = getController("/path");
 
-		assertEquals("viewName", controller.getViewName());
-		assertNull(controller.getStatusCode());
-		assertFalse(controller.isStatusOnly());
-		assertNotNull(controller.getApplicationContext());
+		assertThat(controller.getViewName()).isEqualTo("viewName");
+		assertThat(controller.getStatusCode()).isNull();
+		assertThat(controller.isStatusOnly()).isFalse();
+		assertThat(controller.getApplicationContext()).isNotNull();
 	}
 
 	@Test
@@ -79,10 +75,10 @@ public class ViewControllerRegistryTests {
 		this.registry.addViewController("/path");
 		ParameterizableViewController controller = getController("/path");
 
-		assertNull(controller.getViewName());
-		assertNull(controller.getStatusCode());
-		assertFalse(controller.isStatusOnly());
-		assertNotNull(controller.getApplicationContext());
+		assertThat(controller.getViewName()).isNull();
+		assertThat(controller.getStatusCode()).isNull();
+		assertThat(controller.isStatusOnly()).isFalse();
+		assertThat(controller.getApplicationContext()).isNotNull();
 	}
 
 	@Test
@@ -93,9 +89,9 @@ public class ViewControllerRegistryTests {
 		this.request.setContextPath("/context");
 		redirectView.render(Collections.emptyMap(), this.request, this.response);
 
-		assertEquals(302, this.response.getStatus());
-		assertEquals("/context/redirectTo", this.response.getRedirectedUrl());
-		assertNotNull(redirectView.getApplicationContext());
+		assertThat(this.response.getStatus()).isEqualTo(302);
+		assertThat(this.response.getRedirectedUrl()).isEqualTo("/context/redirectTo");
+		assertThat(redirectView.getApplicationContext()).isNotNull();
 	}
 
 	@Test
@@ -110,9 +106,9 @@ public class ViewControllerRegistryTests {
 		this.request.setContextPath("/context");
 		redirectView.render(Collections.emptyMap(), this.request, this.response);
 
-		assertEquals(308, this.response.getStatus());
-		assertEquals("/redirectTo?a=b", response.getRedirectedUrl());
-		assertNotNull(redirectView.getApplicationContext());
+		assertThat(this.response.getStatus()).isEqualTo(308);
+		assertThat(response.getRedirectedUrl()).isEqualTo("/redirectTo?a=b");
+		assertThat(redirectView.getApplicationContext()).isNotNull();
 	}
 
 	@Test
@@ -120,36 +116,36 @@ public class ViewControllerRegistryTests {
 		this.registry.addStatusController("/path", HttpStatus.NOT_FOUND);
 		ParameterizableViewController controller = getController("/path");
 
-		assertNull(controller.getViewName());
-		assertEquals(HttpStatus.NOT_FOUND, controller.getStatusCode());
-		assertTrue(controller.isStatusOnly());
-		assertNotNull(controller.getApplicationContext());
+		assertThat(controller.getViewName()).isNull();
+		assertThat(controller.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
+		assertThat(controller.isStatusOnly()).isTrue();
+		assertThat(controller.getApplicationContext()).isNotNull();
 	}
 
 	@Test
 	public void order() {
 		this.registry.addViewController("/path");
 		SimpleUrlHandlerMapping handlerMapping = this.registry.buildHandlerMapping();
-		assertEquals(1, handlerMapping.getOrder());
+		assertThat(handlerMapping.getOrder()).isEqualTo(1);
 
 		this.registry.setOrder(2);
 		handlerMapping = this.registry.buildHandlerMapping();
-		assertEquals(2, handlerMapping.getOrder());
+		assertThat(handlerMapping.getOrder()).isEqualTo(2);
 	}
 
 
 	private ParameterizableViewController getController(String path) {
 		Map<String, ?> urlMap = this.registry.buildHandlerMapping().getUrlMap();
 		ParameterizableViewController controller = (ParameterizableViewController) urlMap.get(path);
-		assertNotNull(controller);
+		assertThat(controller).isNotNull();
 		return controller;
 	}
 
 	private RedirectView getRedirectView(String path) {
 		ParameterizableViewController controller = getController(path);
-		assertNull(controller.getViewName());
-		assertNotNull(controller.getView());
-		assertEquals(RedirectView.class, controller.getView().getClass());
+		assertThat(controller.getViewName()).isNull();
+		assertThat(controller.getView()).isNotNull();
+		assertThat(controller.getView().getClass()).isEqualTo(RedirectView.class);
 		return (RedirectView) controller.getView();
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java

@@ -38,8 +38,8 @@ import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver;
 import org.springframework.web.servlet.view.groovy.GroovyMarkupConfigurer;
 import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
 
 /**
  * Integration tests for view resolution with {@code @EnableWebMvc}.
@@ -52,19 +52,19 @@ public class ViewResolutionIntegrationTests {
 	@Test
 	public void freemarker() throws Exception {
 		MockHttpServletResponse response = runTest(FreeMarkerWebConfig.class);
-		assertEquals("<html><body>Hello World!</body></html>", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("<html><body>Hello World!</body></html>");
 	}
 
 	@Test
 	public void tiles() throws Exception {
 		MockHttpServletResponse response = runTest(TilesWebConfig.class);
-		assertEquals("/WEB-INF/index.jsp", response.getForwardedUrl());
+		assertThat(response.getForwardedUrl()).isEqualTo("/WEB-INF/index.jsp");
 	}
 
 	@Test
 	public void groovyMarkup() throws Exception {
 		MockHttpServletResponse response = runTest(GroovyMarkupWebConfig.class);
-		assertEquals("<html><body>Hello World!</body></html>", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("<html><body>Hello World!</body></html>");
 	}
 
 	@Test
@@ -93,7 +93,7 @@ public class ViewResolutionIntegrationTests {
 	@Test
 	public void existingViewResolver() throws Exception {
 		MockHttpServletResponse response = runTest(ExistingViewResolverConfig.class);
-		assertEquals("<html><body>Hello World!</body></html>", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("<html><body>Hello World!</body></html>");
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java

@@ -40,11 +40,7 @@ import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
 import org.springframework.web.servlet.view.tiles3.TilesViewResolver;
 import org.springframework.web.servlet.view.xml.MarshallingView;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture with a {@link ViewResolverRegistry}.
@@ -71,44 +67,44 @@ public class ViewResolverRegistryTests {
 
 	@Test
 	public void order() {
-		assertEquals(Ordered.LOWEST_PRECEDENCE, this.registry.getOrder());
+		assertThat(this.registry.getOrder()).isEqualTo(Ordered.LOWEST_PRECEDENCE);
 		this.registry.enableContentNegotiation();
-		assertEquals(Ordered.HIGHEST_PRECEDENCE, this.registry.getOrder());
+		assertThat(this.registry.getOrder()).isEqualTo(Ordered.HIGHEST_PRECEDENCE);
 	}
 
 	@Test
 	public void hasRegistrations() {
-		assertFalse(this.registry.hasRegistrations());
+		assertThat(this.registry.hasRegistrations()).isFalse();
 		this.registry.freeMarker();
-		assertTrue(this.registry.hasRegistrations());
+		assertThat(this.registry.hasRegistrations()).isTrue();
 	}
 
 	@Test
 	public void hasRegistrationsWhenContentNegotiationEnabled() {
-		assertFalse(this.registry.hasRegistrations());
+		assertThat(this.registry.hasRegistrations()).isFalse();
 		this.registry.enableContentNegotiation();
-		assertTrue(this.registry.hasRegistrations());
+		assertThat(this.registry.hasRegistrations()).isTrue();
 	}
 
 	@Test
 	public void noResolvers() {
-		assertNotNull(this.registry.getViewResolvers());
-		assertEquals(0, this.registry.getViewResolvers().size());
-		assertFalse(this.registry.hasRegistrations());
+		assertThat(this.registry.getViewResolvers()).isNotNull();
+		assertThat(this.registry.getViewResolvers().size()).isEqualTo(0);
+		assertThat(this.registry.hasRegistrations()).isFalse();
 	}
 
 	@Test
 	public void customViewResolver() {
 		InternalResourceViewResolver viewResolver = new InternalResourceViewResolver("/", ".jsp");
 		this.registry.viewResolver(viewResolver);
-		assertSame(viewResolver, this.registry.getViewResolvers().get(0));
+		assertThat(this.registry.getViewResolvers().get(0)).isSameAs(viewResolver);
 	}
 
 	@Test
 	public void beanName() {
 		this.registry.beanName();
-		assertEquals(1, this.registry.getViewResolvers().size());
-		assertEquals(BeanNameViewResolver.class, registry.getViewResolvers().get(0).getClass());
+		assertThat(this.registry.getViewResolvers().size()).isEqualTo(1);
+		assertThat(registry.getViewResolvers().get(0).getClass()).isEqualTo(BeanNameViewResolver.class);
 	}
 
 	@Test
@@ -129,10 +125,10 @@ public class ViewResolverRegistryTests {
 	public void jspMultipleResolvers() {
 		this.registry.jsp().viewNames("view1", "view2");
 		this.registry.jsp().viewNames("view3", "view4");
-		assertNotNull(this.registry.getViewResolvers());
-		assertEquals(2, this.registry.getViewResolvers().size());
-		assertEquals(InternalResourceViewResolver.class, this.registry.getViewResolvers().get(0).getClass());
-		assertEquals(InternalResourceViewResolver.class, this.registry.getViewResolvers().get(1).getClass());
+		assertThat(this.registry.getViewResolvers()).isNotNull();
+		assertThat(this.registry.getViewResolvers().size()).isEqualTo(2);
+		assertThat(this.registry.getViewResolvers().get(0).getClass()).isEqualTo(InternalResourceViewResolver.class);
+		assertThat(this.registry.getViewResolvers().get(1).getClass()).isEqualTo(InternalResourceViewResolver.class);
 	}
 
 	@Test
@@ -188,8 +184,8 @@ public class ViewResolverRegistryTests {
 		MappingJackson2JsonView view = new MappingJackson2JsonView();
 		this.registry.enableContentNegotiation(view);
 		ContentNegotiatingViewResolver resolver = checkAndGetResolver(ContentNegotiatingViewResolver.class);
-		assertEquals(Arrays.asList(view), resolver.getDefaultViews());
-		assertEquals(Ordered.HIGHEST_PRECEDENCE, this.registry.getOrder());
+		assertThat(resolver.getDefaultViews()).isEqualTo(Arrays.asList(view));
+		assertThat(this.registry.getOrder()).isEqualTo(Ordered.HIGHEST_PRECEDENCE);
 	}
 
 	@Test
@@ -198,22 +194,22 @@ public class ViewResolverRegistryTests {
 		this.registry.enableContentNegotiation(view1);
 
 		ContentNegotiatingViewResolver resolver1 = checkAndGetResolver(ContentNegotiatingViewResolver.class);
-		assertEquals(Arrays.asList(view1), resolver1.getDefaultViews());
+		assertThat(resolver1.getDefaultViews()).isEqualTo(Arrays.asList(view1));
 
 		MarshallingView view2 = new MarshallingView();
 		this.registry.enableContentNegotiation(view2);
 
 		ContentNegotiatingViewResolver resolver2 = checkAndGetResolver(ContentNegotiatingViewResolver.class);
-		assertEquals(Arrays.asList(view1, view2), resolver2.getDefaultViews());
-		assertSame(resolver1, resolver2);
+		assertThat(resolver2.getDefaultViews()).isEqualTo(Arrays.asList(view1, view2));
+		assertThat(resolver2).isSameAs(resolver1);
 	}
 
 
 	@SuppressWarnings("unchecked")
 	private <T extends ViewResolver> T checkAndGetResolver(Class<T> resolverType) {
-		assertNotNull(this.registry.getViewResolvers());
-		assertEquals(1, this.registry.getViewResolvers().size());
-		assertEquals(resolverType, this.registry.getViewResolvers().get(0).getClass());
+		assertThat(this.registry.getViewResolvers()).isNotNull();
+		assertThat(this.registry.getViewResolvers().size()).isEqualTo(1);
+		assertThat(this.registry.getViewResolvers().get(0).getClass()).isEqualTo(resolverType);
 		return (T) registry.getViewResolvers().get(0);
 	}
 
@@ -222,7 +218,7 @@ public class ViewResolverRegistryTests {
 		for (int i = 0; i < nameValuePairs.length ; i++, i++) {
 			Object expected = nameValuePairs[i + 1];
 			Object actual = accessor.getPropertyValue((String) nameValuePairs[i]);
-			assertEquals(expected, actual);
+			assertThat(actual).isEqualTo(expected);
 		}
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java

@@ -88,10 +88,7 @@ import org.springframework.web.util.UrlPathHelper;
 
 import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
 import static com.fasterxml.jackson.databind.MapperFeature.DEFAULT_VIEW_INCLUSION;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.springframework.http.MediaType.APPLICATION_ATOM_XML;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
@@ -135,70 +132,70 @@ public class WebMvcConfigurationSupportExtensionTests {
 				this.config.mvcConversionService(), this.config.mvcResourceUrlProvider());
 		rmHandlerMapping.setApplicationContext(this.context);
 		rmHandlerMapping.afterPropertiesSet();
-		assertEquals(TestPathHelper.class, rmHandlerMapping.getUrlPathHelper().getClass());
-		assertEquals(TestPathMatcher.class, rmHandlerMapping.getPathMatcher().getClass());
+		assertThat(rmHandlerMapping.getUrlPathHelper().getClass()).isEqualTo(TestPathHelper.class);
+		assertThat(rmHandlerMapping.getPathMatcher().getClass()).isEqualTo(TestPathMatcher.class);
 		HandlerExecutionChain chain = rmHandlerMapping.getHandler(new MockHttpServletRequest("GET", "/"));
-		assertNotNull(chain);
-		assertNotNull(chain.getInterceptors());
-		assertEquals(4, chain.getInterceptors().length);
-		assertEquals("CorsInterceptor", chain.getInterceptors()[0].getClass().getSimpleName());
-		assertEquals(LocaleChangeInterceptor.class, chain.getInterceptors()[1].getClass());
-		assertEquals(ConversionServiceExposingInterceptor.class, chain.getInterceptors()[2].getClass());
-		assertEquals(ResourceUrlProviderExposingInterceptor.class, chain.getInterceptors()[3].getClass());
+		assertThat(chain).isNotNull();
+		assertThat(chain.getInterceptors()).isNotNull();
+		assertThat(chain.getInterceptors().length).isEqualTo(4);
+		assertThat(chain.getInterceptors()[0].getClass().getSimpleName()).isEqualTo("CorsInterceptor");
+		assertThat(chain.getInterceptors()[1].getClass()).isEqualTo(LocaleChangeInterceptor.class);
+		assertThat(chain.getInterceptors()[2].getClass()).isEqualTo(ConversionServiceExposingInterceptor.class);
+		assertThat(chain.getInterceptors()[3].getClass()).isEqualTo(ResourceUrlProviderExposingInterceptor.class);
 
 		Map<RequestMappingInfo, HandlerMethod> map = rmHandlerMapping.getHandlerMethods();
-		assertEquals(2, map.size());
+		assertThat(map.size()).isEqualTo(2);
 		RequestMappingInfo info = map.entrySet().stream()
 				.filter(entry -> entry.getValue().getBeanType().equals(UserController.class))
 				.findFirst()
 				.orElseThrow(() -> new AssertionError("UserController bean not found"))
 				.getKey();
-		assertEquals(Collections.singleton("/api/user/{id}"), info.getPatternsCondition().getPatterns());
+		assertThat(info.getPatternsCondition().getPatterns()).isEqualTo(Collections.singleton("/api/user/{id}"));
 
 		AbstractHandlerMapping handlerMapping = (AbstractHandlerMapping) this.config.viewControllerHandlerMapping(
 				this.config.mvcPathMatcher(), this.config.mvcUrlPathHelper(),
 				this.config.mvcConversionService(), this.config.mvcResourceUrlProvider());
 		handlerMapping.setApplicationContext(this.context);
-		assertNotNull(handlerMapping);
-		assertEquals(1, handlerMapping.getOrder());
-		assertEquals(TestPathHelper.class, handlerMapping.getUrlPathHelper().getClass());
-		assertEquals(TestPathMatcher.class, handlerMapping.getPathMatcher().getClass());
+		assertThat(handlerMapping).isNotNull();
+		assertThat(handlerMapping.getOrder()).isEqualTo(1);
+		assertThat(handlerMapping.getUrlPathHelper().getClass()).isEqualTo(TestPathHelper.class);
+		assertThat(handlerMapping.getPathMatcher().getClass()).isEqualTo(TestPathMatcher.class);
 		chain = handlerMapping.getHandler(new MockHttpServletRequest("GET", "/path"));
-		assertNotNull(chain);
-		assertNotNull(chain.getHandler());
+		assertThat(chain).isNotNull();
+		assertThat(chain.getHandler()).isNotNull();
 		chain = handlerMapping.getHandler(new MockHttpServletRequest("GET", "/bad"));
-		assertNotNull(chain);
-		assertNotNull(chain.getHandler());
+		assertThat(chain).isNotNull();
+		assertThat(chain.getHandler()).isNotNull();
 		chain = handlerMapping.getHandler(new MockHttpServletRequest("GET", "/old"));
-		assertNotNull(chain);
-		assertNotNull(chain.getHandler());
+		assertThat(chain).isNotNull();
+		assertThat(chain.getHandler()).isNotNull();
 
 		handlerMapping = (AbstractHandlerMapping) this.config.resourceHandlerMapping(
 				this.config.mvcUrlPathHelper(), this.config.mvcPathMatcher(),
 				this.config.mvcContentNegotiationManager(), this.config.mvcConversionService(),
 				this.config.mvcResourceUrlProvider());
 		handlerMapping.setApplicationContext(this.context);
-		assertNotNull(handlerMapping);
-		assertEquals(Integer.MAX_VALUE - 1, handlerMapping.getOrder());
-		assertEquals(TestPathHelper.class, handlerMapping.getUrlPathHelper().getClass());
-		assertEquals(TestPathMatcher.class, handlerMapping.getPathMatcher().getClass());
+		assertThat(handlerMapping).isNotNull();
+		assertThat(handlerMapping.getOrder()).isEqualTo((Integer.MAX_VALUE - 1));
+		assertThat(handlerMapping.getUrlPathHelper().getClass()).isEqualTo(TestPathHelper.class);
+		assertThat(handlerMapping.getPathMatcher().getClass()).isEqualTo(TestPathMatcher.class);
 		chain = handlerMapping.getHandler(new MockHttpServletRequest("GET", "/resources/foo.gif"));
-		assertNotNull(chain);
-		assertNotNull(chain.getHandler());
-		assertEquals(Arrays.toString(chain.getInterceptors()), 5, chain.getInterceptors().length);
-		assertEquals("CorsInterceptor", chain.getInterceptors()[0].getClass().getSimpleName());
+		assertThat(chain).isNotNull();
+		assertThat(chain.getHandler()).isNotNull();
+		assertThat(chain.getInterceptors().length).as(Arrays.toString(chain.getInterceptors())).isEqualTo(5);
+		assertThat(chain.getInterceptors()[0].getClass().getSimpleName()).isEqualTo("CorsInterceptor");
 		// PathExposingHandlerInterceptor at chain.getInterceptors()[1]
-		assertEquals(LocaleChangeInterceptor.class, chain.getInterceptors()[2].getClass());
-		assertEquals(ConversionServiceExposingInterceptor.class, chain.getInterceptors()[3].getClass());
-		assertEquals(ResourceUrlProviderExposingInterceptor.class, chain.getInterceptors()[4].getClass());
+		assertThat(chain.getInterceptors()[2].getClass()).isEqualTo(LocaleChangeInterceptor.class);
+		assertThat(chain.getInterceptors()[3].getClass()).isEqualTo(ConversionServiceExposingInterceptor.class);
+		assertThat(chain.getInterceptors()[4].getClass()).isEqualTo(ResourceUrlProviderExposingInterceptor.class);
 
 		handlerMapping = (AbstractHandlerMapping) this.config.defaultServletHandlerMapping();
 		handlerMapping.setApplicationContext(this.context);
-		assertNotNull(handlerMapping);
-		assertEquals(Integer.MAX_VALUE, handlerMapping.getOrder());
+		assertThat(handlerMapping).isNotNull();
+		assertThat(handlerMapping.getOrder()).isEqualTo(Integer.MAX_VALUE);
 		chain = handlerMapping.getHandler(new MockHttpServletRequest("GET", "/anyPath"));
-		assertNotNull(chain);
-		assertNotNull(chain.getHandler());
+		assertThat(chain).isNotNull();
+		assertThat(chain.getHandler()).isNotNull();
 	}
 
 	@SuppressWarnings("unchecked")
@@ -210,42 +207,42 @@ public class WebMvcConfigurationSupportExtensionTests {
 
 		// ConversionService
 		String actual = this.config.mvcConversionService().convert(new TestBean(), String.class);
-		assertEquals("converted", actual);
+		assertThat(actual).isEqualTo("converted");
 
 		// Message converters
 		List<HttpMessageConverter<?>> converters = adapter.getMessageConverters();
-		assertEquals(2, converters.size());
-		assertEquals(StringHttpMessageConverter.class, converters.get(0).getClass());
-		assertEquals(MappingJackson2HttpMessageConverter.class, converters.get(1).getClass());
+		assertThat(converters.size()).isEqualTo(2);
+		assertThat(converters.get(0).getClass()).isEqualTo(StringHttpMessageConverter.class);
+		assertThat(converters.get(1).getClass()).isEqualTo(MappingJackson2HttpMessageConverter.class);
 		ObjectMapper objectMapper = ((MappingJackson2HttpMessageConverter) converters.get(1)).getObjectMapper();
-		assertFalse(objectMapper.getDeserializationConfig().isEnabled(DEFAULT_VIEW_INCLUSION));
-		assertFalse(objectMapper.getSerializationConfig().isEnabled(DEFAULT_VIEW_INCLUSION));
-		assertFalse(objectMapper.getDeserializationConfig().isEnabled(FAIL_ON_UNKNOWN_PROPERTIES));
+		assertThat(objectMapper.getDeserializationConfig().isEnabled(DEFAULT_VIEW_INCLUSION)).isFalse();
+		assertThat(objectMapper.getSerializationConfig().isEnabled(DEFAULT_VIEW_INCLUSION)).isFalse();
+		assertThat(objectMapper.getDeserializationConfig().isEnabled(FAIL_ON_UNKNOWN_PROPERTIES)).isFalse();
 
 		DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(adapter);
 
 		// Custom argument resolvers and return value handlers
 		List<HandlerMethodArgumentResolver> argResolvers =
 				(List<HandlerMethodArgumentResolver>) fieldAccessor.getPropertyValue("customArgumentResolvers");
-		assertEquals(1, argResolvers.size());
+		assertThat(argResolvers.size()).isEqualTo(1);
 
 		List<HandlerMethodReturnValueHandler> handlers =
 				(List<HandlerMethodReturnValueHandler>) fieldAccessor.getPropertyValue("customReturnValueHandlers");
-		assertEquals(1, handlers.size());
+		assertThat(handlers.size()).isEqualTo(1);
 
 		// Async support options
-		assertEquals(ConcurrentTaskExecutor.class, fieldAccessor.getPropertyValue("taskExecutor").getClass());
-		assertEquals(2500L, fieldAccessor.getPropertyValue("asyncRequestTimeout"));
+		assertThat(fieldAccessor.getPropertyValue("taskExecutor").getClass()).isEqualTo(ConcurrentTaskExecutor.class);
+		assertThat(fieldAccessor.getPropertyValue("asyncRequestTimeout")).isEqualTo(2500L);
 
 		CallableProcessingInterceptor[] callableInterceptors =
 				(CallableProcessingInterceptor[]) fieldAccessor.getPropertyValue("callableInterceptors");
-		assertEquals(1, callableInterceptors.length);
+		assertThat(callableInterceptors.length).isEqualTo(1);
 
 		DeferredResultProcessingInterceptor[] deferredResultInterceptors =
 				(DeferredResultProcessingInterceptor[]) fieldAccessor.getPropertyValue("deferredResultInterceptors");
-		assertEquals(1, deferredResultInterceptors.length);
+		assertThat(deferredResultInterceptors.length).isEqualTo(1);
 
-		assertEquals(false, fieldAccessor.getPropertyValue("ignoreDefaultModelOnRedirect"));
+		assertThat(fieldAccessor.getPropertyValue("ignoreDefaultModelOnRedirect")).isEqualTo(false);
 	}
 
 	@Test
@@ -257,14 +254,14 @@ public class WebMvcConfigurationSupportExtensionTests {
 		ConfigurableWebBindingInitializer initializer =
 				(ConfigurableWebBindingInitializer) adapter.getWebBindingInitializer();
 
-		assertNotNull(initializer);
+		assertThat(initializer).isNotNull();
 
 		BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(null, "");
 		initializer.getValidator().validate(null, bindingResult);
-		assertEquals("invalid", bindingResult.getAllErrors().get(0).getCode());
+		assertThat(bindingResult.getAllErrors().get(0).getCode()).isEqualTo("invalid");
 
 		String[] codes = initializer.getMessageCodesResolver().resolveMessageCodes("invalid", null);
-		assertEquals("custom.invalid", codes[0]);
+		assertThat(codes[0]).isEqualTo("custom.invalid");
 	}
 
 	@Test
@@ -276,21 +273,20 @@ public class WebMvcConfigurationSupportExtensionTests {
 				this.config.mvcContentNegotiationManager(), this.config.mvcConversionService(),
 				this.config.mvcResourceUrlProvider());
 		ContentNegotiationManager manager = mapping.getContentNegotiationManager();
-		assertEquals(Collections.singletonList(APPLICATION_JSON), manager.resolveMediaTypes(webRequest));
+		assertThat(manager.resolveMediaTypes(webRequest)).isEqualTo(Collections.singletonList(APPLICATION_JSON));
 
 		request.setRequestURI("/foo.xml");
-		assertEquals(Collections.singletonList(APPLICATION_XML), manager.resolveMediaTypes(webRequest));
+		assertThat(manager.resolveMediaTypes(webRequest)).isEqualTo(Collections.singletonList(APPLICATION_XML));
 
 		request.setRequestURI("/foo.rss");
-		assertEquals(Collections.singletonList(MediaType.valueOf("application/rss+xml")),
-				manager.resolveMediaTypes(webRequest));
+		assertThat(manager.resolveMediaTypes(webRequest)).isEqualTo(Collections.singletonList(MediaType.valueOf("application/rss+xml")));
 
 		request.setRequestURI("/foo.atom");
-		assertEquals(Collections.singletonList(APPLICATION_ATOM_XML), manager.resolveMediaTypes(webRequest));
+		assertThat(manager.resolveMediaTypes(webRequest)).isEqualTo(Collections.singletonList(APPLICATION_ATOM_XML));
 
 		request.setRequestURI("/foo");
 		request.setParameter("f", "json");
-		assertEquals(Collections.singletonList(APPLICATION_JSON), manager.resolveMediaTypes(webRequest));
+		assertThat(manager.resolveMediaTypes(webRequest)).isEqualTo(Collections.singletonList(APPLICATION_JSON));
 
 		request.setRequestURI("/resources/foo.gif");
 		SimpleUrlHandlerMapping handlerMapping = (SimpleUrlHandlerMapping) this.config.resourceHandlerMapping(
@@ -299,10 +295,10 @@ public class WebMvcConfigurationSupportExtensionTests {
 				this.config.mvcResourceUrlProvider());
 		handlerMapping.setApplicationContext(this.context);
 		HandlerExecutionChain chain = handlerMapping.getHandler(request);
-		assertNotNull(chain);
+		assertThat(chain).isNotNull();
 		ResourceHttpRequestHandler handler = (ResourceHttpRequestHandler) chain.getHandler();
-		assertNotNull(handler);
-		assertSame(manager, handler.getContentNegotiationManager());
+		assertThat(handler).isNotNull();
+		assertThat(handler.getContentNegotiationManager()).isSameAs(manager);
 	}
 
 	@Test
@@ -310,9 +306,9 @@ public class WebMvcConfigurationSupportExtensionTests {
 		List<HandlerExceptionResolver> resolvers = ((HandlerExceptionResolverComposite)
 				this.config.handlerExceptionResolver(null)).getExceptionResolvers();
 
-		assertEquals(2, resolvers.size());
-		assertEquals(ResponseStatusExceptionResolver.class, resolvers.get(0).getClass());
-		assertEquals(SimpleMappingExceptionResolver.class, resolvers.get(1).getClass());
+		assertThat(resolvers.size()).isEqualTo(2);
+		assertThat(resolvers.get(0).getClass()).isEqualTo(ResponseStatusExceptionResolver.class);
+		assertThat(resolvers.get(1).getClass()).isEqualTo(SimpleMappingExceptionResolver.class);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -320,34 +316,34 @@ public class WebMvcConfigurationSupportExtensionTests {
 	public void viewResolvers() throws Exception {
 		ViewResolverComposite viewResolver = (ViewResolverComposite) this.config.mvcViewResolver(
 				this.config.mvcContentNegotiationManager());
-		assertEquals(Ordered.HIGHEST_PRECEDENCE, viewResolver.getOrder());
+		assertThat(viewResolver.getOrder()).isEqualTo(Ordered.HIGHEST_PRECEDENCE);
 		List<ViewResolver> viewResolvers = viewResolver.getViewResolvers();
 
 		DirectFieldAccessor accessor = new DirectFieldAccessor(viewResolvers.get(0));
-		assertEquals(1, viewResolvers.size());
-		assertEquals(ContentNegotiatingViewResolver.class, viewResolvers.get(0).getClass());
-		assertFalse((Boolean) accessor.getPropertyValue("useNotAcceptableStatusCode"));
-		assertNotNull(accessor.getPropertyValue("contentNegotiationManager"));
+		assertThat(viewResolvers.size()).isEqualTo(1);
+		assertThat(viewResolvers.get(0).getClass()).isEqualTo(ContentNegotiatingViewResolver.class);
+		assertThat((boolean) (Boolean) accessor.getPropertyValue("useNotAcceptableStatusCode")).isFalse();
+		assertThat(accessor.getPropertyValue("contentNegotiationManager")).isNotNull();
 
 		List<View> defaultViews = (List<View>) accessor.getPropertyValue("defaultViews");
-		assertNotNull(defaultViews);
-		assertEquals(1, defaultViews.size());
-		assertEquals(MappingJackson2JsonView.class, defaultViews.get(0).getClass());
+		assertThat(defaultViews).isNotNull();
+		assertThat(defaultViews.size()).isEqualTo(1);
+		assertThat(defaultViews.get(0).getClass()).isEqualTo(MappingJackson2JsonView.class);
 
 		viewResolvers = (List<ViewResolver>) accessor.getPropertyValue("viewResolvers");
-		assertNotNull(viewResolvers);
-		assertEquals(1, viewResolvers.size());
-		assertEquals(InternalResourceViewResolver.class, viewResolvers.get(0).getClass());
+		assertThat(viewResolvers).isNotNull();
+		assertThat(viewResolvers.size()).isEqualTo(1);
+		assertThat(viewResolvers.get(0).getClass()).isEqualTo(InternalResourceViewResolver.class);
 		accessor = new DirectFieldAccessor(viewResolvers.get(0));
-		assertEquals("/", accessor.getPropertyValue("prefix"));
-		assertEquals(".jsp", accessor.getPropertyValue("suffix"));
+		assertThat(accessor.getPropertyValue("prefix")).isEqualTo("/");
+		assertThat(accessor.getPropertyValue("suffix")).isEqualTo(".jsp");
 	}
 
 	@Test
 	public void crossOrigin() {
 		Map<String, CorsConfiguration> configs = this.config.getCorsConfigurations();
-		assertEquals(1, configs.size());
-		assertEquals("*", configs.get("/resources/**").getAllowedOrigins().get(0));
+		assertThat(configs.size()).isEqualTo(1);
+		assertThat(configs.get("/resources/**").getAllowedOrigins().get(0)).isEqualTo("*");
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java

@@ -88,11 +88,7 @@ import org.springframework.web.util.UrlPathHelper;
 
 import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
 import static com.fasterxml.jackson.databind.MapperFeature.DEFAULT_VIEW_INCLUSION;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Integration tests for {@link WebMvcConfigurationSupport} (imported via
@@ -109,18 +105,18 @@ public class WebMvcConfigurationSupportTests {
 	public void requestMappingHandlerMapping() throws Exception {
 		ApplicationContext context = initContext(WebConfig.class, ScopedController.class, ScopedProxyController.class);
 		RequestMappingHandlerMapping handlerMapping = context.getBean(RequestMappingHandlerMapping.class);
-		assertEquals(0, handlerMapping.getOrder());
+		assertThat(handlerMapping.getOrder()).isEqualTo(0);
 
 		HandlerExecutionChain chain = handlerMapping.getHandler(new MockHttpServletRequest("GET", "/"));
-		assertNotNull(chain);
-		assertNotNull(chain.getInterceptors());
-		assertEquals(ConversionServiceExposingInterceptor.class, chain.getInterceptors()[0].getClass());
+		assertThat(chain).isNotNull();
+		assertThat(chain.getInterceptors()).isNotNull();
+		assertThat(chain.getInterceptors()[0].getClass()).isEqualTo(ConversionServiceExposingInterceptor.class);
 
 		chain = handlerMapping.getHandler(new MockHttpServletRequest("GET", "/scoped"));
-		assertNotNull("HandlerExecutionChain for '/scoped' mapping should not be null.", chain);
+		assertThat(chain).as("HandlerExecutionChain for '/scoped' mapping should not be null.").isNotNull();
 
 		chain = handlerMapping.getHandler(new MockHttpServletRequest("GET", "/scopedProxy"));
-		assertNotNull("HandlerExecutionChain for '/scopedProxy' mapping should not be null.", chain);
+		assertThat(chain).as("HandlerExecutionChain for '/scopedProxy' mapping should not be null.").isNotNull();
 	}
 
 	@Test
@@ -128,34 +124,34 @@ public class WebMvcConfigurationSupportTests {
 		ApplicationContext context = initContext(WebConfig.class);
 
 		Map<String, HandlerMapping> handlerMappings = context.getBeansOfType(HandlerMapping.class);
-		assertFalse(handlerMappings.containsKey("viewControllerHandlerMapping"));
-		assertFalse(handlerMappings.containsKey("resourceHandlerMapping"));
-		assertFalse(handlerMappings.containsKey("defaultServletHandlerMapping"));
+		assertThat(handlerMappings.containsKey("viewControllerHandlerMapping")).isFalse();
+		assertThat(handlerMappings.containsKey("resourceHandlerMapping")).isFalse();
+		assertThat(handlerMappings.containsKey("defaultServletHandlerMapping")).isFalse();
 
 		Object nullBean = context.getBean("viewControllerHandlerMapping");
-		assertTrue(nullBean.equals(null));
+		assertThat(nullBean.equals(null)).isTrue();
 
 		nullBean = context.getBean("resourceHandlerMapping");
-		assertTrue(nullBean.equals(null));
+		assertThat(nullBean.equals(null)).isTrue();
 
 		nullBean = context.getBean("defaultServletHandlerMapping");
-		assertTrue(nullBean.equals(null));
+		assertThat(nullBean.equals(null)).isTrue();
 	}
 
 	@Test
 	public void beanNameHandlerMapping() throws Exception {
 		ApplicationContext context = initContext(WebConfig.class);
 		BeanNameUrlHandlerMapping handlerMapping = context.getBean(BeanNameUrlHandlerMapping.class);
-		assertEquals(2, handlerMapping.getOrder());
+		assertThat(handlerMapping.getOrder()).isEqualTo(2);
 
 		HttpServletRequest request = new MockHttpServletRequest("GET", "/testController");
 		HandlerExecutionChain chain = handlerMapping.getHandler(request);
 
-		assertNotNull(chain);
-		assertNotNull(chain.getInterceptors());
-		assertEquals(3, chain.getInterceptors().length);
-		assertEquals(ConversionServiceExposingInterceptor.class, chain.getInterceptors()[1].getClass());
-		assertEquals(ResourceUrlProviderExposingInterceptor.class, chain.getInterceptors()[2].getClass());
+		assertThat(chain).isNotNull();
+		assertThat(chain.getInterceptors()).isNotNull();
+		assertThat(chain.getInterceptors().length).isEqualTo(3);
+		assertThat(chain.getInterceptors()[1].getClass()).isEqualTo(ConversionServiceExposingInterceptor.class);
+		assertThat(chain.getInterceptors()[2].getClass()).isEqualTo(ResourceUrlProviderExposingInterceptor.class);
 	}
 
 	@Test
@@ -163,37 +159,39 @@ public class WebMvcConfigurationSupportTests {
 		ApplicationContext context = initContext(WebConfig.class);
 		RequestMappingHandlerAdapter adapter = context.getBean(RequestMappingHandlerAdapter.class);
 		List<HttpMessageConverter<?>> converters = adapter.getMessageConverters();
-		assertEquals(12, converters.size());
+		assertThat(converters.size()).isEqualTo(12);
 		converters.stream()
 				.filter(converter -> converter instanceof AbstractJackson2HttpMessageConverter)
 				.forEach(converter -> {
 					ObjectMapper mapper = ((AbstractJackson2HttpMessageConverter) converter).getObjectMapper();
-					assertFalse(mapper.getDeserializationConfig().isEnabled(DEFAULT_VIEW_INCLUSION));
-					assertFalse(mapper.getSerializationConfig().isEnabled(DEFAULT_VIEW_INCLUSION));
-					assertFalse(mapper.getDeserializationConfig().isEnabled(FAIL_ON_UNKNOWN_PROPERTIES));
+					assertThat(mapper.getDeserializationConfig().isEnabled(DEFAULT_VIEW_INCLUSION)).isFalse();
+					assertThat(mapper.getSerializationConfig().isEnabled(DEFAULT_VIEW_INCLUSION)).isFalse();
+					assertThat(mapper.getDeserializationConfig().isEnabled(FAIL_ON_UNKNOWN_PROPERTIES)).isFalse();
 					if (converter instanceof MappingJackson2XmlHttpMessageConverter) {
-						assertEquals(XmlMapper.class, mapper.getClass());
+						assertThat(mapper.getClass()).isEqualTo(XmlMapper.class);
 					}
 				});
 
 		ConfigurableWebBindingInitializer initializer =
 				(ConfigurableWebBindingInitializer) adapter.getWebBindingInitializer();
-		assertNotNull(initializer);
+		assertThat(initializer).isNotNull();
 
 		ConversionService conversionService = initializer.getConversionService();
-		assertNotNull(conversionService);
-		assertTrue(conversionService instanceof FormattingConversionService);
+		assertThat(conversionService).isNotNull();
+		boolean condition1 = conversionService instanceof FormattingConversionService;
+		assertThat(condition1).isTrue();
 
 		Validator validator = initializer.getValidator();
-		assertNotNull(validator);
-		assertTrue(validator instanceof LocalValidatorFactoryBean);
+		assertThat(validator).isNotNull();
+		boolean condition = validator instanceof LocalValidatorFactoryBean;
+		assertThat(condition).isTrue();
 
 		DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(adapter);
 		@SuppressWarnings("unchecked")
 		List<Object> bodyAdvice = (List<Object>) fieldAccessor.getPropertyValue("requestResponseBodyAdvice");
-		assertEquals(2, bodyAdvice.size());
-		assertEquals(JsonViewRequestBodyAdvice.class, bodyAdvice.get(0).getClass());
-		assertEquals(JsonViewResponseBodyAdvice.class, bodyAdvice.get(1).getClass());
+		assertThat(bodyAdvice.size()).isEqualTo(2);
+		assertThat(bodyAdvice.get(0).getClass()).isEqualTo(JsonViewRequestBodyAdvice.class);
+		assertThat(bodyAdvice.get(1).getClass()).isEqualTo(JsonViewResponseBodyAdvice.class);
 	}
 
 	@Test
@@ -203,7 +201,7 @@ public class WebMvcConfigurationSupportTests {
 				MvcUriComponentsBuilder.MVC_URI_COMPONENTS_CONTRIBUTOR_BEAN_NAME,
 				CompositeUriComponentsContributor.class);
 
-		assertNotNull(uriComponentsContributor);
+		assertThat(uriComponentsContributor).isNotNull();
 	}
 
 	@Test
@@ -213,20 +211,20 @@ public class WebMvcConfigurationSupportTests {
 		HandlerExceptionResolverComposite compositeResolver =
 				context.getBean("handlerExceptionResolver", HandlerExceptionResolverComposite.class);
 
-		assertEquals(0, compositeResolver.getOrder());
+		assertThat(compositeResolver.getOrder()).isEqualTo(0);
 		List<HandlerExceptionResolver> expectedResolvers = compositeResolver.getExceptionResolvers();
 
-		assertEquals(ExceptionHandlerExceptionResolver.class, expectedResolvers.get(0).getClass());
-		assertEquals(ResponseStatusExceptionResolver.class, expectedResolvers.get(1).getClass());
-		assertEquals(DefaultHandlerExceptionResolver.class, expectedResolvers.get(2).getClass());
+		assertThat(expectedResolvers.get(0).getClass()).isEqualTo(ExceptionHandlerExceptionResolver.class);
+		assertThat(expectedResolvers.get(1).getClass()).isEqualTo(ResponseStatusExceptionResolver.class);
+		assertThat(expectedResolvers.get(2).getClass()).isEqualTo(DefaultHandlerExceptionResolver.class);
 
 		ExceptionHandlerExceptionResolver eher = (ExceptionHandlerExceptionResolver) expectedResolvers.get(0);
-		assertNotNull(eher.getApplicationContext());
+		assertThat(eher.getApplicationContext()).isNotNull();
 
 		DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(eher);
 		List<Object> interceptors = (List<Object>) fieldAccessor.getPropertyValue("responseBodyAdvice");
-		assertEquals(1, interceptors.size());
-		assertEquals(JsonViewResponseBodyAdvice.class, interceptors.get(0).getClass());
+		assertThat(interceptors.size()).isEqualTo(1);
+		assertThat(interceptors.get(0).getClass()).isEqualTo(JsonViewResponseBodyAdvice.class);
 
 		LocaleContextHolder.setLocale(Locale.ENGLISH);
 		try {
@@ -234,7 +232,7 @@ public class WebMvcConfigurationSupportTests {
 			MockHttpServletRequest request = new MockHttpServletRequest("GET", "/");
 			MockHttpServletResponse response = new MockHttpServletResponse();
 			rser.resolveException(request, response, context.getBean(TestController.class), new UserAlreadyExistsException());
-			assertEquals("User already exists!", response.getErrorMessage());
+			assertThat(response.getErrorMessage()).isEqualTo("User already exists!");
 		}
 		finally {
 			LocaleContextHolder.resetLocaleContext();
@@ -247,23 +245,23 @@ public class WebMvcConfigurationSupportTests {
 		RequestMappingHandlerAdapter adapter = context.getBean(RequestMappingHandlerAdapter.class);
 		HandlerExceptionResolverComposite composite = context.getBean(HandlerExceptionResolverComposite.class);
 
-		assertNotNull(adapter);
-		assertEquals(1, adapter.getCustomArgumentResolvers().size());
-		assertEquals(TestArgumentResolver.class, adapter.getCustomArgumentResolvers().get(0).getClass());
-		assertEquals(1, adapter.getCustomReturnValueHandlers().size());
-		assertEquals(TestReturnValueHandler.class, adapter.getCustomReturnValueHandlers().get(0).getClass());
+		assertThat(adapter).isNotNull();
+		assertThat(adapter.getCustomArgumentResolvers().size()).isEqualTo(1);
+		assertThat(adapter.getCustomArgumentResolvers().get(0).getClass()).isEqualTo(TestArgumentResolver.class);
+		assertThat(adapter.getCustomReturnValueHandlers().size()).isEqualTo(1);
+		assertThat(adapter.getCustomReturnValueHandlers().get(0).getClass()).isEqualTo(TestReturnValueHandler.class);
 
-		assertNotNull(composite);
-		assertEquals(3, composite.getExceptionResolvers().size());
-		assertEquals(ExceptionHandlerExceptionResolver.class, composite.getExceptionResolvers().get(0).getClass());
+		assertThat(composite).isNotNull();
+		assertThat(composite.getExceptionResolvers().size()).isEqualTo(3);
+		assertThat(composite.getExceptionResolvers().get(0).getClass()).isEqualTo(ExceptionHandlerExceptionResolver.class);
 
 		ExceptionHandlerExceptionResolver resolver =
 				(ExceptionHandlerExceptionResolver) composite.getExceptionResolvers().get(0);
 
-		assertEquals(1, resolver.getCustomArgumentResolvers().size());
-		assertEquals(TestArgumentResolver.class, resolver.getCustomArgumentResolvers().get(0).getClass());
-		assertEquals(1, resolver.getCustomReturnValueHandlers().size());
-		assertEquals(TestReturnValueHandler.class, resolver.getCustomReturnValueHandlers().get(0).getClass());
+		assertThat(resolver.getCustomArgumentResolvers().size()).isEqualTo(1);
+		assertThat(resolver.getCustomArgumentResolvers().get(0).getClass()).isEqualTo(TestArgumentResolver.class);
+		assertThat(resolver.getCustomReturnValueHandlers().size()).isEqualTo(1);
+		assertThat(resolver.getCustomReturnValueHandlers().get(0).getClass()).isEqualTo(TestReturnValueHandler.class);
 	}
 
 
@@ -272,10 +270,10 @@ public class WebMvcConfigurationSupportTests {
 		ApplicationContext context = initContext(WebConfig.class);
 		ViewResolverComposite resolver = context.getBean("mvcViewResolver", ViewResolverComposite.class);
 
-		assertNotNull(resolver);
-		assertEquals(1, resolver.getViewResolvers().size());
-		assertEquals(InternalResourceViewResolver.class, resolver.getViewResolvers().get(0).getClass());
-		assertEquals(Ordered.LOWEST_PRECEDENCE, resolver.getOrder());
+		assertThat(resolver).isNotNull();
+		assertThat(resolver.getViewResolvers().size()).isEqualTo(1);
+		assertThat(resolver.getViewResolvers().get(0).getClass()).isEqualTo(InternalResourceViewResolver.class);
+		assertThat(resolver.getOrder()).isEqualTo(Ordered.LOWEST_PRECEDENCE);
 	}
 
 	@Test
@@ -283,10 +281,10 @@ public class WebMvcConfigurationSupportTests {
 		ApplicationContext context = initContext(WebConfig.class, ViewResolverConfig.class);
 		ViewResolverComposite resolver = context.getBean("mvcViewResolver", ViewResolverComposite.class);
 
-		assertNotNull(resolver);
-		assertEquals(0, resolver.getViewResolvers().size());
-		assertEquals(Ordered.LOWEST_PRECEDENCE, resolver.getOrder());
-		assertNull(resolver.resolveViewName("anyViewName", Locale.ENGLISH));
+		assertThat(resolver).isNotNull();
+		assertThat(resolver.getViewResolvers().size()).isEqualTo(0);
+		assertThat(resolver.getOrder()).isEqualTo(Ordered.LOWEST_PRECEDENCE);
+		assertThat(resolver.resolveViewName("anyViewName", Locale.ENGLISH)).isNull();
 	}
 
 	@Test
@@ -294,10 +292,10 @@ public class WebMvcConfigurationSupportTests {
 		ApplicationContext context = initContext(CustomViewResolverOrderConfig.class);
 		ViewResolverComposite resolver = context.getBean("mvcViewResolver", ViewResolverComposite.class);
 
-		assertNotNull(resolver);
-		assertEquals(1, resolver.getViewResolvers().size());
-		assertEquals(InternalResourceViewResolver.class, resolver.getViewResolvers().get(0).getClass());
-		assertEquals(123, resolver.getOrder());
+		assertThat(resolver).isNotNull();
+		assertThat(resolver.getViewResolvers().size()).isEqualTo(1);
+		assertThat(resolver.getViewResolvers().get(0).getClass()).isEqualTo(InternalResourceViewResolver.class);
+		assertThat(resolver.getOrder()).isEqualTo(123);
 	}
 
 	@Test
@@ -306,9 +304,9 @@ public class WebMvcConfigurationSupportTests {
 		UrlPathHelper urlPathHelper = context.getBean(UrlPathHelper.class);
 		PathMatcher pathMatcher = context.getBean(PathMatcher.class);
 
-		assertNotNull(urlPathHelper);
-		assertNotNull(pathMatcher);
-		assertEquals(AntPathMatcher.class, pathMatcher.getClass());
+		assertThat(urlPathHelper).isNotNull();
+		assertThat(pathMatcher).isNotNull();
+		assertThat(pathMatcher.getClass()).isEqualTo(AntPathMatcher.class);
 	}
 
 	private ApplicationContext initContext(Class<?>... configClasses) {

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

@@ -42,10 +42,7 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.servlet.ModelAndView;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Arjen Poutsma
@@ -64,7 +61,7 @@ public class DefaultEntityResponseBuilderTests {
 	public void fromObject() {
 		String body = "foo";
 		EntityResponse<String> response = EntityResponse.fromObject(body).build();
-		assertSame(body, response.entity());
+		assertThat(response.entity()).isSameAs(body);
 	}
 
 	@Test
@@ -74,7 +71,7 @@ public class DefaultEntityResponseBuilderTests {
 				new ParameterizedTypeReference<String>() {})
 				.build();
 
-		assertSame(body, response.entity());
+		assertThat(response.entity()).isSameAs(body);
 	}
 
 	@Test
@@ -83,7 +80,7 @@ public class DefaultEntityResponseBuilderTests {
 		EntityResponse<String> result =
 				EntityResponse.fromObject(body).status(HttpStatus.CREATED).build();
 
-		assertEquals(HttpStatus.CREATED, result.statusCode());
+		assertThat(result.statusCode()).isEqualTo(HttpStatus.CREATED);
 	}
 
 	@Test
@@ -92,14 +89,14 @@ public class DefaultEntityResponseBuilderTests {
 		EntityResponse<String> result =
 				EntityResponse.fromObject(body).allow(HttpMethod.GET).build();
 		Set<HttpMethod> expected = EnumSet.of(HttpMethod.GET);
-		assertEquals(expected, result.headers().getAllow());
+		assertThat(result.headers().getAllow()).isEqualTo(expected);
 	}
 
 	@Test
 	public void contentLength() {
 		String body = "foo";
 		EntityResponse<String> result = EntityResponse.fromObject(body).contentLength(42).build();
-		assertEquals(42, result.headers().getContentLength());
+		assertThat(result.headers().getContentLength()).isEqualTo(42);
 	}
 
 	@Test
@@ -109,7 +106,7 @@ public class DefaultEntityResponseBuilderTests {
 				result =
 				EntityResponse.fromObject(body).contentType(MediaType.APPLICATION_JSON).build();
 
-		assertEquals(MediaType.APPLICATION_JSON, result.headers().getContentType());
+		assertThat(result.headers().getContentType()).isEqualTo(MediaType.APPLICATION_JSON);
 	}
 
 	@Test
@@ -117,7 +114,7 @@ public class DefaultEntityResponseBuilderTests {
 		String body = "foo";
 		EntityResponse<String> result = EntityResponse.fromObject(body).eTag("foo").build();
 
-		assertEquals("\"foo\"", result.headers().getETag());
+		assertThat(result.headers().getETag()).isEqualTo("\"foo\"");
 	}
 
 	@Test
@@ -126,7 +123,7 @@ public class DefaultEntityResponseBuilderTests {
 		String body = "foo";
 		EntityResponse<String> result = EntityResponse.fromObject(body).lastModified(now).build();
 		long expected = now.toInstant().toEpochMilli() / 1000;
-		assertEquals(expected, result.headers().getLastModified() / 1000);
+		assertThat(result.headers().getLastModified() / 1000).isEqualTo(expected);
 	}
 
 	@Test
@@ -134,7 +131,7 @@ public class DefaultEntityResponseBuilderTests {
 		String body = "foo";
 		EntityResponse<String> result =
 				EntityResponse.fromObject(body).cacheControl(CacheControl.noCache()).build();
-		assertEquals("no-cache", result.headers().getCacheControl());
+		assertThat(result.headers().getCacheControl()).isEqualTo("no-cache");
 	}
 
 	@Test
@@ -142,14 +139,14 @@ public class DefaultEntityResponseBuilderTests {
 		String body = "foo";
 		EntityResponse<String> result = EntityResponse.fromObject(body).varyBy("foo").build();
 		List<String> expected = Collections.singletonList("foo");
-		assertEquals(expected, result.headers().getVary());
+		assertThat(result.headers().getVary()).isEqualTo(expected);
 	}
 
 	@Test
 	public void header() {
 		String body = "foo";
 		EntityResponse<String> result = EntityResponse.fromObject(body).header("foo", "bar").build();
-		assertEquals("bar", result.headers().getFirst("foo"));
+		assertThat(result.headers().getFirst("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -160,7 +157,7 @@ public class DefaultEntityResponseBuilderTests {
 		EntityResponse<String> result = EntityResponse.fromObject(body)
 				.headers(h -> h.addAll(headers))
 				.build();
-		assertEquals(headers, result.headers());
+		assertThat(result.headers()).isEqualTo(headers);
 	}
 
 	@Test
@@ -169,7 +166,7 @@ public class DefaultEntityResponseBuilderTests {
 		EntityResponse<String> result =
 				EntityResponse.fromObject("foo").cookie(cookie)
 						.build();
-		assertTrue(result.cookies().get("name").contains(cookie));
+		assertThat(result.cookies().get("name").contains(cookie)).isTrue();
 	}
 
 	@Test
@@ -179,7 +176,7 @@ public class DefaultEntityResponseBuilderTests {
 		EntityResponse<String> result =
 				EntityResponse.fromObject("foo").cookies(cookies -> cookies.addAll(newCookies))
 						.build();
-		assertEquals(newCookies, result.cookies());
+		assertThat(result.cookies()).isEqualTo(newCookies);
 	}
 
 	@Test
@@ -195,9 +192,9 @@ public class DefaultEntityResponseBuilderTests {
 		MockHttpServletResponse mockResponse = new MockHttpServletResponse();
 
 		ModelAndView mav = entityResponse.writeTo(mockRequest, mockResponse, EMPTY_CONTEXT);
-		assertNull(mav);
+		assertThat(mav).isNull();
 
-		assertEquals(HttpStatus.NOT_MODIFIED.value(), mockResponse.getStatus());
+		assertThat(mockResponse.getStatus()).isEqualTo(HttpStatus.NOT_MODIFIED.value());
 	}
 
 
@@ -216,9 +213,9 @@ public class DefaultEntityResponseBuilderTests {
 		MockHttpServletResponse mockResponse = new MockHttpServletResponse();
 
 		ModelAndView mav = entityResponse.writeTo(mockRequest, mockResponse, EMPTY_CONTEXT);
-		assertNull(mav);
+		assertThat(mav).isNull();
 
-		assertEquals(HttpStatus.NOT_MODIFIED.value(), mockResponse.getStatus());
+		assertThat(mockResponse.getStatus()).isEqualTo(HttpStatus.NOT_MODIFIED.value());
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java

@@ -35,9 +35,7 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.servlet.ModelAndView;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Arjen Poutsma
@@ -61,7 +59,7 @@ public class DefaultRenderingResponseTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mav = result.writeTo(request, response, EMPTY_CONTEXT);
 
-		assertEquals(name, mav.getViewName());
+		assertThat(mav.getViewName()).isEqualTo(name);
 	}
 
 	@Test
@@ -72,8 +70,8 @@ public class DefaultRenderingResponseTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mav = result.writeTo(request, response, EMPTY_CONTEXT);
-		assertNotNull(mav);
-		assertEquals(status.value(), response.getStatus());
+		assertThat(mav).isNotNull();
+		assertThat(response.getStatus()).isEqualTo(status.value());
 	}
 
 	@Test
@@ -87,9 +85,9 @@ public class DefaultRenderingResponseTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mav = result.writeTo(request, response, EMPTY_CONTEXT);
-		assertNotNull(mav);
+		assertThat(mav).isNotNull();
 
-		assertEquals("bar", response.getHeader("foo"));
+		assertThat(response.getHeader("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -100,9 +98,9 @@ public class DefaultRenderingResponseTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mav = result.writeTo(request, response, EMPTY_CONTEXT);
-		assertNotNull(mav);
+		assertThat(mav).isNotNull();
 
-		assertEquals("bar", mav.getModel().get("foo"));
+		assertThat(mav.getModel().get("foo")).isEqualTo("bar");
 	}
 
 
@@ -113,8 +111,8 @@ public class DefaultRenderingResponseTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mav = result.writeTo(request, response, EMPTY_CONTEXT);
-		assertNotNull(mav);
-		assertEquals("bar", mav.getModel().get("string"));
+		assertThat(mav).isNotNull();
+		assertThat(mav.getModel().get("string")).isEqualTo("bar");
 	}
 
 	@Test
@@ -125,8 +123,8 @@ public class DefaultRenderingResponseTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mav = result.writeTo(request, response, EMPTY_CONTEXT);
-		assertNotNull(mav);
-		assertEquals("bar", mav.getModel().get("foo"));
+		assertThat(mav).isNotNull();
+		assertThat(mav.getModel().get("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -136,8 +134,8 @@ public class DefaultRenderingResponseTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mav = result.writeTo(request, response, EMPTY_CONTEXT);
-		assertNotNull(mav);
-		assertEquals("bar", mav.getModel().get("string"));
+		assertThat(mav).isNotNull();
+		assertThat(mav.getModel().get("string")).isEqualTo("bar");
 	}
 
 	@Test
@@ -149,10 +147,10 @@ public class DefaultRenderingResponseTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mav = result.writeTo(request, response, EMPTY_CONTEXT);
-		assertNotNull(mav);
-		assertEquals(1, response.getCookies().length);
-		assertEquals("name", response.getCookies()[0].getName());
-		assertEquals("value", response.getCookies()[0].getValue());
+		assertThat(mav).isNotNull();
+		assertThat(response.getCookies().length).isEqualTo(1);
+		assertThat(response.getCookies()[0].getName()).isEqualTo("name");
+		assertThat(response.getCookies()[0].getValue()).isEqualTo("value");
 	}
 
 	@Test
@@ -167,8 +165,8 @@ public class DefaultRenderingResponseTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		ModelAndView mav = result.writeTo(request, response, EMPTY_CONTEXT);
-		assertNull(mav);
-		assertEquals(HttpStatus.NOT_MODIFIED.value(), response.getStatus());
+		assertThat(mav).isNull();
+		assertThat(response.getStatus()).isEqualTo(HttpStatus.NOT_MODIFIED.value());
 	}
 
 
@@ -186,8 +184,8 @@ public class DefaultRenderingResponseTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		ModelAndView mav = result.writeTo(request, response, EMPTY_CONTEXT);
-		assertNull(mav);
-		assertEquals(HttpStatus.NOT_MODIFIED.value(), response.getStatus());
+		assertThat(mav).isNull();
+		assertThat(response.getStatus()).isEqualTo(HttpStatus.NOT_MODIFIED.value());
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestBuilderTests.java

@@ -29,7 +29,7 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Arjen Poutsma
@@ -57,19 +57,19 @@ public class DefaultServerRequestBuilderTests {
 				.body("baz")
 				.build();
 
-		assertEquals(HttpMethod.HEAD, result.method());
-		assertEquals(2, result.headers().asHttpHeaders().size());
-		assertEquals("bar", result.headers().asHttpHeaders().getFirst("foo"));
-		assertEquals("qux", result.headers().asHttpHeaders().getFirst("baz"));
-		assertEquals(2, result.cookies().size());
-		assertEquals("bar", result.cookies().getFirst("foo").getValue());
-		assertEquals("qux", result.cookies().getFirst("baz").getValue());
-		assertEquals(2, result.attributes().size());
-		assertEquals("bar", result.attributes().get("foo"));
-		assertEquals("qux", result.attributes().get("baz"));
+		assertThat(result.method()).isEqualTo(HttpMethod.HEAD);
+		assertThat(result.headers().asHttpHeaders().size()).isEqualTo(2);
+		assertThat(result.headers().asHttpHeaders().getFirst("foo")).isEqualTo("bar");
+		assertThat(result.headers().asHttpHeaders().getFirst("baz")).isEqualTo("qux");
+		assertThat(result.cookies().size()).isEqualTo(2);
+		assertThat(result.cookies().getFirst("foo").getValue()).isEqualTo("bar");
+		assertThat(result.cookies().getFirst("baz").getValue()).isEqualTo("qux");
+		assertThat(result.attributes().size()).isEqualTo(2);
+		assertThat(result.attributes().get("foo")).isEqualTo("bar");
+		assertThat(result.attributes().get("baz")).isEqualTo("qux");
 
 		String body = result.body(String.class);
-		assertEquals("baz", body);
+		assertThat(body).isEqualTo("baz");
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java

@@ -44,9 +44,9 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.HttpMediaTypeNotSupportedException;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.Assert.assertEquals;
 
 /**
  * @author Arjen Poutsma
@@ -63,7 +63,7 @@ public class DefaultServerRequestTests {
 		DefaultServerRequest request =
 				new DefaultServerRequest(servletRequest, this.messageConverters);
 
-		assertEquals(HttpMethod.HEAD, request.method());
+		assertThat(request.method()).isEqualTo(HttpMethod.HEAD);
 	}
 
 	@Test
@@ -76,7 +76,7 @@ public class DefaultServerRequestTests {
 		DefaultServerRequest request =
 				new DefaultServerRequest(servletRequest, this.messageConverters);
 
-		assertEquals(URI.create("https://example.com/"), request.uri());
+		assertThat(request.uri()).isEqualTo(URI.create("https://example.com/"));
 	}
 
 	@Test
@@ -88,11 +88,11 @@ public class DefaultServerRequestTests {
 				new DefaultServerRequest(servletRequest, this.messageConverters);
 
 		URI result = request.uriBuilder().build();
-		assertEquals("http", result.getScheme());
-		assertEquals("localhost", result.getHost());
-		assertEquals(-1, result.getPort());
-		assertEquals("/path", result.getPath());
-		assertEquals("a=1", result.getQuery());
+		assertThat(result.getScheme()).isEqualTo("http");
+		assertThat(result.getHost()).isEqualTo("localhost");
+		assertThat(result.getPort()).isEqualTo(-1);
+		assertThat(result.getPath()).isEqualTo("/path");
+		assertThat(result.getQuery()).isEqualTo("a=1");
 	}
 
 	@Test
@@ -103,7 +103,7 @@ public class DefaultServerRequestTests {
 		DefaultServerRequest request =
 				new DefaultServerRequest(servletRequest, this.messageConverters);
 
-		assertEquals(Optional.of("bar"), request.attribute("foo"));
+		assertThat(request.attribute("foo")).isEqualTo(Optional.of("bar"));
 	}
 
 	@Test
@@ -114,7 +114,7 @@ public class DefaultServerRequestTests {
 		DefaultServerRequest request =
 				new DefaultServerRequest(servletRequest, this.messageConverters);
 
-		assertEquals(Optional.of("bar"), request.param("foo"));
+		assertThat(request.param("foo")).isEqualTo(Optional.of("bar"));
 	}
 
 	@Test
@@ -125,7 +125,7 @@ public class DefaultServerRequestTests {
 		DefaultServerRequest request =
 				new DefaultServerRequest(servletRequest, this.messageConverters);
 
-		assertEquals(Optional.of(""), request.param("foo"));
+		assertThat(request.param("foo")).isEqualTo(Optional.of(""));
 	}
 
 	@Test
@@ -136,7 +136,7 @@ public class DefaultServerRequestTests {
 		DefaultServerRequest request =
 				new DefaultServerRequest(servletRequest, this.messageConverters);
 
-		assertEquals(Optional.empty(), request.param("bar"));
+		assertThat(request.param("bar")).isEqualTo(Optional.empty());
 	}
 
 	@Test
@@ -149,7 +149,7 @@ public class DefaultServerRequestTests {
 		DefaultServerRequest request = new DefaultServerRequest(servletRequest,
 				this.messageConverters);
 
-		assertEquals("bar", request.pathVariable("foo"));
+		assertThat(request.pathVariable("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -176,7 +176,7 @@ public class DefaultServerRequestTests {
 		DefaultServerRequest request = new DefaultServerRequest(servletRequest,
 				this.messageConverters);
 
-		assertEquals(pathVariables, request.pathVariables());
+		assertThat(request.pathVariables()).isEqualTo(pathVariables);
 	}
 
 	@Test
@@ -204,11 +204,11 @@ public class DefaultServerRequestTests {
 				this.messageConverters);
 
 		ServerRequest.Headers headers = request.headers();
-		assertEquals(accept, headers.accept());
-		assertEquals(acceptCharset, headers.acceptCharset());
-		assertEquals(OptionalLong.of(contentLength), headers.contentLength());
-		assertEquals(Optional.of(contentType), headers.contentType());
-		assertEquals(httpHeaders, headers.asHttpHeaders());
+		assertThat(headers.accept()).isEqualTo(accept);
+		assertThat(headers.acceptCharset()).isEqualTo(acceptCharset);
+		assertThat(headers.contentLength()).isEqualTo(OptionalLong.of(contentLength));
+		assertThat(headers.contentType()).isEqualTo(Optional.of(contentType));
+		assertThat(headers.asHttpHeaders()).isEqualTo(httpHeaders);
 	}
 
 	@Test
@@ -224,7 +224,7 @@ public class DefaultServerRequestTests {
 		MultiValueMap<String, Cookie> expected = new LinkedMultiValueMap<>();
 		expected.add("foo", cookie);
 
-		assertEquals(expected, request.cookies());
+		assertThat(request.cookies()).isEqualTo(expected);
 
 	}
 
@@ -238,7 +238,7 @@ public class DefaultServerRequestTests {
 				this.messageConverters);
 
 		String result = request.body(String.class);
-		assertEquals("foo", result);
+		assertThat(result).isEqualTo("foo");
 	}
 
 	@Test
@@ -251,9 +251,9 @@ public class DefaultServerRequestTests {
 				Collections.singletonList(new MappingJackson2HttpMessageConverter()));
 
 		List<String> result = request.body(new ParameterizedTypeReference<List<String>>() {});
-		assertEquals(2, result.size());
-		assertEquals("foo", result.get(0));
-		assertEquals("bar", result.get(1));
+		assertThat(result.size()).isEqualTo(2);
+		assertThat(result.get(0)).isEqualTo("foo");
+		assertThat(result.get(1)).isEqualTo("bar");
 	}
 
 	@Test
@@ -278,7 +278,7 @@ public class DefaultServerRequestTests {
 		DefaultServerRequest request = new DefaultServerRequest(servletRequest,
 				this.messageConverters);
 
-		assertEquals(session, request.session());
+		assertThat(request.session()).isEqualTo(session);
 
 	}
 
@@ -296,7 +296,7 @@ public class DefaultServerRequestTests {
 		DefaultServerRequest request = new DefaultServerRequest(servletRequest,
 				this.messageConverters);
 
-		assertEquals(principal, request.principal().get());
+		assertThat(request.principal().get()).isEqualTo(principal);
 
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java

@@ -47,8 +47,7 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.servlet.ModelAndView;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Arjen Poutsma
@@ -67,7 +66,7 @@ public class DefaultServerResponseBuilderTests {
 	@Test
 	public void status() {
 		ServerResponse response = ServerResponse.status(HttpStatus.CREATED).build();
-		assertEquals(HttpStatus.CREATED, response.statusCode());
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.CREATED);
 	}
 
 	@Test
@@ -78,9 +77,9 @@ public class DefaultServerResponseBuilderTests {
 				.cookie(cookie)
 				.build();
 		ServerResponse result = ServerResponse.from(other).build();
-		assertEquals(HttpStatus.OK, result.statusCode());
-		assertEquals("bar", result.headers().getFirst("foo"));
-		assertEquals(cookie, result.cookies().getFirst("foo"));
+		assertThat(result.statusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(result.headers().getFirst("foo")).isEqualTo("bar");
+		assertThat(result.cookies().getFirst("foo")).isEqualTo(cookie);
 	}
 
 
@@ -88,93 +87,93 @@ public class DefaultServerResponseBuilderTests {
 	public void ok() {
 		ServerResponse response = ServerResponse.ok().build();
 
-		assertEquals(HttpStatus.OK, response.statusCode());
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
 	}
 
 	@Test
 	public void created() {
 		URI location = URI.create("https://example.com");
 		ServerResponse response = ServerResponse.created(location).build();
-		assertEquals(HttpStatus.CREATED, response.statusCode());
-		assertEquals(location, response.headers().getLocation());
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.CREATED);
+		assertThat(response.headers().getLocation()).isEqualTo(location);
 	}
 
 	@Test
 	public void accepted() {
 		ServerResponse response = ServerResponse.accepted().build();
-		assertEquals(HttpStatus.ACCEPTED, response.statusCode());
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.ACCEPTED);
 	}
 
 	@Test
 	public void noContent() {
 		ServerResponse response = ServerResponse.noContent().build();
-		assertEquals(HttpStatus.NO_CONTENT, response.statusCode());
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.NO_CONTENT);
 	}
 
 	@Test
 	public void seeOther() {
 		URI location = URI.create("https://example.com");
 		ServerResponse response = ServerResponse.seeOther(location).build();
-		assertEquals(HttpStatus.SEE_OTHER, response.statusCode());
-		assertEquals(location, response.headers().getLocation());
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.SEE_OTHER);
+		assertThat(response.headers().getLocation()).isEqualTo(location);
 	}
 
 	@Test
 	public void temporaryRedirect() {
 		URI location = URI.create("https://example.com");
 		ServerResponse response = ServerResponse.temporaryRedirect(location).build();
-		assertEquals(HttpStatus.TEMPORARY_REDIRECT, response.statusCode());
-		assertEquals(location, response.headers().getLocation());
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.TEMPORARY_REDIRECT);
+		assertThat(response.headers().getLocation()).isEqualTo(location);
 	}
 
 	@Test
 	public void permanentRedirect() {
 		URI location = URI.create("https://example.com");
 		ServerResponse response = ServerResponse.permanentRedirect(location).build();
-		assertEquals(HttpStatus.PERMANENT_REDIRECT, response.statusCode());
-		assertEquals(location, response.headers().getLocation());
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.PERMANENT_REDIRECT);
+		assertThat(response.headers().getLocation()).isEqualTo(location);
 	}
 
 	@Test
 	public void badRequest() {
 		ServerResponse response = ServerResponse.badRequest().build();
-		assertEquals(HttpStatus.BAD_REQUEST, response.statusCode());
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
 	}
 
 	@Test
 	public void notFound() {
 		ServerResponse response = ServerResponse.notFound().build();
-		assertEquals(HttpStatus.NOT_FOUND, response.statusCode());
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.NOT_FOUND);
 	}
 
 	@Test
 	public void unprocessableEntity() {
 		ServerResponse response = ServerResponse.unprocessableEntity().build();
-		assertEquals(HttpStatus.UNPROCESSABLE_ENTITY, response.statusCode());
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.UNPROCESSABLE_ENTITY);
 	}
 
 	@Test
 	public void allow() {
 		ServerResponse response = ServerResponse.ok().allow(HttpMethod.GET).build();
-		assertEquals(EnumSet.of(HttpMethod.GET), response.headers().getAllow());
+		assertThat(response.headers().getAllow()).isEqualTo(EnumSet.of(HttpMethod.GET));
 	}
 
 	@Test
 	public void contentLength() {
 		ServerResponse response = ServerResponse.ok().contentLength(42).build();
-		assertEquals(42L, response.headers().getContentLength());
+		assertThat(response.headers().getContentLength()).isEqualTo(42L);
 	}
 
 	@Test
 	public void contentType() {
 		ServerResponse response = ServerResponse.ok().contentType(MediaType.APPLICATION_JSON).build();
-		assertEquals(MediaType.APPLICATION_JSON, response.headers().getContentType());
+		assertThat(response.headers().getContentType()).isEqualTo(MediaType.APPLICATION_JSON);
 	}
 
 	@Test
 	public void eTag() {
 		ServerResponse response = ServerResponse.ok().eTag("foo").build();
-		assertEquals("\"foo\"", response.headers().getETag());
+		assertThat(response.headers().getETag()).isEqualTo("\"foo\"");
 	}
 
 	@Test
@@ -182,20 +181,20 @@ public class DefaultServerResponseBuilderTests {
 		ZonedDateTime now = ZonedDateTime.now();
 		ServerResponse response = ServerResponse.ok().lastModified(now).build();
 		long expected = now.toInstant().toEpochMilli() / 1000;
-		assertEquals(expected, response.headers().getLastModified() / 1000);
+		assertThat(response.headers().getLastModified() / 1000).isEqualTo(expected);
 	}
 
 	@Test
 	public void cacheControlTag() {
 		ServerResponse response = ServerResponse.ok().cacheControl(CacheControl.noCache()).build();
-		assertEquals("no-cache", response.headers().getCacheControl());
+		assertThat(response.headers().getCacheControl()).isEqualTo("no-cache");
 	}
 
 	@Test
 	public void varyBy() {
 		ServerResponse response = ServerResponse.ok().varyBy("foo").build();
 		List<String> expected = Collections.singletonList("foo");
-		assertEquals(expected, response.headers().getVary());
+		assertThat(response.headers().getVary()).isEqualTo(expected);
 	}
 
 
@@ -203,7 +202,7 @@ public class DefaultServerResponseBuilderTests {
 	public void statusCode() {
 		HttpStatus statusCode = HttpStatus.ACCEPTED;
 		ServerResponse response = ServerResponse.status(statusCode).build();
-		assertEquals(statusCode, response.statusCode());
+		assertThat(response.statusCode()).isEqualTo(statusCode);
 	}
 
 	@Test
@@ -213,7 +212,7 @@ public class DefaultServerResponseBuilderTests {
 		ServerResponse response = ServerResponse.ok()
 				.headers(headers -> headers.addAll(newHeaders))
 				.build();
-		assertEquals(newHeaders, response.headers());
+		assertThat(response.headers()).isEqualTo(newHeaders);
 	}
 
 	@Test
@@ -223,7 +222,7 @@ public class DefaultServerResponseBuilderTests {
 		ServerResponse response = ServerResponse.ok()
 				.cookies(cookies -> cookies.addAll(newCookies))
 				.build();
-		assertEquals(newCookies, response.cookies());
+		assertThat(response.cookies()).isEqualTo(newCookies);
 	}
 
 	@Test
@@ -238,11 +237,11 @@ public class DefaultServerResponseBuilderTests {
 		MockHttpServletResponse mockResponse = new MockHttpServletResponse();
 
 		ModelAndView mav = response.writeTo(mockRequest, mockResponse, EMPTY_CONTEXT);
-		assertNull(mav);
+		assertThat(mav).isNull();
 
-		assertEquals(HttpStatus.CREATED.value(), mockResponse.getStatus());
-		assertEquals("MyValue", mockResponse.getHeader("MyKey"));
-		assertEquals("value", mockResponse.getCookie("name").getValue());
+		assertThat(mockResponse.getStatus()).isEqualTo(HttpStatus.CREATED.value());
+		assertThat(mockResponse.getHeader("MyKey")).isEqualTo("MyValue");
+		assertThat(mockResponse.getCookie("name").getValue()).isEqualTo("value");
 	}
 
 	@Test
@@ -257,9 +256,9 @@ public class DefaultServerResponseBuilderTests {
 
 		MockHttpServletResponse mockResponse = new MockHttpServletResponse();
 		ModelAndView mav = response.writeTo(mockRequest, mockResponse, EMPTY_CONTEXT);
-		assertNull(mav);
+		assertThat(mav).isNull();
 
-		assertEquals(HttpStatus.NOT_MODIFIED.value(), mockResponse.getStatus());
+		assertThat(mockResponse.getStatus()).isEqualTo(HttpStatus.NOT_MODIFIED.value());
 	}
 
 	@Test
@@ -276,9 +275,9 @@ public class DefaultServerResponseBuilderTests {
 
 		MockHttpServletResponse mockResponse = new MockHttpServletResponse();
 		ModelAndView mav = response.writeTo(mockRequest, mockResponse, EMPTY_CONTEXT);
-		assertNull(mav);
+		assertThat(mav).isNull();
 
-		assertEquals(HttpStatus.NOT_MODIFIED.value(), mockResponse.getStatus());
+		assertThat(mockResponse.getStatus()).isEqualTo(HttpStatus.NOT_MODIFIED.value());
 	}
 
 	@Test
@@ -291,9 +290,9 @@ public class DefaultServerResponseBuilderTests {
 		ServerResponse.Context context = () -> Collections.singletonList(new StringHttpMessageConverter());
 
 		ModelAndView mav = response.writeTo(mockRequest, mockResponse, context);
-		assertNull(mav);
+		assertThat(mav).isNull();
 
-		assertEquals(body, mockResponse.getContentAsString());
+		assertThat(mockResponse.getContentAsString()).isEqualTo(body);
 	}
 
 	@Test
@@ -308,9 +307,9 @@ public class DefaultServerResponseBuilderTests {
 		ServerResponse.Context context = () -> Collections.singletonList(new MappingJackson2HttpMessageConverter());
 
 		ModelAndView mav = response.writeTo(mockRequest, mockResponse, context);
-		assertNull(mav);
+		assertThat(mav).isNull();
 
-		assertEquals("[\"foo\",\"bar\"]", mockResponse.getContentAsString());
+		assertThat(mockResponse.getContentAsString()).isEqualTo("[\"foo\",\"bar\"]");
 	}
 
 	@Test
@@ -326,10 +325,10 @@ public class DefaultServerResponseBuilderTests {
 		ServerResponse.Context context = () -> Collections.singletonList(new StringHttpMessageConverter());
 
 		ModelAndView mav = response.writeTo(mockRequest, mockResponse, context);
-		assertNull(mav);
+		assertThat(mav).isNull();
 
 
-		assertEquals(body, mockResponse.getContentAsString());
+		assertThat(mockResponse.getContentAsString()).isEqualTo(body);
 	}
 
 	@Test
@@ -345,9 +344,9 @@ public class DefaultServerResponseBuilderTests {
 		ServerResponse.Context context = () -> Collections.singletonList(new StringHttpMessageConverter());
 
 		ModelAndView mav = response.writeTo(mockRequest, mockResponse, context);
-		assertNull(mav);
+		assertThat(mav).isNull();
 
-		assertEquals(body, mockResponse.getContentAsString());
+		assertThat(mockResponse.getContentAsString()).isEqualTo(body);
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/function/PathResourceLookupFunctionTests.java

@@ -27,9 +27,7 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Arjen Poutsma
@@ -49,10 +47,10 @@ public class PathResourceLookupFunctionTests {
 		ServerRequest request = new DefaultServerRequest(servletRequest, Collections.emptyList());
 
 		Optional<Resource> result = function.apply(request);
-		assertTrue(result.isPresent());
+		assertThat(result.isPresent()).isTrue();
 
 		File expected = new ClassPathResource("response.txt", getClass()).getFile();
-		assertEquals(expected, result.get().getFile());
+		assertThat(result.get().getFile()).isEqualTo(expected);
 	}
 
 	@Test
@@ -68,12 +66,12 @@ public class PathResourceLookupFunctionTests {
 		ServerRequest request = new DefaultServerRequest(servletRequest, Collections.emptyList());
 
 		Optional<Resource> result = function.apply(request);
-		assertTrue(result.isPresent());
+		assertThat(result.isPresent()).isTrue();
 
 		File expected =
 				new ClassPathResource("org/springframework/web/servlet/function/child/response.txt")
 						.getFile();
-		assertEquals(expected, result.get().getFile());
+		assertThat(result.get().getFile()).isEqualTo(expected);
 	}
 
 	@Test
@@ -89,7 +87,7 @@ public class PathResourceLookupFunctionTests {
 		ServerRequest request = new DefaultServerRequest(servletRequest, Collections.emptyList());
 
 		Optional<Resource> result = function.apply(request);
-		assertFalse(result.isPresent());
+		assertThat(result.isPresent()).isFalse();
 	}
 
 	@Test
@@ -114,9 +112,9 @@ public class PathResourceLookupFunctionTests {
 		ServerRequest request = new DefaultServerRequest(servletRequest, Collections.emptyList());
 
 		Optional<Resource> result = customLookupFunction.apply(request);
-		assertTrue(result.isPresent());
+		assertThat(result.isPresent()).isTrue();
 
-		assertEquals(defaultResource.getFile(), result.get().getFile());
+		assertThat(result.get().getFile()).isEqualTo(defaultResource.getFile());
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/function/RequestPredicateTests.java

@@ -23,8 +23,7 @@ import org.junit.Test;
 
 import org.springframework.mock.web.test.MockHttpServletRequest;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Arjen Poutsma
@@ -45,9 +44,9 @@ public class RequestPredicateTests {
 		RequestPredicate predicate2 = request -> true;
 		RequestPredicate predicate3 = request -> false;
 
-		assertTrue(predicate1.and(predicate2).test(request));
-		assertTrue(predicate2.and(predicate1).test(request));
-		assertFalse(predicate1.and(predicate3).test(request));
+		assertThat(predicate1.and(predicate2).test(request)).isTrue();
+		assertThat(predicate2.and(predicate1).test(request)).isTrue();
+		assertThat(predicate1.and(predicate3).test(request)).isFalse();
 	}
 
 	@Test
@@ -55,12 +54,12 @@ public class RequestPredicateTests {
 		RequestPredicate predicate = request -> false;
 		RequestPredicate negated = predicate.negate();
 
-		assertTrue(negated.test(request));
+		assertThat(negated.test(request)).isTrue();
 
 		predicate = request -> true;
 		negated = predicate.negate();
 
-		assertFalse(negated.test(request));
+		assertThat(negated.test(request)).isFalse();
 	}
 
 	@Test
@@ -69,9 +68,9 @@ public class RequestPredicateTests {
 		RequestPredicate predicate2 = request -> false;
 		RequestPredicate predicate3 = request -> false;
 
-		assertTrue(predicate1.or(predicate2).test(request));
-		assertTrue(predicate2.or(predicate1).test(request));
-		assertFalse(predicate2.or(predicate3).test(request));
+		assertThat(predicate1.or(predicate2).test(request)).isTrue();
+		assertThat(predicate2.or(predicate1).test(request)).isTrue();
+		assertThat(predicate2.or(predicate3).test(request)).isFalse();
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/function/RequestPredicatesTests.java

@@ -27,8 +27,7 @@ import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.util.pattern.PathPatternParser;
 
 import static java.util.Collections.emptyList;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.http.MediaType.TEXT_XML_VALUE;
 
 /**
@@ -41,7 +40,7 @@ public class RequestPredicatesTests {
 		RequestPredicate predicate = RequestPredicates.all();
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest();
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 	}
 
 
@@ -52,10 +51,10 @@ public class RequestPredicatesTests {
 
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "https://example.com");
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		servletRequest.setMethod("POST");
-		assertFalse(predicate.test(request));
+		assertThat(predicate.test(request)).isFalse();
 	}
 
 	@Test
@@ -63,13 +62,13 @@ public class RequestPredicatesTests {
 		RequestPredicate predicate = RequestPredicates.methods(HttpMethod.GET, HttpMethod.HEAD);
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "https://example.com");
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		servletRequest.setMethod("HEAD");
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		servletRequest.setMethod("POST");
-		assertFalse(predicate.test(request));
+		assertThat(predicate.test(request)).isFalse();
 	}
 
 	@Test
@@ -78,31 +77,31 @@ public class RequestPredicatesTests {
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
 
 		RequestPredicate predicate = RequestPredicates.GET("/p*");
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		predicate = RequestPredicates.HEAD("/p*");
 		servletRequest.setMethod("HEAD");
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		predicate = RequestPredicates.POST("/p*");
 		servletRequest.setMethod("POST");
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		predicate = RequestPredicates.PUT("/p*");
 		servletRequest.setMethod("PUT");
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		predicate = RequestPredicates.PATCH("/p*");
 		servletRequest.setMethod("PATCH");
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		predicate = RequestPredicates.DELETE("/p*");
 		servletRequest.setMethod("DELETE");
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		predicate = RequestPredicates.OPTIONS("/p*");
 		servletRequest.setMethod("OPTIONS");
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 	}
 
 	@Test
@@ -110,11 +109,11 @@ public class RequestPredicatesTests {
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "/path");
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
 		RequestPredicate predicate = RequestPredicates.path("/p*");
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		servletRequest = new MockHttpServletRequest("GET", "/foo");
 		request = new DefaultServerRequest(servletRequest, emptyList());
-		assertFalse(predicate.test(request));
+		assertThat(predicate.test(request)).isFalse();
 	}
 
 	@Test
@@ -122,7 +121,7 @@ public class RequestPredicatesTests {
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "/path");
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
 		RequestPredicate predicate = RequestPredicates.path("p*");
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 	}
 
 	@Test
@@ -131,11 +130,11 @@ public class RequestPredicatesTests {
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
 
 		RequestPredicate predicate = RequestPredicates.path("/foo bar");
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		servletRequest = new MockHttpServletRequest();
 		request = new DefaultServerRequest(servletRequest, emptyList());
-		assertFalse(predicate.test(request));
+		assertThat(predicate.test(request)).isFalse();
 	}
 
 	@Test
@@ -147,7 +146,7 @@ public class RequestPredicatesTests {
 		RequestPredicate predicate = pathPredicates.apply("/P*");
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "/path");
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 	}
 
 
@@ -161,11 +160,11 @@ public class RequestPredicatesTests {
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "/path");
 		servletRequest.addHeader(name, value);
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		servletRequest = new MockHttpServletRequest();
 		request = new DefaultServerRequest(servletRequest, emptyList());
-		assertFalse(predicate.test(request));
+		assertThat(predicate.test(request)).isFalse();
 	}
 
 	@Test
@@ -176,11 +175,11 @@ public class RequestPredicatesTests {
 		servletRequest.setContentType(json.toString());
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
 
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		servletRequest = new MockHttpServletRequest();
 		request = new DefaultServerRequest(servletRequest, emptyList());
-		assertFalse(predicate.test(request));
+		assertThat(predicate.test(request)).isFalse();
 	}
 
 	@Test
@@ -190,12 +189,12 @@ public class RequestPredicatesTests {
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "/path");
 		servletRequest.addHeader("Accept", json.toString());
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		servletRequest = new MockHttpServletRequest();
 		servletRequest.addHeader("Accept", TEXT_XML_VALUE);
 		request = new DefaultServerRequest(servletRequest, emptyList());
-		assertFalse(predicate.test(request));
+		assertThat(predicate.test(request)).isFalse();
 	}
 
 	@Test
@@ -204,18 +203,18 @@ public class RequestPredicatesTests {
 
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "/file.txt");
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		servletRequest = new MockHttpServletRequest("GET", "/FILE.TXT");
 		request = new DefaultServerRequest(servletRequest, emptyList());
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		predicate = RequestPredicates.pathExtension("bar");
-		assertFalse(predicate.test(request));
+		assertThat(predicate.test(request)).isFalse();
 
 		servletRequest = new MockHttpServletRequest("GET", "/file.foo");
 		request = new DefaultServerRequest(servletRequest, emptyList());
-		assertFalse(predicate.test(request));
+		assertThat(predicate.test(request)).isFalse();
 	}
 
 	@Test
@@ -224,16 +223,16 @@ public class RequestPredicatesTests {
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "/path");
 		servletRequest.addParameter("foo", "bar");
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		predicate = RequestPredicates.param("foo", s -> s.equals("bar"));
-		assertTrue(predicate.test(request));
+		assertThat(predicate.test(request)).isTrue();
 
 		predicate = RequestPredicates.param("foo", "baz");
-		assertFalse(predicate.test(request));
+		assertThat(predicate.test(request)).isFalse();
 
 		predicate = RequestPredicates.param("foo", s -> s.equals("baz"));
-		assertFalse(predicate.test(request));
+		assertThat(predicate.test(request)).isFalse();
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java

@@ -37,10 +37,7 @@ import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.web.servlet.ModelAndView;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Arjen Poutsma
@@ -74,22 +71,23 @@ public class ResourceHandlerFunctionTests {
 		ServerRequest request = new DefaultServerRequest(servletRequest, Collections.singletonList(messageConverter));
 
 		ServerResponse response = this.handlerFunction.handle(request);
-		assertEquals(HttpStatus.OK, response.statusCode());
-		assertTrue(response instanceof EntityResponse);
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
+		boolean condition = response instanceof EntityResponse;
+		assertThat(condition).isTrue();
 		@SuppressWarnings("unchecked")
 		EntityResponse<Resource> entityResponse = (EntityResponse<Resource>) response;
-		assertEquals(this.resource, entityResponse.entity());
+		assertThat(entityResponse.entity()).isEqualTo(this.resource);
 
 		MockHttpServletResponse servletResponse = new MockHttpServletResponse();
 		ModelAndView mav = response.writeTo(servletRequest, servletResponse, this.context);
-		assertNull(mav);
+		assertThat(mav).isNull();
 
-		assertEquals(200, servletResponse.getStatus());
+		assertThat(servletResponse.getStatus()).isEqualTo(200);
 		byte[] expectedBytes = Files.readAllBytes(this.resource.getFile().toPath());
 		byte[] actualBytes = servletResponse.getContentAsByteArray();
-		assertArrayEquals(expectedBytes, actualBytes);
-		assertEquals(MediaType.TEXT_PLAIN_VALUE, servletResponse.getContentType());
-		assertEquals(this.resource.contentLength(),servletResponse.getContentLength());
+		assertThat(actualBytes).isEqualTo(expectedBytes);
+		assertThat(servletResponse.getContentType()).isEqualTo(MediaType.TEXT_PLAIN_VALUE);
+		assertThat(servletResponse.getContentLength()).isEqualTo(this.resource.contentLength());
 	}
 
 	@Test
@@ -98,22 +96,23 @@ public class ResourceHandlerFunctionTests {
 		ServerRequest request = new DefaultServerRequest(servletRequest, Collections.singletonList(messageConverter));
 
 		ServerResponse response = this.handlerFunction.handle(request);
-		assertEquals(HttpStatus.OK, response.statusCode());
-		assertTrue(response instanceof EntityResponse);
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
+		boolean condition = response instanceof EntityResponse;
+		assertThat(condition).isTrue();
 		@SuppressWarnings("unchecked")
 		EntityResponse<Resource> entityResponse = (EntityResponse<Resource>) response;
-		assertEquals(this.resource.getFilename(), entityResponse.entity().getFilename());
+		assertThat(entityResponse.entity().getFilename()).isEqualTo(this.resource.getFilename());
 
 
 		MockHttpServletResponse servletResponse = new MockHttpServletResponse();
 		ModelAndView mav = response.writeTo(servletRequest, servletResponse, this.context);
-		assertNull(mav);
+		assertThat(mav).isNull();
 
-		assertEquals(200, servletResponse.getStatus());
+		assertThat(servletResponse.getStatus()).isEqualTo(200);
 		byte[] actualBytes = servletResponse.getContentAsByteArray();
-		assertEquals(0, actualBytes.length);
-		assertEquals(MediaType.TEXT_PLAIN_VALUE, servletResponse.getContentType());
-		assertEquals(this.resource.contentLength(),servletResponse.getContentLength());
+		assertThat(actualBytes.length).isEqualTo(0);
+		assertThat(servletResponse.getContentType()).isEqualTo(MediaType.TEXT_PLAIN_VALUE);
+		assertThat(servletResponse.getContentLength()).isEqualTo(this.resource.contentLength());
 	}
 
 
@@ -123,17 +122,17 @@ public class ResourceHandlerFunctionTests {
 		ServerRequest request = new DefaultServerRequest(servletRequest, Collections.singletonList(messageConverter));
 
 		ServerResponse response = this.handlerFunction.handle(request);
-		assertEquals(HttpStatus.OK, response.statusCode());
-		assertEquals(EnumSet.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS), response.headers().getAllow());
+		assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(response.headers().getAllow()).isEqualTo(EnumSet.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS));
 
 		MockHttpServletResponse servletResponse = new MockHttpServletResponse();
 		ModelAndView mav = response.writeTo(servletRequest, servletResponse, this.context);
-		assertNull(mav);
+		assertThat(mav).isNull();
 
-		assertEquals(200, servletResponse.getStatus());
-		assertEquals("GET,HEAD,OPTIONS", servletResponse.getHeader("Allow"));
+		assertThat(servletResponse.getStatus()).isEqualTo(200);
+		assertThat(servletResponse.getHeader("Allow")).isEqualTo("GET,HEAD,OPTIONS");
 		byte[] actualBytes = servletResponse.getContentAsByteArray();
-		assertEquals(0, actualBytes.length);
+		assertThat(actualBytes.length).isEqualTo(0);
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionBuilderTests.java

@@ -28,9 +28,7 @@ import org.springframework.http.MediaType;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 
 import static java.util.Collections.emptyList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.web.servlet.function.RequestPredicates.HEAD;
 
 /**
@@ -56,7 +54,7 @@ public class RouterFunctionBuilderTests {
 				.map(handlerFunction -> handle(handlerFunction, getFooRequest))
 				.map(ServerResponse::statusCode)
 				.map(HttpStatus::value);
-		assertEquals(200, responseStatus.get().intValue());
+		assertThat(responseStatus.get().intValue()).isEqualTo(200);
 
 		servletRequest = new MockHttpServletRequest("HEAD", "/foo");
 		ServerRequest headFooRequest = new DefaultServerRequest(servletRequest, emptyList());
@@ -65,7 +63,7 @@ public class RouterFunctionBuilderTests {
 				.map(handlerFunction -> handle(handlerFunction, getFooRequest))
 				.map(ServerResponse::statusCode)
 				.map(HttpStatus::value);
-		assertEquals(202, responseStatus.get().intValue());
+		assertThat(responseStatus.get().intValue()).isEqualTo(202);
 
 		servletRequest = new MockHttpServletRequest("POST", "/");
 		servletRequest.setContentType("text/plain");
@@ -75,7 +73,7 @@ public class RouterFunctionBuilderTests {
 				.map(handlerFunction -> handle(handlerFunction, barRequest))
 				.map(ServerResponse::statusCode)
 				.map(HttpStatus::value);
-		assertEquals(204, responseStatus.get().intValue());
+		assertThat(responseStatus.get().intValue()).isEqualTo(204);
 
 		servletRequest = new MockHttpServletRequest("POST", "/");
 		ServerRequest invalidRequest = new DefaultServerRequest(servletRequest, emptyList());
@@ -85,7 +83,7 @@ public class RouterFunctionBuilderTests {
 				.map(ServerResponse::statusCode)
 				.map(HttpStatus::value);
 
-		assertFalse(responseStatus.isPresent());
+		assertThat(responseStatus.isPresent()).isFalse();
 
 	}
 
@@ -102,7 +100,7 @@ public class RouterFunctionBuilderTests {
 	@Test
 	public void resources() {
 		Resource resource = new ClassPathResource("/org/springframework/web/servlet/function/");
-		assertTrue(resource.exists());
+		assertThat(resource.exists()).isTrue();
 
 		RouterFunction<ServerResponse> route = RouterFunctions.route()
 				.resources("/resources/**", resource)
@@ -116,7 +114,7 @@ public class RouterFunctionBuilderTests {
 				.map(handlerFunction -> handle(handlerFunction, resourceRequest))
 				.map(ServerResponse::statusCode)
 				.map(HttpStatus::value);
-		assertEquals(200, responseStatus.get().intValue());
+		assertThat(responseStatus.get().intValue()).isEqualTo(200);
 
 		servletRequest = new MockHttpServletRequest("POST", "/resources/foo.txt");
 		ServerRequest invalidRequest = new DefaultServerRequest(servletRequest, emptyList());
@@ -125,7 +123,7 @@ public class RouterFunctionBuilderTests {
 				.map(handlerFunction -> handle(handlerFunction, invalidRequest))
 				.map(ServerResponse::statusCode)
 				.map(HttpStatus::value);
-		assertFalse(responseStatus.isPresent());
+		assertThat(responseStatus.isPresent()).isFalse();
 	}
 
 	@Test
@@ -145,7 +143,7 @@ public class RouterFunctionBuilderTests {
 				.map(handlerFunction -> handle(handlerFunction, fooRequest))
 				.map(ServerResponse::statusCode)
 				.map(HttpStatus::value);
-		assertEquals(200, responseStatus.get().intValue());
+		assertThat(responseStatus.get().intValue()).isEqualTo(200);
 	}
 
 	@Test
@@ -159,20 +157,20 @@ public class RouterFunctionBuilderTests {
 				})
 				.before(request -> {
 					int count = filterCount.getAndIncrement();
-					assertEquals(0, count);
+					assertThat(count).isEqualTo(0);
 					return request;
 				})
 				.after((request, response) -> {
 					int count = filterCount.getAndIncrement();
-					assertEquals(3, count);
+					assertThat(count).isEqualTo(3);
 					return response;
 				})
 				.filter((request, next) -> {
 					int count = filterCount.getAndIncrement();
-					assertEquals(1, count);
+					assertThat(count).isEqualTo(1);
 					ServerResponse responseMono = next.handle(request);
 					count = filterCount.getAndIncrement();
-					assertEquals(2, count);
+					assertThat(count).isEqualTo(2);
 					return responseMono;
 				})
 				.onError(IllegalStateException.class,
@@ -185,7 +183,7 @@ public class RouterFunctionBuilderTests {
 
 		route.route(fooRequest)
 				.map(handlerFunction -> handle(handlerFunction, fooRequest));
-		assertEquals(4, filterCount.get());
+		assertThat(filterCount.get()).isEqualTo(4);
 
 		filterCount.set(0);
 
@@ -196,7 +194,7 @@ public class RouterFunctionBuilderTests {
 				.map(handlerFunction -> handle(handlerFunction, barRequest))
 				.map(ServerResponse::statusCode)
 				.map(HttpStatus::value);
-		assertEquals(500, responseStatus.get().intValue());
+		assertThat(responseStatus.get().intValue()).isEqualTo(500);
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionTests.java

@@ -23,14 +23,11 @@ import org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 
 import static java.util.Collections.emptyList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Arjen Poutsma
  */
-@SuppressWarnings("unchecked")
 public class RouterFunctionTests {
 
 	@Test
@@ -40,14 +37,14 @@ public class RouterFunctionTests {
 		RouterFunction<ServerResponse> routerFunction2 = request -> Optional.of(handlerFunction);
 
 		RouterFunction<ServerResponse> result = routerFunction1.and(routerFunction2);
-		assertNotNull(result);
+		assertThat(result).isNotNull();
 
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest();
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
 
 		Optional<HandlerFunction<ServerResponse>> resultHandlerFunction = result.route(request);
-		assertTrue(resultHandlerFunction.isPresent());
-		assertEquals(handlerFunction, resultHandlerFunction.get());
+		assertThat(resultHandlerFunction.isPresent()).isTrue();
+		assertThat(resultHandlerFunction.get()).isEqualTo(handlerFunction);
 	}
 
 
@@ -58,14 +55,14 @@ public class RouterFunctionTests {
 		RouterFunction<ServerResponse> routerFunction2 = request -> Optional.of(handlerFunction);
 
 		RouterFunction<?> result = routerFunction1.andOther(routerFunction2);
-		assertNotNull(result);
+		assertThat(result).isNotNull();
 
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest();
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
 
 		Optional<? extends HandlerFunction<?>> resultHandlerFunction = result.route(request);
-		assertTrue(resultHandlerFunction.isPresent());
-		assertEquals(handlerFunction, resultHandlerFunction.get());
+		assertThat(resultHandlerFunction.isPresent()).isTrue();
+		assertThat(resultHandlerFunction.get()).isEqualTo(handlerFunction);
 	}
 
 
@@ -75,13 +72,13 @@ public class RouterFunctionTests {
 		RequestPredicate requestPredicate = request -> true;
 
 		RouterFunction<ServerResponse> result = routerFunction1.andRoute(requestPredicate, this::handlerMethod);
-		assertNotNull(result);
+		assertThat(result).isNotNull();
 
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest();
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
 
 		Optional<? extends HandlerFunction<?>> resultHandlerFunction = result.route(request);
-		assertTrue(resultHandlerFunction.isPresent());
+		assertThat(resultHandlerFunction.isPresent()).isTrue();
 	}
 
 
@@ -101,7 +98,7 @@ public class RouterFunctionTests {
 				};
 
 		RouterFunction<EntityResponse<Integer>> result = routerFunction.filter(filterFunction);
-		assertNotNull(result);
+		assertThat(result).isNotNull();
 
 		MockHttpServletRequest servletRequest = new MockHttpServletRequest();
 		ServerRequest request = new DefaultServerRequest(servletRequest, emptyList());
@@ -115,8 +112,8 @@ public class RouterFunctionTests {
 						throw new AssertionError(ex.getMessage(), ex);
 					}
 				});
-		assertTrue(resultHandlerFunction.isPresent());
-		assertEquals(42, (int)resultHandlerFunction.get().entity());
+		assertThat(resultHandlerFunction.isPresent()).isTrue();
+		assertThat((int) resultHandlerFunction.get().entity()).isEqualTo(42);
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionsTests.java

@@ -23,17 +23,13 @@ import org.junit.Test;
 
 import org.springframework.mock.web.test.MockHttpServletRequest;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
 /**
  * @author Arjen Poutsma
  */
-@SuppressWarnings("unchecked")
 public class RouterFunctionsTests {
 
 	@Test
@@ -47,11 +43,11 @@ public class RouterFunctionsTests {
 
 		RouterFunction<ServerResponse>
 				result = RouterFunctions.route(requestPredicate, handlerFunction);
-		assertNotNull(result);
+		assertThat(result).isNotNull();
 
 		Optional<HandlerFunction<ServerResponse>> resultHandlerFunction = result.route(request);
-		assertTrue(resultHandlerFunction.isPresent());
-		assertEquals(handlerFunction, resultHandlerFunction.get());
+		assertThat(resultHandlerFunction.isPresent()).isTrue();
+		assertThat(resultHandlerFunction.get()).isEqualTo(handlerFunction);
 	}
 
 	@Test
@@ -64,10 +60,10 @@ public class RouterFunctionsTests {
 		given(requestPredicate.test(request)).willReturn(false);
 
 		RouterFunction<ServerResponse> result = RouterFunctions.route(requestPredicate, handlerFunction);
-		assertNotNull(result);
+		assertThat(result).isNotNull();
 
 		Optional<HandlerFunction<ServerResponse>> resultHandlerFunction = result.route(request);
-		assertFalse(resultHandlerFunction.isPresent());
+		assertThat(resultHandlerFunction.isPresent()).isFalse();
 	}
 
 	@Test
@@ -81,11 +77,11 @@ public class RouterFunctionsTests {
 		given(requestPredicate.nest(request)).willReturn(Optional.of(request));
 
 		RouterFunction<ServerResponse> result = RouterFunctions.nest(requestPredicate, routerFunction);
-		assertNotNull(result);
+		assertThat(result).isNotNull();
 
 		Optional<HandlerFunction<ServerResponse>> resultHandlerFunction = result.route(request);
-		assertTrue(resultHandlerFunction.isPresent());
-		assertEquals(handlerFunction, resultHandlerFunction.get());
+		assertThat(resultHandlerFunction.isPresent()).isTrue();
+		assertThat(resultHandlerFunction.get()).isEqualTo(handlerFunction);
 	}
 
 	@Test
@@ -99,10 +95,10 @@ public class RouterFunctionsTests {
 		given(requestPredicate.nest(request)).willReturn(Optional.empty());
 
 		RouterFunction<ServerResponse> result = RouterFunctions.nest(requestPredicate, routerFunction);
-		assertNotNull(result);
+		assertThat(result).isNotNull();
 
 		Optional<HandlerFunction<ServerResponse>> resultHandlerFunction = result.route(request);
-		assertFalse(resultHandlerFunction.isPresent());
+		assertThat(resultHandlerFunction.isPresent()).isFalse();
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/function/ToStringVisitorTests.java

@@ -21,7 +21,7 @@ import org.junit.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.web.servlet.function.RequestPredicates.GET;
 import static org.springframework.web.servlet.function.RequestPredicates.accept;
 import static org.springframework.web.servlet.function.RequestPredicates.contentType;
@@ -57,7 +57,7 @@ public class ToStringVisitorTests {
 				"  (GET && /baz) -> \n" +
 				" }\n" +
 				"}";
-		assertEquals(expected, result);
+		assertThat(result).isEqualTo(expected);
 	}
 
 	@Test
@@ -93,7 +93,7 @@ public class ToStringVisitorTests {
 		predicate.accept(visitor);
 		String result = visitor.toString();
 
-		assertEquals(expected, result);
+		assertThat(result).isEqualTo(expected);
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java

@@ -29,8 +29,8 @@ import org.springframework.web.context.support.XmlWebApplicationContext;
 import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.HandlerMapping;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Rod Johnson
@@ -59,11 +59,11 @@ public class BeanNameUrlHandlerMappingTests {
 		MockHttpServletRequest req = new MockHttpServletRequest("GET", "/mypath/nonsense.html");
 		req.setContextPath("/myapp");
 		Object h = hm.getHandler(req);
-		assertTrue("Handler is null", h == null);
+		assertThat(h == null).as("Handler is null").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/foo/bar/baz.html");
 		h = hm.getHandler(req);
-		assertTrue("Handler is null", h == null);
+		assertThat(h == null).as("Handler is null").isTrue();
 	}
 
 	@Test
@@ -85,38 +85,38 @@ public class BeanNameUrlHandlerMappingTests {
 
 		MockHttpServletRequest req = new MockHttpServletRequest("GET", "/mypath/welcome.html");
 		HandlerExecutionChain hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/myapp/mypath/welcome.html");
 		req.setContextPath("/myapp");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/myapp/mypath/welcome.html");
 		req.setContextPath("/myapp");
 		req.setServletPath("/mypath/welcome.html");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/myapp/myservlet/mypath/welcome.html");
 		req.setContextPath("/myapp");
 		req.setServletPath("/myservlet");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/myapp/myapp/mypath/welcome.html");
 		req.setContextPath("/myapp");
 		req.setServletPath("/myapp");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/mypath/show.html");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/mypath/bookseats.html");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 	}
 
 	@Test
@@ -128,28 +128,28 @@ public class BeanNameUrlHandlerMappingTests {
 
 		MockHttpServletRequest req = new MockHttpServletRequest("GET", "/mypath/welcome.html");
 		HandlerExecutionChain hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/myapp/mypath/welcome.html");
 		req.setContextPath("/myapp");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/mypath/welcome.html");
 		req.setContextPath("");
 		req.setServletPath("/mypath");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/Myapp/mypath/welcome.html");
 		req.setContextPath("/myapp");
 		req.setServletPath("/mypath");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 	}
 
 	@Test
@@ -159,15 +159,15 @@ public class BeanNameUrlHandlerMappingTests {
 
 		MockHttpServletRequest req = new MockHttpServletRequest("GET", "/mypath/test.html");
 		HandlerExecutionChain hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/mypath/testarossa");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/mypath/tes");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec == null);
+		assertThat(hec == null).as("Handler is correct bean").isTrue();
 	}
 
 	@Test
@@ -179,15 +179,15 @@ public class BeanNameUrlHandlerMappingTests {
 
 		MockHttpServletRequest req = new MockHttpServletRequest("GET", "/mypath/test.html");
 		HandlerExecutionChain hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/mypath/testarossa");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == anotherHandler);
+		assertThat(hec != null && hec.getHandler() == anotherHandler).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/mypath/tes");
 		hec = hm.getHandler(req);
-		assertTrue("Handler is correct bean", hec == null);
+		assertThat(hec == null).as("Handler is correct bean").isTrue();
 	}
 
 	@Test

spring-webmvc/src/test/java/org/springframework/web/servlet/handler/CorsAbstractHandlerMappingTests.java

@@ -39,9 +39,7 @@ import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.support.WebContentGenerator;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -74,8 +72,9 @@ public class CorsAbstractHandlerMappingTests {
 		this.request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET");
 		HandlerExecutionChain chain = handlerMapping.getHandler(this.request);
 
-		assertNotNull(chain);
-		assertTrue(chain.getHandler() instanceof SimpleHandler);
+		assertThat(chain).isNotNull();
+		boolean condition = chain.getHandler() instanceof SimpleHandler;
+		assertThat(condition).isTrue();
 	}
 
 	@Test
@@ -86,8 +85,9 @@ public class CorsAbstractHandlerMappingTests {
 		this.request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET");
 		HandlerExecutionChain chain = handlerMapping.getHandler(this.request);
 
-		assertNotNull(chain);
-		assertTrue(chain.getHandler() instanceof SimpleHandler);
+		assertThat(chain).isNotNull();
+		boolean condition = chain.getHandler() instanceof SimpleHandler;
+		assertThat(condition).isTrue();
 	}
 
 	@Test
@@ -98,9 +98,10 @@ public class CorsAbstractHandlerMappingTests {
 		this.request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET");
 		HandlerExecutionChain chain = handlerMapping.getHandler(this.request);
 
-		assertNotNull(chain);
-		assertTrue(chain.getHandler() instanceof CorsAwareHandler);
-		assertEquals(Collections.singletonList("*"), getRequiredCorsConfiguration(chain, false).getAllowedOrigins());
+		assertThat(chain).isNotNull();
+		boolean condition = chain.getHandler() instanceof CorsAwareHandler;
+		assertThat(condition).isTrue();
+		assertThat(getRequiredCorsConfiguration(chain, false).getAllowedOrigins()).isEqualTo(Collections.singletonList("*"));
 	}
 
 	@Test
@@ -111,10 +112,10 @@ public class CorsAbstractHandlerMappingTests {
 		this.request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET");
 		HandlerExecutionChain chain = handlerMapping.getHandler(this.request);
 
-		assertNotNull(chain);
-		assertNotNull(chain.getHandler());
-		assertEquals("PreFlightHandler", chain.getHandler().getClass().getSimpleName());
-		assertEquals(Collections.singletonList("*"), getRequiredCorsConfiguration(chain, true).getAllowedOrigins());
+		assertThat(chain).isNotNull();
+		assertThat(chain.getHandler()).isNotNull();
+		assertThat(chain.getHandler().getClass().getSimpleName()).isEqualTo("PreFlightHandler");
+		assertThat(getRequiredCorsConfiguration(chain, true).getAllowedOrigins()).isEqualTo(Collections.singletonList("*"));
 	}
 
 	@Test
@@ -128,9 +129,10 @@ public class CorsAbstractHandlerMappingTests {
 		this.request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET");
 		HandlerExecutionChain chain = handlerMapping.getHandler(this.request);
 
-		assertNotNull(chain);
-		assertTrue(chain.getHandler() instanceof SimpleHandler);
-		assertEquals(Collections.singletonList("*"), getRequiredCorsConfiguration(chain, false).getAllowedOrigins());
+		assertThat(chain).isNotNull();
+		boolean condition = chain.getHandler() instanceof SimpleHandler;
+		assertThat(condition).isTrue();
+		assertThat(getRequiredCorsConfiguration(chain, false).getAllowedOrigins()).isEqualTo(Collections.singletonList("*"));
 	}
 
 	@Test
@@ -144,10 +146,10 @@ public class CorsAbstractHandlerMappingTests {
 		this.request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET");
 		HandlerExecutionChain chain = handlerMapping.getHandler(this.request);
 
-		assertNotNull(chain);
-		assertNotNull(chain.getHandler());
-		assertEquals("PreFlightHandler", chain.getHandler().getClass().getSimpleName());
-		assertEquals(Collections.singletonList("*"), getRequiredCorsConfiguration(chain, true).getAllowedOrigins());
+		assertThat(chain).isNotNull();
+		assertThat(chain.getHandler()).isNotNull();
+		assertThat(chain.getHandler().getClass().getSimpleName()).isEqualTo("PreFlightHandler");
+		assertThat(getRequiredCorsConfiguration(chain, true).getAllowedOrigins()).isEqualTo(Collections.singletonList("*"));
 	}
 
 	@Test
@@ -159,12 +161,13 @@ public class CorsAbstractHandlerMappingTests {
 		this.request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET");
 		HandlerExecutionChain chain = handlerMapping.getHandler(this.request);
 
-		assertNotNull(chain);
-		assertTrue(chain.getHandler() instanceof SimpleHandler);
+		assertThat(chain).isNotNull();
+		boolean condition = chain.getHandler() instanceof SimpleHandler;
+		assertThat(condition).isTrue();
 		CorsConfiguration config = getRequiredCorsConfiguration(chain, false);
-		assertNotNull(config);
-		assertEquals(Collections.singletonList("*"), config.getAllowedOrigins());
-		assertEquals(true, config.getAllowCredentials());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedOrigins()).isEqualTo(Collections.singletonList("*"));
+		assertThat(config.getAllowCredentials()).isEqualTo(true);
 	}
 
 	@Test
@@ -176,13 +179,13 @@ public class CorsAbstractHandlerMappingTests {
 		this.request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET");
 		HandlerExecutionChain chain = handlerMapping.getHandler(this.request);
 
-		assertNotNull(chain);
-		assertNotNull(chain.getHandler());
-		assertEquals("PreFlightHandler", chain.getHandler().getClass().getSimpleName());
+		assertThat(chain).isNotNull();
+		assertThat(chain.getHandler()).isNotNull();
+		assertThat(chain.getHandler().getClass().getSimpleName()).isEqualTo("PreFlightHandler");
 		CorsConfiguration config = getRequiredCorsConfiguration(chain, true);
-		assertNotNull(config);
-		assertEquals(Collections.singletonList("*"), config.getAllowedOrigins());
-		assertEquals(true, config.getAllowCredentials());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedOrigins()).isEqualTo(Collections.singletonList("*"));
+		assertThat(config.getAllowCredentials()).isEqualTo(true);
 	}
 
 
@@ -191,7 +194,7 @@ public class CorsAbstractHandlerMappingTests {
 		CorsConfiguration corsConfig = null;
 		if (isPreFlightRequest) {
 			Object handler = chain.getHandler();
-			assertEquals("PreFlightHandler", handler.getClass().getSimpleName());
+			assertThat(handler.getClass().getSimpleName()).isEqualTo("PreFlightHandler");
 			DirectFieldAccessor accessor = new DirectFieldAccessor(handler);
 			corsConfig = (CorsConfiguration) accessor.getPropertyValue("config");
 		}
@@ -202,7 +205,7 @@ public class CorsAbstractHandlerMappingTests {
 				corsConfig = (CorsConfiguration) accessor.getPropertyValue("config");
 			}
 		}
-		assertNotNull(corsConfig);
+		assertThat(corsConfig).isNotNull();
 		return corsConfig;
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingIntrospectorTests.java

@@ -39,10 +39,8 @@ import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.springframework.web.servlet.HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE;
 
 /**
@@ -64,7 +62,7 @@ public class HandlerMappingIntrospectorTests {
 		List<?> expected = Arrays.asList(cxt.getBean("hmA"), cxt.getBean("hmB"), cxt.getBean("hmC"));
 		List<HandlerMapping> actual = getIntrospector(cxt).getHandlerMappings();
 
-		assertEquals(expected, actual);
+		assertThat(actual).isEqualTo(expected);
 	}
 
 	@Test
@@ -81,7 +79,7 @@ public class HandlerMappingIntrospectorTests {
 		List<?> expected = Arrays.asList(cxt.getBean("hmC"), cxt.getBean("hmB"), cxt.getBean("hmA"));
 		List<HandlerMapping> actual = getIntrospector(cxt).getHandlerMappings();
 
-		assertEquals(expected, actual);
+		assertThat(actual).isEqualTo(expected);
 	}
 
 	public void defaultHandlerMappings() throws Exception {
@@ -89,9 +87,9 @@ public class HandlerMappingIntrospectorTests {
 		cxt.refresh();
 
 		List<HandlerMapping> actual = getIntrospector(cxt).getHandlerMappings();
-		assertEquals(2, actual.size());
-		assertEquals(BeanNameUrlHandlerMapping.class, actual.get(0).getClass());
-		assertEquals(RequestMappingHandlerMapping.class, actual.get(1).getClass());
+		assertThat(actual.size()).isEqualTo(2);
+		assertThat(actual.get(0).getClass()).isEqualTo(BeanNameUrlHandlerMapping.class);
+		assertThat(actual.get(1).getClass()).isEqualTo(RequestMappingHandlerMapping.class);
 	}
 
 	@Test
@@ -106,8 +104,8 @@ public class HandlerMappingIntrospectorTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/path");
 		MatchableHandlerMapping hm = getIntrospector(cxt).getMatchableHandlerMapping(request);
 
-		assertEquals(cxt.getBean("hm"), hm);
-		assertNull("Attributes changes not ignored", request.getAttribute(BEST_MATCHING_PATTERN_ATTRIBUTE));
+		assertThat(hm).isEqualTo(cxt.getBean("hm"));
+		assertThat(request.getAttribute(BEST_MATCHING_PATTERN_ATTRIBUTE)).as("Attributes changes not ignored").isNull();
 	}
 
 	@Test
@@ -134,9 +132,9 @@ public class HandlerMappingIntrospectorTests {
 		request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "POST");
 		CorsConfiguration corsConfig = getIntrospector(cxt).getCorsConfiguration(request);
 
-		assertNotNull(corsConfig);
-		assertEquals(Collections.singletonList("http://localhost:9000"), corsConfig.getAllowedOrigins());
-		assertEquals(Collections.singletonList("POST"), corsConfig.getAllowedMethods());
+		assertThat(corsConfig).isNotNull();
+		assertThat(corsConfig.getAllowedOrigins()).isEqualTo(Collections.singletonList("http://localhost:9000"));
+		assertThat(corsConfig.getAllowedMethods()).isEqualTo(Collections.singletonList("POST"));
 	}
 
 	@Test
@@ -149,9 +147,9 @@ public class HandlerMappingIntrospectorTests {
 		request.addHeader("Origin", "http://localhost:9000");
 		CorsConfiguration corsConfig = getIntrospector(cxt).getCorsConfiguration(request);
 
-		assertNotNull(corsConfig);
-		assertEquals(Collections.singletonList("http://localhost:9000"), corsConfig.getAllowedOrigins());
-		assertEquals(Collections.singletonList("POST"), corsConfig.getAllowedMethods());
+		assertThat(corsConfig).isNotNull();
+		assertThat(corsConfig.getAllowedOrigins()).isEqualTo(Collections.singletonList("http://localhost:9000"));
+		assertThat(corsConfig.getAllowedMethods()).isEqualTo(Collections.singletonList("POST"));
 	}
 
 	private HandlerMappingIntrospector getIntrospector(WebApplicationContext cxt) {

spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java

@@ -38,10 +38,8 @@ import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.util.UrlPathHelper;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 
 
 /**
@@ -85,8 +83,8 @@ public class HandlerMethodMappingTests {
 
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", key);
 		HandlerMethod result = this.mapping.getHandlerInternal(request);
-		assertEquals(method1, result.getMethod());
-		assertEquals(result, request.getAttribute(HandlerMapping.BEST_MATCHING_HANDLER_ATTRIBUTE));
+		assertThat(result.getMethod()).isEqualTo(method1);
+		assertThat(request.getAttribute(HandlerMapping.BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(result);
 	}
 
 	@Test
@@ -96,8 +94,8 @@ public class HandlerMethodMappingTests {
 
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo");
 		HandlerMethod result = this.mapping.getHandlerInternal(request);
-		assertEquals(method1, result.getMethod());
-		assertEquals(result, request.getAttribute(HandlerMapping.BEST_MATCHING_HANDLER_ATTRIBUTE));
+		assertThat(result.getMethod()).isEqualTo(method1);
+		assertThat(request.getAttribute(HandlerMapping.BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(result);
 	}
 
 	@Test
@@ -118,14 +116,14 @@ public class HandlerMethodMappingTests {
 		mapping1.setApplicationContext(new StaticApplicationContext(cxt));
 		mapping1.afterPropertiesSet();
 
-		assertEquals(0, mapping1.getHandlerMethods().size());
+		assertThat(mapping1.getHandlerMethods().size()).isEqualTo(0);
 
 		AbstractHandlerMethodMapping<String> mapping2 = new MyHandlerMethodMapping();
 		mapping2.setDetectHandlerMethodsInAncestorContexts(true);
 		mapping2.setApplicationContext(new StaticApplicationContext(cxt));
 		mapping2.afterPropertiesSet();
 
-		assertEquals(2, mapping2.getHandlerMethods().size());
+		assertThat(mapping2.getHandlerMethods().size()).isEqualTo(2);
 	}
 
 	@Test
@@ -139,9 +137,9 @@ public class HandlerMethodMappingTests {
 		// Direct URL lookup
 
 		List<String> directUrlMatches = this.mapping.getMappingRegistry().getMappingsByUrl(key1);
-		assertNotNull(directUrlMatches);
-		assertEquals(1, directUrlMatches.size());
-		assertEquals(key1, directUrlMatches.get(0));
+		assertThat(directUrlMatches).isNotNull();
+		assertThat(directUrlMatches.size()).isEqualTo(1);
+		assertThat(directUrlMatches.get(0)).isEqualTo(key1);
 
 		// Mapping name lookup
 
@@ -150,25 +148,25 @@ public class HandlerMethodMappingTests {
 
 		String name1 = this.method1.getName();
 		List<HandlerMethod> handlerMethods = this.mapping.getMappingRegistry().getHandlerMethodsByMappingName(name1);
-		assertNotNull(handlerMethods);
-		assertEquals(1, handlerMethods.size());
-		assertEquals(handlerMethod1, handlerMethods.get(0));
+		assertThat(handlerMethods).isNotNull();
+		assertThat(handlerMethods.size()).isEqualTo(1);
+		assertThat(handlerMethods.get(0)).isEqualTo(handlerMethod1);
 
 		String name2 = this.method2.getName();
 		handlerMethods = this.mapping.getMappingRegistry().getHandlerMethodsByMappingName(name2);
-		assertNotNull(handlerMethods);
-		assertEquals(1, handlerMethods.size());
-		assertEquals(handlerMethod2, handlerMethods.get(0));
+		assertThat(handlerMethods).isNotNull();
+		assertThat(handlerMethods.size()).isEqualTo(1);
+		assertThat(handlerMethods.get(0)).isEqualTo(handlerMethod2);
 
 		// CORS lookup
 
 		CorsConfiguration config = this.mapping.getMappingRegistry().getCorsConfiguration(handlerMethod1);
-		assertNotNull(config);
-		assertEquals("http://" + handler.hashCode() + name1, config.getAllowedOrigins().get(0));
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedOrigins().get(0)).isEqualTo(("http://" + handler.hashCode() + name1));
 
 		config = this.mapping.getMappingRegistry().getCorsConfiguration(handlerMethod2);
-		assertNotNull(config);
-		assertEquals("http://" + handler.hashCode() + name2, config.getAllowedOrigins().get(0));
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedOrigins().get(0)).isEqualTo(("http://" + handler.hashCode() + name2));
 	}
 
 	@Test
@@ -189,28 +187,28 @@ public class HandlerMethodMappingTests {
 		// Direct URL lookup
 
 		List<String> directUrlMatches = this.mapping.getMappingRegistry().getMappingsByUrl(key1);
-		assertNotNull(directUrlMatches);
-		assertEquals(1, directUrlMatches.size());
-		assertEquals(key1, directUrlMatches.get(0));
+		assertThat(directUrlMatches).isNotNull();
+		assertThat(directUrlMatches.size()).isEqualTo(1);
+		assertThat(directUrlMatches.get(0)).isEqualTo(key1);
 
 		// Mapping name lookup
 
 		String name = this.method1.getName();
 		List<HandlerMethod> handlerMethods = this.mapping.getMappingRegistry().getHandlerMethodsByMappingName(name);
-		assertNotNull(handlerMethods);
-		assertEquals(2, handlerMethods.size());
-		assertEquals(handlerMethod1, handlerMethods.get(0));
-		assertEquals(handlerMethod2, handlerMethods.get(1));
+		assertThat(handlerMethods).isNotNull();
+		assertThat(handlerMethods.size()).isEqualTo(2);
+		assertThat(handlerMethods.get(0)).isEqualTo(handlerMethod1);
+		assertThat(handlerMethods.get(1)).isEqualTo(handlerMethod2);
 
 		// CORS lookup
 
 		CorsConfiguration config = this.mapping.getMappingRegistry().getCorsConfiguration(handlerMethod1);
-		assertNotNull(config);
-		assertEquals("http://" + handler1.hashCode() + name, config.getAllowedOrigins().get(0));
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedOrigins().get(0)).isEqualTo(("http://" + handler1.hashCode() + name));
 
 		config = this.mapping.getMappingRegistry().getCorsConfiguration(handlerMethod2);
-		assertNotNull(config);
-		assertEquals("http://" + handler2.hashCode() + name, config.getAllowedOrigins().get(0));
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedOrigins().get(0)).isEqualTo(("http://" + handler2.hashCode() + name));
 	}
 
 	@Test
@@ -220,13 +218,13 @@ public class HandlerMethodMappingTests {
 		HandlerMethod handlerMethod = new HandlerMethod(this.handler, this.method1);
 
 		this.mapping.registerMapping(key, this.handler, this.method1);
-		assertNotNull(this.mapping.getHandlerInternal(new MockHttpServletRequest("GET", key)));
+		assertThat(this.mapping.getHandlerInternal(new MockHttpServletRequest("GET", key))).isNotNull();
 
 		this.mapping.unregisterMapping(key);
-		assertNull(mapping.getHandlerInternal(new MockHttpServletRequest("GET", key)));
-		assertNull(this.mapping.getMappingRegistry().getMappingsByUrl(key));
-		assertNull(this.mapping.getMappingRegistry().getHandlerMethodsByMappingName(this.method1.getName()));
-		assertNull(this.mapping.getMappingRegistry().getCorsConfiguration(handlerMethod));
+		assertThat(mapping.getHandlerInternal(new MockHttpServletRequest("GET", key))).isNull();
+		assertThat(this.mapping.getMappingRegistry().getMappingsByUrl(key)).isNull();
+		assertThat(this.mapping.getMappingRegistry().getHandlerMethodsByMappingName(this.method1.getName())).isNull();
+		assertThat(this.mapping.getMappingRegistry().getCorsConfiguration(handlerMethod)).isNull();
 	}
 
 	@Test
@@ -243,8 +241,8 @@ public class HandlerMethodMappingTests {
 		HandlerMethod handlerMethod = this.mapping.getHandlerInternal(new MockHttpServletRequest("GET", key));
 
 		CorsConfiguration config = this.mapping.getMappingRegistry().getCorsConfiguration(handlerMethod);
-		assertNotNull(config);
-		assertEquals("http://" + beanName.hashCode() + this.method1.getName(), config.getAllowedOrigins().get(0));
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedOrigins().get(0)).isEqualTo(("http://" + beanName.hashCode() + this.method1.getName()));
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java

@@ -29,8 +29,7 @@ import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.then;
 import static org.mockito.Mockito.mock;
@@ -54,29 +53,29 @@ public class MappedInterceptorTests {
 	@Test
 	public void noPatterns() {
 		MappedInterceptor mappedInterceptor = new MappedInterceptor(null, null, this.interceptor);
-		assertTrue(mappedInterceptor.matches("/foo", pathMatcher));
+		assertThat(mappedInterceptor.matches("/foo", pathMatcher)).isTrue();
 	}
 
 	@Test
 	public void includePattern() {
 		MappedInterceptor mappedInterceptor = new MappedInterceptor(new String[] { "/foo/*" }, this.interceptor);
 
-		assertTrue(mappedInterceptor.matches("/foo/bar", pathMatcher));
-		assertFalse(mappedInterceptor.matches("/bar/foo", pathMatcher));
+		assertThat(mappedInterceptor.matches("/foo/bar", pathMatcher)).isTrue();
+		assertThat(mappedInterceptor.matches("/bar/foo", pathMatcher)).isFalse();
 	}
 
 	@Test
 	public void includePatternWithMatrixVariables() {
 		MappedInterceptor mappedInterceptor = new MappedInterceptor(new String[] { "/foo*/*" }, this.interceptor);
-		assertTrue(mappedInterceptor.matches("/foo;q=1/bar;s=2", pathMatcher));
+		assertThat(mappedInterceptor.matches("/foo;q=1/bar;s=2", pathMatcher)).isTrue();
 	}
 
 	@Test
 	public void excludePattern() {
 		MappedInterceptor mappedInterceptor = new MappedInterceptor(null, new String[] { "/admin/**" }, this.interceptor);
 
-		assertTrue(mappedInterceptor.matches("/foo", pathMatcher));
-		assertFalse(mappedInterceptor.matches("/admin/foo", pathMatcher));
+		assertThat(mappedInterceptor.matches("/foo", pathMatcher)).isTrue();
+		assertThat(mappedInterceptor.matches("/admin/foo", pathMatcher)).isFalse();
 	}
 
 	@Test
@@ -84,8 +83,8 @@ public class MappedInterceptorTests {
 		MappedInterceptor mappedInterceptor = new MappedInterceptor(
 				new String[] { "/**" }, new String[] { "/admin/**" }, this.interceptor);
 
-		assertTrue(mappedInterceptor.matches("/foo", pathMatcher));
-		assertFalse(mappedInterceptor.matches("/admin/foo", pathMatcher));
+		assertThat(mappedInterceptor.matches("/foo", pathMatcher)).isTrue();
+		assertThat(mappedInterceptor.matches("/admin/foo", pathMatcher)).isFalse();
 	}
 
 	@Test
@@ -93,8 +92,8 @@ public class MappedInterceptorTests {
 		MappedInterceptor mappedInterceptor = new MappedInterceptor(new String[] { "/foo/[0-9]*" }, this.interceptor);
 		mappedInterceptor.setPathMatcher(new TestPathMatcher());
 
-		assertTrue(mappedInterceptor.matches("/foo/123", pathMatcher));
-		assertFalse(mappedInterceptor.matches("/foo/bar", pathMatcher));
+		assertThat(mappedInterceptor.matches("/foo/123", pathMatcher)).isTrue();
+		assertThat(mappedInterceptor.matches("/foo/bar", pathMatcher)).isFalse();
 	}
 
 	@Test

spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java

@@ -27,8 +27,7 @@ import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.HandlerMapping;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Alef Arendsen
@@ -58,15 +57,15 @@ public class PathMatchingUrlHandlerMappingTests {
 
 		MockHttpServletRequest req = new MockHttpServletRequest("GET", "/welcome.html");
 		HandlerExecutionChain hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/show.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/bookseats.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 	}
 
 	@Test
@@ -80,148 +79,148 @@ public class PathMatchingUrlHandlerMappingTests {
 		// testing some normal behavior
 		MockHttpServletRequest req = new MockHttpServletRequest("GET", "/pathmatchingTest.html");
 		HandlerExecutionChain hec = getHandler(req);
-		assertTrue("Handler is null", hec != null);
-		assertTrue("Handler is correct bean", hec.getHandler() == bean);
-		assertEquals("/pathmatchingTest.html", req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE));
+		assertThat(hec != null).as("Handler is null").isTrue();
+		assertThat(hec.getHandler() == bean).as("Handler is correct bean").isTrue();
+		assertThat(req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("/pathmatchingTest.html");
 
 		// no match, no forward slash included
 		req = new MockHttpServletRequest("GET", "welcome.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
-		assertEquals("welcome.html", req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE));
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
+		assertThat(req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("welcome.html");
 
 		// testing some ????? behavior
 		req = new MockHttpServletRequest("GET", "/pathmatchingAA.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
-		assertEquals("pathmatchingAA.html", req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE));
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
+		assertThat(req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("pathmatchingAA.html");
 
 		// testing some ????? behavior
 		req = new MockHttpServletRequest("GET", "/pathmatchingA.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
-		assertEquals("/pathmatchingA.html", req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE));
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
+		assertThat(req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("/pathmatchingA.html");
 
 		// testing some ????? behavior
 		req = new MockHttpServletRequest("GET", "/administrator/pathmatching.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		// testing simple /**/behavior
 		req = new MockHttpServletRequest("GET", "/administrator/test/pathmatching.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		// this should not match because of the administratorT
 		req = new MockHttpServletRequest("GET", "/administratort/pathmatching.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 
 		// this should match because of *.jsp
 		req = new MockHttpServletRequest("GET", "/bla.jsp");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		// should match because exact pattern is there
 		req = new MockHttpServletRequest("GET", "/administrator/another/bla.xml");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		// should not match, because there's not .gif extension in there
 		req = new MockHttpServletRequest("GET", "/administrator/another/bla.gif");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 
 		// should match because there testlast* in there
 		req = new MockHttpServletRequest("GET", "/administrator/test/testlastbit");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		// but this not, because it's testlast and not testla
 		req = new MockHttpServletRequest("GET", "/administrator/test/testla");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/administrator/testing/longer/bla");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/administrator/testing/longer/test.jsp");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/administrator/testing/longer2/notmatching/notmatching");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/shortpattern/testing/toolong");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/XXpathXXmatching.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/pathXXmatching.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/XpathXXmatching.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/XXpathmatching.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/show12.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/show123.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/show1.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/reallyGood-test-is-this.jpeg");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/reallyGood-tst-is-this.jpeg");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/testing/test.jpeg");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/testing/test.jpg");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/anotherTest");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/stillAnotherTest");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 
 		// there outofpattern*yeah in the pattern, so this should fail
 		req = new MockHttpServletRequest("GET", "/outofpattern*ye");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/test't est/path'm atching.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/test%26t%20est/path%26m%20atching.html");
 		hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
 	}
 
 	@Test
@@ -229,7 +228,7 @@ public class PathMatchingUrlHandlerMappingTests {
 		Object bean = wac.getBean("starController");
 		MockHttpServletRequest req = new MockHttpServletRequest("GET", "/goggog.html");
 		HandlerExecutionChain hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 	}
 
 	@Test
@@ -237,9 +236,8 @@ public class PathMatchingUrlHandlerMappingTests {
 		Object bean = wac.getBean("mainController");
 		MockHttpServletRequest req = new MockHttpServletRequest("GET", "/show.html");
 		HandlerExecutionChain hec = getHandler(req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
-		assertEquals("Mapping not exposed", "show.html",
-				req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE));
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
+		assertThat(req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).as("Mapping not exposed").isEqualTo("show.html");
 	}
 
 	private HandlerExecutionChain getHandler(MockHttpServletRequest req) throws Exception {

spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java

@@ -28,8 +28,7 @@ import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.util.WebUtils;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Seth Ladd
@@ -59,15 +58,15 @@ public class SimpleMappingExceptionResolverTests {
 	@Test
 	public void setOrder() {
 		exceptionResolver.setOrder(2);
-		assertEquals(2, exceptionResolver.getOrder());
+		assertThat(exceptionResolver.getOrder()).isEqualTo(2);
 	}
 
 	@Test
 	public void defaultErrorView() {
 		exceptionResolver.setDefaultErrorView("default-view");
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals("default-view", mav.getViewName());
-		assertEquals(genericException, mav.getModel().get(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE));
+		assertThat(mav.getViewName()).isEqualTo("default-view");
+		assertThat(mav.getModel().get(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE)).isEqualTo(genericException);
 	}
 
 	@Test
@@ -75,7 +74,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setDefaultErrorView("default-view");
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler2, genericException);
-		assertNull(mav);
+		assertThat(mav).isNull();
 	}
 
 	@Test
@@ -83,7 +82,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setDefaultErrorView("default-view");
 		exceptionResolver.setMappedHandlerClasses(String.class);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler2, genericException);
-		assertNull(mav);
+		assertThat(mav).isNull();
 	}
 
 	@Test
@@ -91,8 +90,8 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setDefaultErrorView("default-view");
 		exceptionResolver.setExceptionAttribute(null);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals("default-view", mav.getViewName());
-		assertNull(mav.getModel().get(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE));
+		assertThat(mav.getViewName()).isEqualTo("default-view");
+		assertThat(mav.getModel().get(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE)).isNull();
 	}
 
 	@Test
@@ -100,14 +99,14 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setExceptionMappings(null);
 		exceptionResolver.setDefaultErrorView("default-view");
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals("default-view", mav.getViewName());
+		assertThat(mav.getViewName()).isEqualTo("default-view");
 	}
 
 	@Test
 	public void noDefaultStatusCode() {
 		exceptionResolver.setDefaultErrorView("default-view");
 		exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals(HttpServletResponse.SC_OK, response.getStatus());
+		assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_OK);
 	}
 
 	@Test
@@ -115,7 +114,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setDefaultErrorView("default-view");
 		exceptionResolver.setDefaultStatusCode(HttpServletResponse.SC_BAD_REQUEST);
 		exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals(HttpServletResponse.SC_BAD_REQUEST, response.getStatus());
+		assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_BAD_REQUEST);
 	}
 
 	@Test
@@ -124,7 +123,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setDefaultStatusCode(HttpServletResponse.SC_BAD_REQUEST);
 		request.setAttribute(WebUtils.INCLUDE_REQUEST_URI_ATTRIBUTE, "some path");
 		exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals(HttpServletResponse.SC_OK, response.getStatus());
+		assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_OK);
 	}
 
 	@Test
@@ -135,7 +134,7 @@ public class SimpleMappingExceptionResolverTests {
 		statusCodes.setProperty("default-view", "406");
 		exceptionResolver.setStatusCodes(statusCodes);
 		exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals(HttpServletResponse.SC_NOT_ACCEPTABLE, response.getStatus());
+		assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_NOT_ACCEPTABLE);
 	}
 
 	@Test
@@ -145,7 +144,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setWarnLogCategory("HANDLER_EXCEPTION");
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals("error", mav.getViewName());
+		assertThat(mav.getViewName()).isEqualTo("error");
 	}
 
 	@Test
@@ -155,7 +154,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals("error", mav.getViewName());
+		assertThat(mav.getViewName()).isEqualTo("error");
 	}
 
 	@Test
@@ -165,7 +164,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setMappedHandlerClasses(String.class);
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals("error", mav.getViewName());
+		assertThat(mav.getViewName()).isEqualTo("error");
 	}
 
 	@Test
@@ -175,7 +174,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setMappedHandlerClasses(Comparable.class);
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals("error", mav.getViewName());
+		assertThat(mav.getViewName()).isEqualTo("error");
 	}
 
 	@Test
@@ -185,7 +184,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler2, genericException);
-		assertNull(mav);
+		assertThat(mav).isNull();
 	}
 
 	@Test
@@ -195,7 +194,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setMappedHandlerClasses(String.class);
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler2, genericException);
-		assertNull(mav);
+		assertThat(mav).isNull();
 	}
 
 	@Test
@@ -205,7 +204,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setExceptionMappings(props);
 		exceptionResolver.setExcludedExceptions(IllegalArgumentException.class);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, new IllegalArgumentException());
-		assertNull(mav);
+		assertThat(mav).isNull();
 	}
 
 	@Test
@@ -215,7 +214,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setWarnLogCategory("HANDLER_EXCEPTION");
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertNull(mav);
+		assertThat(mav).isNull();
 	}
 
 	@Test
@@ -226,7 +225,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals("error", mav.getViewName());
+		assertThat(mav.getViewName()).isEqualTo("error");
 	}
 
 	@Test
@@ -237,7 +236,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
-		assertEquals("error", mav.getViewName());
+		assertThat(mav.getViewName()).isEqualTo("error");
 	}
 
 	@Test
@@ -249,7 +248,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, oddException);
-		assertEquals("another-error", mav.getViewName());
+		assertThat(mav.getViewName()).isEqualTo("another-error");
 	}
 
 	@Test
@@ -261,7 +260,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, oddException);
-		assertEquals("another-error", mav.getViewName());
+		assertThat(mav.getViewName()).isEqualTo("another-error");
 	}
 
 	@Test
@@ -274,7 +273,7 @@ public class SimpleMappingExceptionResolverTests {
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, oddException);
-		assertEquals("another-some-error", mav.getViewName());
+		assertThat(mav.getViewName()).isEqualTo("another-some-error");
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java

@@ -34,10 +34,6 @@ import org.springframework.web.util.WebUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Rod Johnson
@@ -87,8 +83,8 @@ public class SimpleUrlHandlerMappingTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo%0a%0dbar/baz");
 
 		HandlerExecutionChain hec = handlerMapping.getHandler(request);
-		assertNotNull(hec);
-		assertSame(controller, hec.getHandler());
+		assertThat(hec).isNotNull();
+		assertThat(hec.getHandler()).isSameAs(controller);
 	}
 
 	@SuppressWarnings("resource")
@@ -105,63 +101,63 @@ public class SimpleUrlHandlerMappingTests {
 
 		MockHttpServletRequest req = new MockHttpServletRequest("GET", "/welcome.html");
 		HandlerExecutionChain hec = getHandler(hm, req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
-		assertEquals("/welcome.html", req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE));
-		assertEquals(bean, req.getAttribute(HandlerMapping.BEST_MATCHING_HANDLER_ATTRIBUTE));
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
+		assertThat(req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("/welcome.html");
+		assertThat(req.getAttribute(HandlerMapping.BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(bean);
 
 		req = new MockHttpServletRequest("GET", "/welcome.x");
 		hec = getHandler(hm, req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == otherBean);
-		assertEquals("welcome.x", req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE));
-		assertEquals(otherBean, req.getAttribute(HandlerMapping.BEST_MATCHING_HANDLER_ATTRIBUTE));
+		assertThat(hec != null && hec.getHandler() == otherBean).as("Handler is correct bean").isTrue();
+		assertThat(req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("welcome.x");
+		assertThat(req.getAttribute(HandlerMapping.BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(otherBean);
 
 		req = new MockHttpServletRequest("GET", "/welcome/");
 		hec = getHandler(hm, req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == otherBean);
-		assertEquals("welcome", req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE));
+		assertThat(hec != null && hec.getHandler() == otherBean).as("Handler is correct bean").isTrue();
+		assertThat(req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("welcome");
 
 		req = new MockHttpServletRequest("GET", "/");
 		req.setServletPath("/welcome.html");
 		hec = getHandler(hm, req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/welcome.html");
 		req.setContextPath("/app");
 		hec = getHandler(hm, req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/show.html");
 		hec = getHandler(hm, req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/bookseats.html");
 		hec = getHandler(hm, req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/original-welcome.html");
 		req.setAttribute(WebUtils.INCLUDE_REQUEST_URI_ATTRIBUTE, "/welcome.html");
 		hec = getHandler(hm, req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/original-show.html");
 		req.setAttribute(WebUtils.INCLUDE_REQUEST_URI_ATTRIBUTE, "/show.html");
 		hec = getHandler(hm, req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/original-bookseats.html");
 		req.setAttribute(WebUtils.INCLUDE_REQUEST_URI_ATTRIBUTE, "/bookseats.html");
 		hec = getHandler(hm, req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
 
 		req = new MockHttpServletRequest("GET", "/");
 		hec = getHandler(hm, req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
-		assertEquals("/", req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE));
+		assertThat(hec != null && hec.getHandler() == bean).as("Handler is correct bean").isTrue();
+		assertThat(req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("/");
 
 		req = new MockHttpServletRequest("GET", "/somePath");
 		hec = getHandler(hm, req);
-		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == defaultBean);
-		assertEquals("/somePath", req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE));
+		assertThat(hec != null && hec.getHandler() == defaultBean).as("Handler is correct bean").isTrue();
+		assertThat(req.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("/somePath");
 	}
 
 	private HandlerExecutionChain getHandler(HandlerMapping hm, MockHttpServletRequest req) throws Exception {

spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolverTests.java

@@ -34,7 +34,7 @@ import static java.util.Locale.JAPANESE;
 import static java.util.Locale.KOREA;
 import static java.util.Locale.UK;
 import static java.util.Locale.US;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Unit tests for {@link AcceptHeaderLocaleResolver}.
@@ -49,38 +49,38 @@ public class AcceptHeaderLocaleResolverTests {
 
 	@Test
 	public void resolve() {
-		assertEquals(CANADA, this.resolver.resolveLocale(request(CANADA)));
-		assertEquals(US, this.resolver.resolveLocale(request(US, CANADA)));
+		assertThat(this.resolver.resolveLocale(request(CANADA))).isEqualTo(CANADA);
+		assertThat(this.resolver.resolveLocale(request(US, CANADA))).isEqualTo(US);
 	}
 
 	@Test
 	public void resolvePreferredSupported() {
 		this.resolver.setSupportedLocales(Collections.singletonList(CANADA));
-		assertEquals(CANADA, this.resolver.resolveLocale(request(US, CANADA)));
+		assertThat(this.resolver.resolveLocale(request(US, CANADA))).isEqualTo(CANADA);
 	}
 
 	@Test
 	public void resolvePreferredNotSupported() {
 		this.resolver.setSupportedLocales(Collections.singletonList(CANADA));
-		assertEquals(US, this.resolver.resolveLocale(request(US, UK)));
+		assertThat(this.resolver.resolveLocale(request(US, UK))).isEqualTo(US);
 	}
 
 	@Test
 	public void resolvePreferredAgainstLanguageOnly() {
 		this.resolver.setSupportedLocales(Collections.singletonList(ENGLISH));
-		assertEquals(ENGLISH, this.resolver.resolveLocale(request(GERMANY, US, UK)));
+		assertThat(this.resolver.resolveLocale(request(GERMANY, US, UK))).isEqualTo(ENGLISH);
 	}
 
 	@Test
 	public void resolvePreferredAgainstCountryIfPossible() {
 		this.resolver.setSupportedLocales(Arrays.asList(ENGLISH, UK));
-		assertEquals(UK, this.resolver.resolveLocale(request(GERMANY, US, UK)));
+		assertThat(this.resolver.resolveLocale(request(GERMANY, US, UK))).isEqualTo(UK);
 	}
 
 	@Test
 	public void resolvePreferredAgainstLanguageWithMultipleSupportedLocales() {
 		this.resolver.setSupportedLocales(Arrays.asList(GERMAN, US));
-		assertEquals(GERMAN, this.resolver.resolveLocale(request(GERMANY, US, UK)));
+		assertThat(this.resolver.resolveLocale(request(GERMANY, US, UK))).isEqualTo(GERMAN);
 	}
 
 	@Test
@@ -91,18 +91,18 @@ public class AcceptHeaderLocaleResolverTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addHeader("Accept-Language", KOREA.toLanguageTag());
 		request.setPreferredLocales(Collections.singletonList(KOREA));
-		assertEquals(Locale.JAPAN, this.resolver.resolveLocale(request));
+		assertThat(this.resolver.resolveLocale(request)).isEqualTo(Locale.JAPAN);
 	}
 
 	@Test
 	public void defaultLocale() {
 		this.resolver.setDefaultLocale(JAPANESE);
 		MockHttpServletRequest request = new MockHttpServletRequest();
-		assertEquals(JAPANESE, this.resolver.resolveLocale(request));
+		assertThat(this.resolver.resolveLocale(request)).isEqualTo(JAPANESE);
 
 		request.addHeader("Accept-Language", US.toLanguageTag());
 		request.setPreferredLocales(Collections.singletonList(US));
-		assertEquals(US, this.resolver.resolveLocale(request));
+		assertThat(this.resolver.resolveLocale(request)).isEqualTo(US);
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java

@@ -31,12 +31,8 @@ import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.web.util.WebUtils;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Alef Arendsen
@@ -54,7 +50,7 @@ public class CookieLocaleResolverTests {
 		CookieLocaleResolver resolver = new CookieLocaleResolver();
 		resolver.setCookieName("LanguageKoekje");
 		Locale loc = resolver.resolveLocale(request);
-		assertEquals("nl", loc.getLanguage());
+		assertThat(loc.getLanguage()).isEqualTo("nl");
 	}
 
 	@Test
@@ -66,9 +62,10 @@ public class CookieLocaleResolverTests {
 		CookieLocaleResolver resolver = new CookieLocaleResolver();
 		resolver.setCookieName("LanguageKoekje");
 		LocaleContext loc = resolver.resolveLocaleContext(request);
-		assertEquals("nl", loc.getLocale().getLanguage());
-		assertTrue(loc instanceof TimeZoneAwareLocaleContext);
-		assertNull(((TimeZoneAwareLocaleContext) loc).getTimeZone());
+		assertThat(loc.getLocale().getLanguage()).isEqualTo("nl");
+		boolean condition = loc instanceof TimeZoneAwareLocaleContext;
+		assertThat(condition).isTrue();
+		assertThat(((TimeZoneAwareLocaleContext) loc).getTimeZone()).isNull();
 	}
 
 	@Test
@@ -80,9 +77,10 @@ public class CookieLocaleResolverTests {
 		CookieLocaleResolver resolver = new CookieLocaleResolver();
 		resolver.setCookieName("LanguageKoekje");
 		LocaleContext loc = resolver.resolveLocaleContext(request);
-		assertEquals("nl", loc.getLocale().getLanguage());
-		assertTrue(loc instanceof TimeZoneAwareLocaleContext);
-		assertEquals(TimeZone.getTimeZone("GMT+1"), ((TimeZoneAwareLocaleContext) loc).getTimeZone());
+		assertThat(loc.getLocale().getLanguage()).isEqualTo("nl");
+		boolean condition = loc instanceof TimeZoneAwareLocaleContext;
+		assertThat(condition).isTrue();
+		assertThat(((TimeZoneAwareLocaleContext) loc).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1"));
 	}
 
 	@Test
@@ -111,9 +109,10 @@ public class CookieLocaleResolverTests {
 		resolver.setDefaultTimeZone(TimeZone.getTimeZone("GMT+2"));
 		resolver.setCookieName("LanguageKoekje");
 		LocaleContext loc = resolver.resolveLocaleContext(request);
-		assertEquals(Locale.GERMAN, loc.getLocale());
-		assertTrue(loc instanceof TimeZoneAwareLocaleContext);
-		assertEquals(TimeZone.getTimeZone("GMT+2"), ((TimeZoneAwareLocaleContext) loc).getTimeZone());
+		assertThat(loc.getLocale()).isEqualTo(Locale.GERMAN);
+		boolean condition = loc instanceof TimeZoneAwareLocaleContext;
+		assertThat(condition).isTrue();
+		assertThat(((TimeZoneAwareLocaleContext) loc).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2"));
 	}
 
 	@Test
@@ -141,9 +140,10 @@ public class CookieLocaleResolverTests {
 		resolver.setDefaultTimeZone(TimeZone.getTimeZone("GMT+2"));
 		resolver.setCookieName("LanguageKoekje");
 		LocaleContext loc = resolver.resolveLocaleContext(request);
-		assertEquals("nl", loc.getLocale().getLanguage());
-		assertTrue(loc instanceof TimeZoneAwareLocaleContext);
-		assertEquals(TimeZone.getTimeZone("GMT+2"), ((TimeZoneAwareLocaleContext) loc).getTimeZone());
+		assertThat(loc.getLocale().getLanguage()).isEqualTo("nl");
+		boolean condition = loc instanceof TimeZoneAwareLocaleContext;
+		assertThat(condition).isTrue();
+		assertThat(((TimeZoneAwareLocaleContext) loc).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2"));
 	}
 
 	@Test
@@ -155,18 +155,18 @@ public class CookieLocaleResolverTests {
 		resolver.setLocale(request, response, new Locale("nl", ""));
 
 		Cookie cookie = response.getCookie(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
-		assertNotNull(cookie);
-		assertEquals(CookieLocaleResolver.DEFAULT_COOKIE_NAME, cookie.getName());
-		assertEquals(null, cookie.getDomain());
-		assertEquals(CookieLocaleResolver.DEFAULT_COOKIE_PATH, cookie.getPath());
-		assertFalse(cookie.getSecure());
+		assertThat(cookie).isNotNull();
+		assertThat(cookie.getName()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
+		assertThat(cookie.getDomain()).isEqualTo(null);
+		assertThat(cookie.getPath()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_PATH);
+		assertThat(cookie.getSecure()).isFalse();
 
 		request = new MockHttpServletRequest();
 		request.setCookies(cookie);
 
 		resolver = new CookieLocaleResolver();
 		Locale loc = resolver.resolveLocale(request);
-		assertEquals("nl", loc.getLanguage());
+		assertThat(loc.getLanguage()).isEqualTo("nl");
 	}
 
 	@Test
@@ -183,9 +183,10 @@ public class CookieLocaleResolverTests {
 
 		resolver = new CookieLocaleResolver();
 		LocaleContext loc = resolver.resolveLocaleContext(request);
-		assertEquals("nl", loc.getLocale().getLanguage());
-		assertTrue(loc instanceof TimeZoneAwareLocaleContext);
-		assertNull(((TimeZoneAwareLocaleContext) loc).getTimeZone());
+		assertThat(loc.getLocale().getLanguage()).isEqualTo("nl");
+		boolean condition = loc instanceof TimeZoneAwareLocaleContext;
+		assertThat(condition).isTrue();
+		assertThat(((TimeZoneAwareLocaleContext) loc).getTimeZone()).isNull();
 	}
 
 	@Test
@@ -203,9 +204,10 @@ public class CookieLocaleResolverTests {
 
 		resolver = new CookieLocaleResolver();
 		LocaleContext loc = resolver.resolveLocaleContext(request);
-		assertEquals("nl", loc.getLocale().getLanguage());
-		assertTrue(loc instanceof TimeZoneAwareLocaleContext);
-		assertEquals(TimeZone.getTimeZone("GMT+1"), ((TimeZoneAwareLocaleContext) loc).getTimeZone());
+		assertThat(loc.getLocale().getLanguage()).isEqualTo("nl");
+		boolean condition = loc instanceof TimeZoneAwareLocaleContext;
+		assertThat(condition).isTrue();
+		assertThat(((TimeZoneAwareLocaleContext) loc).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1"));
 	}
 
 	@Test
@@ -224,9 +226,10 @@ public class CookieLocaleResolverTests {
 
 		resolver = new CookieLocaleResolver();
 		LocaleContext loc = resolver.resolveLocaleContext(request);
-		assertEquals(Locale.GERMANY, loc.getLocale());
-		assertTrue(loc instanceof TimeZoneAwareLocaleContext);
-		assertEquals(TimeZone.getTimeZone("GMT+1"), ((TimeZoneAwareLocaleContext) loc).getTimeZone());
+		assertThat(loc.getLocale()).isEqualTo(Locale.GERMANY);
+		boolean condition = loc instanceof TimeZoneAwareLocaleContext;
+		assertThat(condition).isTrue();
+		assertThat(((TimeZoneAwareLocaleContext) loc).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1"));
 	}
 
 	@Test
@@ -238,20 +241,20 @@ public class CookieLocaleResolverTests {
 		resolver.setLocale(request, response, new Locale("de", "AT"));
 
 		Cookie cookie = response.getCookie(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
-		assertNotNull(cookie);
-		assertEquals(CookieLocaleResolver.DEFAULT_COOKIE_NAME, cookie.getName());
-		assertEquals(null, cookie.getDomain());
-		assertEquals(CookieLocaleResolver.DEFAULT_COOKIE_PATH, cookie.getPath());
-		assertFalse(cookie.getSecure());
-		assertEquals("de-AT", cookie.getValue());
+		assertThat(cookie).isNotNull();
+		assertThat(cookie.getName()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
+		assertThat(cookie.getDomain()).isEqualTo(null);
+		assertThat(cookie.getPath()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_PATH);
+		assertThat(cookie.getSecure()).isFalse();
+		assertThat(cookie.getValue()).isEqualTo("de-AT");
 
 		request = new MockHttpServletRequest();
 		request.setCookies(cookie);
 
 		resolver = new CookieLocaleResolver();
 		Locale loc = resolver.resolveLocale(request);
-		assertEquals("de", loc.getLanguage());
-		assertEquals("AT", loc.getCountry());
+		assertThat(loc.getLanguage()).isEqualTo("de");
+		assertThat(loc.getCountry()).isEqualTo("AT");
 	}
 
 	@Test
@@ -264,20 +267,20 @@ public class CookieLocaleResolverTests {
 		resolver.setLocale(request, response, new Locale("de", "AT"));
 
 		Cookie cookie = response.getCookie(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
-		assertNotNull(cookie);
-		assertEquals(CookieLocaleResolver.DEFAULT_COOKIE_NAME, cookie.getName());
-		assertEquals(null, cookie.getDomain());
-		assertEquals(CookieLocaleResolver.DEFAULT_COOKIE_PATH, cookie.getPath());
-		assertFalse(cookie.getSecure());
-		assertEquals("de_AT", cookie.getValue());
+		assertThat(cookie).isNotNull();
+		assertThat(cookie.getName()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
+		assertThat(cookie.getDomain()).isEqualTo(null);
+		assertThat(cookie.getPath()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_PATH);
+		assertThat(cookie.getSecure()).isFalse();
+		assertThat(cookie.getValue()).isEqualTo("de_AT");
 
 		request = new MockHttpServletRequest();
 		request.setCookies(cookie);
 
 		resolver = new CookieLocaleResolver();
 		Locale loc = resolver.resolveLocale(request);
-		assertEquals("de", loc.getLanguage());
-		assertEquals("AT", loc.getCountry());
+		assertThat(loc.getLanguage()).isEqualTo("de");
+		assertThat(loc.getCountry()).isEqualTo("AT");
 	}
 
 	@Test
@@ -294,12 +297,12 @@ public class CookieLocaleResolverTests {
 		resolver.setLocale(request, response, new Locale("nl", ""));
 
 		Cookie cookie = response.getCookie("LanguageKoek");
-		assertNotNull(cookie);
-		assertEquals("LanguageKoek", cookie.getName());
-		assertEquals(".springframework.org", cookie.getDomain());
-		assertEquals("/mypath", cookie.getPath());
-		assertEquals(10000, cookie.getMaxAge());
-		assertTrue(cookie.getSecure());
+		assertThat(cookie).isNotNull();
+		assertThat(cookie.getName()).isEqualTo("LanguageKoek");
+		assertThat(cookie.getDomain()).isEqualTo(".springframework.org");
+		assertThat(cookie.getPath()).isEqualTo("/mypath");
+		assertThat(cookie.getMaxAge()).isEqualTo(10000);
+		assertThat(cookie.getSecure()).isTrue();
 
 		request = new MockHttpServletRequest();
 		request.setCookies(cookie);
@@ -307,7 +310,7 @@ public class CookieLocaleResolverTests {
 		resolver = new CookieLocaleResolver();
 		resolver.setCookieName("LanguageKoek");
 		Locale loc = resolver.resolveLocale(request);
-		assertEquals("nl", loc.getLanguage());
+		assertThat(loc.getLanguage()).isEqualTo("nl");
 	}
 
 	@Test
@@ -318,7 +321,7 @@ public class CookieLocaleResolverTests {
 		CookieLocaleResolver resolver = new CookieLocaleResolver();
 
 		Locale loc = resolver.resolveLocale(request);
-		assertEquals(request.getLocale(), loc);
+		assertThat(loc).isEqualTo(request.getLocale());
 	}
 
 	@Test
@@ -329,9 +332,10 @@ public class CookieLocaleResolverTests {
 		CookieLocaleResolver resolver = new CookieLocaleResolver();
 
 		LocaleContext loc = resolver.resolveLocaleContext(request);
-		assertEquals(request.getLocale(), loc.getLocale());
-		assertTrue(loc instanceof TimeZoneAwareLocaleContext);
-		assertNull(((TimeZoneAwareLocaleContext) loc).getTimeZone());
+		assertThat(loc.getLocale()).isEqualTo(request.getLocale());
+		boolean condition = loc instanceof TimeZoneAwareLocaleContext;
+		assertThat(condition).isTrue();
+		assertThat(((TimeZoneAwareLocaleContext) loc).getTimeZone()).isNull();
 	}
 
 	@Test
@@ -343,7 +347,7 @@ public class CookieLocaleResolverTests {
 		resolver.setDefaultLocale(Locale.GERMAN);
 
 		Locale loc = resolver.resolveLocale(request);
-		assertEquals(Locale.GERMAN, loc);
+		assertThat(loc).isEqualTo(Locale.GERMAN);
 	}
 
 	@Test
@@ -356,9 +360,10 @@ public class CookieLocaleResolverTests {
 		resolver.setDefaultTimeZone(TimeZone.getTimeZone("GMT+1"));
 
 		LocaleContext loc = resolver.resolveLocaleContext(request);
-		assertEquals(Locale.GERMAN, loc.getLocale());
-		assertTrue(loc instanceof TimeZoneAwareLocaleContext);
-		assertEquals(TimeZone.getTimeZone("GMT+1"), ((TimeZoneAwareLocaleContext) loc).getTimeZone());
+		assertThat(loc.getLocale()).isEqualTo(Locale.GERMAN);
+		boolean condition = loc instanceof TimeZoneAwareLocaleContext;
+		assertThat(condition).isTrue();
+		assertThat(((TimeZoneAwareLocaleContext) loc).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1"));
 	}
 
 	@Test
@@ -371,7 +376,7 @@ public class CookieLocaleResolverTests {
 		CookieLocaleResolver resolver = new CookieLocaleResolver();
 
 		Locale loc = resolver.resolveLocale(request);
-		assertEquals(request.getLocale(), loc);
+		assertThat(loc).isEqualTo(request.getLocale());
 	}
 
 	@Test
@@ -384,9 +389,10 @@ public class CookieLocaleResolverTests {
 		CookieLocaleResolver resolver = new CookieLocaleResolver();
 
 		LocaleContext loc = resolver.resolveLocaleContext(request);
-		assertEquals(request.getLocale(), loc.getLocale());
-		assertTrue(loc instanceof TimeZoneAwareLocaleContext);
-		assertNull(((TimeZoneAwareLocaleContext) loc).getTimeZone());
+		assertThat(loc.getLocale()).isEqualTo(request.getLocale());
+		boolean condition = loc instanceof TimeZoneAwareLocaleContext;
+		assertThat(condition).isTrue();
+		assertThat(((TimeZoneAwareLocaleContext) loc).getTimeZone()).isNull();
 	}
 
 	@Test
@@ -400,13 +406,13 @@ public class CookieLocaleResolverTests {
 		CookieLocaleResolver resolver = new CookieLocaleResolver();
 		resolver.setLocale(request, response, null);
 		Locale locale = (Locale) request.getAttribute(CookieLocaleResolver.LOCALE_REQUEST_ATTRIBUTE_NAME);
-		assertEquals(Locale.TAIWAN, locale);
+		assertThat(locale).isEqualTo(Locale.TAIWAN);
 
 		Cookie[] cookies = response.getCookies();
-		assertEquals(1, cookies.length);
+		assertThat(cookies.length).isEqualTo(1);
 		Cookie localeCookie = cookies[0];
-		assertEquals(CookieLocaleResolver.DEFAULT_COOKIE_NAME, localeCookie.getName());
-		assertEquals("", localeCookie.getValue());
+		assertThat(localeCookie.getName()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
+		assertThat(localeCookie.getValue()).isEqualTo("");
 	}
 
 	@Test
@@ -420,15 +426,15 @@ public class CookieLocaleResolverTests {
 		CookieLocaleResolver resolver = new CookieLocaleResolver();
 		resolver.setLocaleContext(request, response, null);
 		Locale locale = (Locale) request.getAttribute(CookieLocaleResolver.LOCALE_REQUEST_ATTRIBUTE_NAME);
-		assertEquals(Locale.TAIWAN, locale);
+		assertThat(locale).isEqualTo(Locale.TAIWAN);
 		TimeZone timeZone = (TimeZone) request.getAttribute(CookieLocaleResolver.TIME_ZONE_REQUEST_ATTRIBUTE_NAME);
-		assertNull(timeZone);
+		assertThat(timeZone).isNull();
 
 		Cookie[] cookies = response.getCookies();
-		assertEquals(1, cookies.length);
+		assertThat(cookies.length).isEqualTo(1);
 		Cookie localeCookie = cookies[0];
-		assertEquals(CookieLocaleResolver.DEFAULT_COOKIE_NAME, localeCookie.getName());
-		assertEquals("", localeCookie.getValue());
+		assertThat(localeCookie.getName()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
+		assertThat(localeCookie.getValue()).isEqualTo("");
 	}
 
 	@Test
@@ -443,13 +449,13 @@ public class CookieLocaleResolverTests {
 		resolver.setDefaultLocale(Locale.CANADA_FRENCH);
 		resolver.setLocale(request, response, null);
 		Locale locale = (Locale) request.getAttribute(CookieLocaleResolver.LOCALE_REQUEST_ATTRIBUTE_NAME);
-		assertEquals(Locale.CANADA_FRENCH, locale);
+		assertThat(locale).isEqualTo(Locale.CANADA_FRENCH);
 
 		Cookie[] cookies = response.getCookies();
-		assertEquals(1, cookies.length);
+		assertThat(cookies.length).isEqualTo(1);
 		Cookie localeCookie = cookies[0];
-		assertEquals(CookieLocaleResolver.DEFAULT_COOKIE_NAME, localeCookie.getName());
-		assertEquals("", localeCookie.getValue());
+		assertThat(localeCookie.getName()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
+		assertThat(localeCookie.getValue()).isEqualTo("");
 	}
 
 	@Test
@@ -465,15 +471,15 @@ public class CookieLocaleResolverTests {
 		resolver.setDefaultTimeZone(TimeZone.getTimeZone("GMT+1"));
 		resolver.setLocaleContext(request, response, null);
 		Locale locale = (Locale) request.getAttribute(CookieLocaleResolver.LOCALE_REQUEST_ATTRIBUTE_NAME);
-		assertEquals(Locale.CANADA_FRENCH, locale);
+		assertThat(locale).isEqualTo(Locale.CANADA_FRENCH);
 		TimeZone timeZone = (TimeZone) request.getAttribute(CookieLocaleResolver.TIME_ZONE_REQUEST_ATTRIBUTE_NAME);
-		assertEquals(TimeZone.getTimeZone("GMT+1"), timeZone);
+		assertThat(timeZone).isEqualTo(TimeZone.getTimeZone("GMT+1"));
 
 		Cookie[] cookies = response.getCookies();
-		assertEquals(1, cookies.length);
+		assertThat(cookies.length).isEqualTo(1);
 		Cookie localeCookie = cookies[0];
-		assertEquals(CookieLocaleResolver.DEFAULT_COOKIE_NAME, localeCookie.getName());
-		assertEquals("", localeCookie.getValue());
+		assertThat(localeCookie.getName()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
+		assertThat(localeCookie.getValue()).isEqualTo("");
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java

@@ -32,10 +32,7 @@ import org.springframework.web.servlet.LocaleContextResolver;
 import org.springframework.web.servlet.LocaleResolver;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.fail;
 
 /**
  * @author Juergen Hoeller
@@ -72,14 +69,14 @@ public class LocaleResolverTests {
 
 		// check original locale
 		Locale locale = localeResolver.resolveLocale(request);
-		assertEquals(Locale.UK, locale);
+		assertThat(locale).isEqualTo(Locale.UK);
 		// set new locale
 		try {
 			localeResolver.setLocale(request, response, Locale.GERMANY);
 			assertThat(shouldSet).as("should not be able to set Locale").isTrue();
 			// check new locale
 			locale = localeResolver.resolveLocale(request);
-			assertEquals(Locale.GERMANY, locale);
+			assertThat(locale).isEqualTo(Locale.GERMANY);
 		}
 		catch (UnsupportedOperationException ex) {
 			assertThat(shouldSet).as("should be able to set Locale").isFalse();
@@ -90,17 +87,18 @@ public class LocaleResolverTests {
 			LocaleContextResolver localeContextResolver = (LocaleContextResolver) localeResolver;
 			LocaleContext localeContext = localeContextResolver.resolveLocaleContext(request);
 			if (shouldSet) {
-				assertEquals(Locale.GERMANY, localeContext.getLocale());
+				assertThat(localeContext.getLocale()).isEqualTo(Locale.GERMANY);
 			}
 			else {
-				assertEquals(Locale.UK, localeContext.getLocale());
+				assertThat(localeContext.getLocale()).isEqualTo(Locale.UK);
 			}
-			assertTrue(localeContext instanceof TimeZoneAwareLocaleContext);
-			assertNull(((TimeZoneAwareLocaleContext) localeContext).getTimeZone());
+			boolean condition2 = localeContext instanceof TimeZoneAwareLocaleContext;
+			assertThat(condition2).isTrue();
+			assertThat(((TimeZoneAwareLocaleContext) localeContext).getTimeZone()).isNull();
 
 			if (localeContextResolver instanceof AbstractLocaleContextResolver) {
 				((AbstractLocaleContextResolver) localeContextResolver).setDefaultTimeZone(TimeZone.getTimeZone("GMT+1"));
-				assertEquals(((TimeZoneAwareLocaleContext) localeContext).getTimeZone(), TimeZone.getTimeZone("GMT+1"));
+				assertThat(TimeZone.getTimeZone("GMT+1")).isEqualTo(((TimeZoneAwareLocaleContext) localeContext).getTimeZone());
 			}
 
 			try {
@@ -109,31 +107,33 @@ public class LocaleResolverTests {
 					fail("should not be able to set Locale");
 				}
 				localeContext = localeContextResolver.resolveLocaleContext(request);
-				assertEquals(Locale.US, localeContext.getLocale());
+				assertThat(localeContext.getLocale()).isEqualTo(Locale.US);
 				if (localeContextResolver instanceof AbstractLocaleContextResolver) {
-					assertEquals(((TimeZoneAwareLocaleContext) localeContext).getTimeZone(), TimeZone.getTimeZone("GMT+1"));
+					assertThat(TimeZone.getTimeZone("GMT+1")).isEqualTo(((TimeZoneAwareLocaleContext) localeContext).getTimeZone());
 				}
 				else {
-					assertNull(((TimeZoneAwareLocaleContext) localeContext).getTimeZone());
+					assertThat(((TimeZoneAwareLocaleContext) localeContext).getTimeZone()).isNull();
 				}
 
 				localeContextResolver.setLocaleContext(request, response,
 						new SimpleTimeZoneAwareLocaleContext(Locale.GERMANY, TimeZone.getTimeZone("GMT+2")));
 				localeContext = localeContextResolver.resolveLocaleContext(request);
-				assertEquals(Locale.GERMANY, localeContext.getLocale());
-				assertTrue(localeContext instanceof TimeZoneAwareLocaleContext);
-				assertEquals(((TimeZoneAwareLocaleContext) localeContext).getTimeZone(), TimeZone.getTimeZone("GMT+2"));
+				assertThat(localeContext.getLocale()).isEqualTo(Locale.GERMANY);
+				boolean condition1 = localeContext instanceof TimeZoneAwareLocaleContext;
+				assertThat(condition1).isTrue();
+				assertThat(TimeZone.getTimeZone("GMT+2")).isEqualTo(((TimeZoneAwareLocaleContext) localeContext).getTimeZone());
 
 				localeContextResolver.setLocaleContext(request, response,
 						new SimpleTimeZoneAwareLocaleContext(null, TimeZone.getTimeZone("GMT+3")));
 				localeContext = localeContextResolver.resolveLocaleContext(request);
-				assertEquals(Locale.UK, localeContext.getLocale());
-				assertTrue(localeContext instanceof TimeZoneAwareLocaleContext);
-				assertEquals(((TimeZoneAwareLocaleContext) localeContext).getTimeZone(), TimeZone.getTimeZone("GMT+3"));
+				assertThat(localeContext.getLocale()).isEqualTo(Locale.UK);
+				boolean condition = localeContext instanceof TimeZoneAwareLocaleContext;
+				assertThat(condition).isTrue();
+				assertThat(TimeZone.getTimeZone("GMT+3")).isEqualTo(((TimeZoneAwareLocaleContext) localeContext).getTimeZone());
 
 				if (localeContextResolver instanceof AbstractLocaleContextResolver) {
 					((AbstractLocaleContextResolver) localeContextResolver).setDefaultLocale(Locale.GERMANY);
-					assertEquals(Locale.GERMANY, localeContext.getLocale());
+					assertThat(localeContext.getLocale()).isEqualTo(Locale.GERMANY);
 				}
 			}
 			catch (UnsupportedOperationException ex) {

spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/SessionLocaleResolverTests.java

@@ -24,8 +24,7 @@ import org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Juergen Hoeller
@@ -38,7 +37,7 @@ public class SessionLocaleResolverTests {
 		request.getSession().setAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME, Locale.GERMAN);
 
 		SessionLocaleResolver resolver = new SessionLocaleResolver();
-		assertEquals(Locale.GERMAN, resolver.resolveLocale(request));
+		assertThat(resolver.resolveLocale(request)).isEqualTo(Locale.GERMAN);
 	}
 
 	@Test
@@ -48,14 +47,14 @@ public class SessionLocaleResolverTests {
 
 		SessionLocaleResolver resolver = new SessionLocaleResolver();
 		resolver.setLocale(request, response, Locale.GERMAN);
-		assertEquals(Locale.GERMAN, resolver.resolveLocale(request));
+		assertThat(resolver.resolveLocale(request)).isEqualTo(Locale.GERMAN);
 
 		HttpSession session = request.getSession();
 		request = new MockHttpServletRequest();
 		request.setSession(session);
 		resolver = new SessionLocaleResolver();
 
-		assertEquals(Locale.GERMAN, resolver.resolveLocale(request));
+		assertThat(resolver.resolveLocale(request)).isEqualTo(Locale.GERMAN);
 	}
 
 	@Test
@@ -65,7 +64,7 @@ public class SessionLocaleResolverTests {
 
 		SessionLocaleResolver resolver = new SessionLocaleResolver();
 
-		assertEquals(request.getLocale(), resolver.resolveLocale(request));
+		assertThat(resolver.resolveLocale(request)).isEqualTo(request.getLocale());
 	}
 
 	@Test
@@ -76,7 +75,7 @@ public class SessionLocaleResolverTests {
 		SessionLocaleResolver resolver = new SessionLocaleResolver();
 		resolver.setDefaultLocale(Locale.GERMAN);
 
-		assertEquals(Locale.GERMAN, resolver.resolveLocale(request));
+		assertThat(resolver.resolveLocale(request)).isEqualTo(Locale.GERMAN);
 	}
 
 	@Test
@@ -89,14 +88,14 @@ public class SessionLocaleResolverTests {
 		SessionLocaleResolver resolver = new SessionLocaleResolver();
 		resolver.setLocale(request, response, null);
 		Locale locale = (Locale) request.getSession().getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
-		assertNull(locale);
+		assertThat(locale).isNull();
 
 		HttpSession session = request.getSession();
 		request = new MockHttpServletRequest();
 		request.addPreferredLocale(Locale.TAIWAN);
 		request.setSession(session);
 		resolver = new SessionLocaleResolver();
-		assertEquals(Locale.TAIWAN, resolver.resolveLocale(request));
+		assertThat(resolver.resolveLocale(request)).isEqualTo(Locale.TAIWAN);
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java

@@ -34,11 +34,7 @@ import org.springframework.web.context.support.StaticWebApplicationContext;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.util.WebUtils;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -56,9 +52,9 @@ public class ControllerTests {
 		pvc.setViewName(viewName);
 		// We don't care about the params.
 		ModelAndView mv = pvc.handleRequest(new MockHttpServletRequest("GET", "foo.html"), new MockHttpServletResponse());
-		assertTrue("model has no data", mv.getModel().size() == 0);
-		assertTrue("model has correct viewname", mv.getViewName().equals(viewName));
-		assertTrue("getViewName matches", pvc.getViewName().equals(viewName));
+		assertThat(mv.getModel().size() == 0).as("model has no data").isTrue();
+		assertThat(mv.getViewName().equals(viewName)).as("model has correct viewname").isTrue();
+		assertThat(pvc.getViewName().equals(viewName)).as("getViewName matches").isTrue();
 	}
 
 	@Test
@@ -102,7 +98,7 @@ public class ControllerTests {
 		StaticWebApplicationContext sac = new StaticWebApplicationContext();
 		sac.setServletContext(context);
 		sfc.setApplicationContext(sac);
-		assertNull(sfc.handleRequest(request, response));
+		assertThat(sfc.handleRequest(request, response)).isNull();
 
 		if (include) {
 			verify(dispatcher).include(request, response);
@@ -125,19 +121,19 @@ public class ControllerTests {
 		swc.setInitParameters(props);
 
 		swc.afterPropertiesSet();
-		assertNotNull(TestServlet.config);
-		assertEquals("action", TestServlet.config.getServletName());
-		assertEquals("myValue", TestServlet.config.getInitParameter("config"));
-		assertNull(TestServlet.request);
-		assertFalse(TestServlet.destroyed);
+		assertThat(TestServlet.config).isNotNull();
+		assertThat(TestServlet.config.getServletName()).isEqualTo("action");
+		assertThat(TestServlet.config.getInitParameter("config")).isEqualTo("myValue");
+		assertThat(TestServlet.request).isNull();
+		assertThat(TestServlet.destroyed).isFalse();
 
-		assertNull(swc.handleRequest(request, response));
-		assertEquals(request, TestServlet.request);
-		assertEquals(response, TestServlet.response);
-		assertFalse(TestServlet.destroyed);
+		assertThat(swc.handleRequest(request, response)).isNull();
+		assertThat(TestServlet.request).isEqualTo(request);
+		assertThat(TestServlet.response).isEqualTo(response);
+		assertThat(TestServlet.destroyed).isFalse();
 
 		swc.destroy();
-		assertTrue(TestServlet.destroyed);
+		assertThat(TestServlet.destroyed).isTrue();
 	}
 
 	@Test
@@ -150,18 +146,18 @@ public class ControllerTests {
 		swc.setBeanName("action");
 
 		swc.afterPropertiesSet();
-		assertNotNull(TestServlet.config);
-		assertEquals("action", TestServlet.config.getServletName());
-		assertNull(TestServlet.request);
-		assertFalse(TestServlet.destroyed);
+		assertThat(TestServlet.config).isNotNull();
+		assertThat(TestServlet.config.getServletName()).isEqualTo("action");
+		assertThat(TestServlet.request).isNull();
+		assertThat(TestServlet.destroyed).isFalse();
 
-		assertNull(swc.handleRequest(request, response));
-		assertEquals(request, TestServlet.request);
-		assertEquals(response, TestServlet.response);
-		assertFalse(TestServlet.destroyed);
+		assertThat(swc.handleRequest(request, response)).isNull();
+		assertThat(TestServlet.request).isEqualTo(request);
+		assertThat(TestServlet.response).isEqualTo(response);
+		assertThat(TestServlet.destroyed).isFalse();
 
 		swc.destroy();
-		assertTrue(TestServlet.destroyed);
+		assertThat(TestServlet.destroyed).isTrue();
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java

@@ -26,9 +26,7 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.ModelAndView;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture with a ParameterizableViewController.
@@ -53,23 +51,23 @@ public class ParameterizableViewControllerTests {
 		String viewName = "testView";
 		this.controller.setViewName(viewName);
 		ModelAndView mav = this.controller.handleRequest(this.request, new MockHttpServletResponse());
-		assertEquals(viewName, mav.getViewName());
-		assertTrue(mav.getModel().isEmpty());
+		assertThat(mav.getViewName()).isEqualTo(viewName);
+		assertThat(mav.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
 	public void handleRequestWithoutViewName() throws Exception {
 		ModelAndView mav = this.controller.handleRequest(this.request, new MockHttpServletResponse());
-		assertNull(mav.getViewName());
-		assertTrue(mav.getModel().isEmpty());
+		assertThat(mav.getViewName()).isNull();
+		assertThat(mav.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
 	public void handleRequestWithFlashAttributes() throws Exception {
 		this.request.setAttribute(DispatcherServlet.INPUT_FLASH_MAP_ATTRIBUTE, new ModelMap("name", "value"));
 		ModelAndView mav = this.controller.handleRequest(this.request, new MockHttpServletResponse());
-		assertEquals(1, mav.getModel().size());
-		assertEquals("value", mav.getModel().get("name"));
+		assertThat(mav.getModel().size()).isEqualTo(1);
+		assertThat(mav.getModel().get("name")).isEqualTo("value");
 	}
 
 	@Test
@@ -78,8 +76,8 @@ public class ParameterizableViewControllerTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mav = this.controller.handleRequest(this.request, response);
 
-		assertNull(mav);
-		assertEquals("GET,HEAD,OPTIONS", response.getHeader("Allow"));
+		assertThat(mav).isNull();
+		assertThat(response.getHeader("Allow")).isEqualTo("GET,HEAD,OPTIONS");
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java

@@ -27,9 +27,7 @@ import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Juergen Hoeller
@@ -47,8 +45,8 @@ public class UrlFilenameViewControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/index");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = ctrl.handleRequest(request, response);
-		assertEquals("index", mv.getViewName());
-		assertTrue(mv.getModel().isEmpty());
+		assertThat(mv.getViewName()).isEqualTo("index");
+		assertThat(mv.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
@@ -57,8 +55,8 @@ public class UrlFilenameViewControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/index.html");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = ctrl.handleRequest(request, response);
-		assertEquals("index", mv.getViewName());
-		assertTrue(mv.getModel().isEmpty());
+		assertThat(mv.getViewName()).isEqualTo("index");
+		assertThat(mv.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
@@ -67,8 +65,8 @@ public class UrlFilenameViewControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/index;a=A;b=B");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = ctrl.handleRequest(request, response);
-		assertEquals("index", mv.getViewName());
-		assertTrue(mv.getModel().isEmpty());
+		assertThat(mv.getViewName()).isEqualTo("index");
+		assertThat(mv.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
@@ -79,8 +77,8 @@ public class UrlFilenameViewControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/index.html");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = ctrl.handleRequest(request, response);
-		assertEquals("mypre_index_mysuf", mv.getViewName());
-		assertTrue(mv.getModel().isEmpty());
+		assertThat(mv.getViewName()).isEqualTo("mypre_index_mysuf");
+		assertThat(mv.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
@@ -90,8 +88,8 @@ public class UrlFilenameViewControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/index.html");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = ctrl.handleRequest(request, response);
-		assertEquals("mypre_index", mv.getViewName());
-		assertTrue(mv.getModel().isEmpty());
+		assertThat(mv.getViewName()).isEqualTo("mypre_index");
+		assertThat(mv.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
@@ -101,8 +99,8 @@ public class UrlFilenameViewControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/index.html");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = ctrl.handleRequest(request, response);
-		assertEquals("index_mysuf", mv.getViewName());
-		assertTrue(mv.getModel().isEmpty());
+		assertThat(mv.getViewName()).isEqualTo("index_mysuf");
+		assertThat(mv.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
@@ -111,8 +109,8 @@ public class UrlFilenameViewControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/docs/cvs/commit.html");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = ctrl.handleRequest(request, response);
-		assertEquals("docs/cvs/commit", mv.getViewName());
-		assertTrue(mv.getModel().isEmpty());
+		assertThat(mv.getViewName()).isEqualTo("docs/cvs/commit");
+		assertThat(mv.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
@@ -122,8 +120,8 @@ public class UrlFilenameViewControllerTests {
 		exposePathInMapping(request, "/docs/**");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = ctrl.handleRequest(request, response);
-		assertEquals("cvs/commit", mv.getViewName());
-		assertTrue(mv.getModel().isEmpty());
+		assertThat(mv.getViewName()).isEqualTo("cvs/commit");
+		assertThat(mv.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
@@ -133,8 +131,8 @@ public class UrlFilenameViewControllerTests {
 		exposePathInMapping(request, "/docs/cvs/commit.html");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = ctrl.handleRequest(request, response);
-		assertEquals("docs/cvs/commit", mv.getViewName());
-		assertTrue(mv.getModel().isEmpty());
+		assertThat(mv.getViewName()).isEqualTo("docs/cvs/commit");
+		assertThat(mv.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
@@ -144,24 +142,24 @@ public class UrlFilenameViewControllerTests {
 		request.setContextPath("/myapp");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = ctrl.handleRequest(request, response);
-		assertEquals("docs/cvs/commit", mv.getViewName());
-		assertTrue(mv.getModel().isEmpty());
+		assertThat(mv.getViewName()).isEqualTo("docs/cvs/commit");
+		assertThat(mv.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
 	public void settingPrefixToNullCausesEmptyStringToBeUsed() throws Exception {
 		UrlFilenameViewController ctrl = new UrlFilenameViewController();
 		ctrl.setPrefix(null);
-		assertNotNull("For setPrefix(..) with null, the empty string must be used instead.", ctrl.getPrefix());
-		assertEquals("For setPrefix(..) with null, the empty string must be used instead.", "", ctrl.getPrefix());
+		assertThat(ctrl.getPrefix()).as("For setPrefix(..) with null, the empty string must be used instead.").isNotNull();
+		assertThat(ctrl.getPrefix()).as("For setPrefix(..) with null, the empty string must be used instead.").isEqualTo("");
 	}
 
 	@Test
 	public void settingSuffixToNullCausesEmptyStringToBeUsed() throws Exception {
 		UrlFilenameViewController ctrl = new UrlFilenameViewController();
 		ctrl.setSuffix(null);
-		assertNotNull("For setPrefix(..) with null, the empty string must be used instead.", ctrl.getSuffix());
-		assertEquals("For setPrefix(..) with null, the empty string must be used instead.", "", ctrl.getSuffix());
+		assertThat(ctrl.getSuffix()).as("For setPrefix(..) with null, the empty string must be used instead.").isNotNull();
+		assertThat(ctrl.getSuffix()).as("For setPrefix(..) with null, the empty string must be used instead.").isEqualTo("");
 	}
 
 	/**
@@ -174,8 +172,8 @@ public class UrlFilenameViewControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/products/view.html");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = ctrl.handleRequest(request, response);
-		assertEquals("products/view", mv.getViewName());
-		assertTrue(mv.getModel().isEmpty());
+		assertThat(mv.getViewName()).isEqualTo("products/view");
+		assertThat(mv.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
@@ -185,9 +183,9 @@ public class UrlFilenameViewControllerTests {
 		request.setAttribute(DispatcherServlet.INPUT_FLASH_MAP_ATTRIBUTE, new ModelMap("name", "value"));
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		ModelAndView mv = ctrl.handleRequest(request, response);
-		assertEquals("index", mv.getViewName());
-		assertEquals(1, mv.getModel().size());
-		assertEquals("value", mv.getModel().get("name"));
+		assertThat(mv.getViewName()).isEqualTo("index");
+		assertThat(mv.getModel().size()).isEqualTo(1);
+		assertThat(mv.getModel().get("name")).isEqualTo("value");
 	}
 
 	private void exposePathInMapping(MockHttpServletRequest request, String mapping) {

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CglibProxyControllerTests.java

@@ -38,7 +38,7 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Arjen Poutsma
@@ -56,7 +56,7 @@ public class CglibProxyControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/test");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		servlet.service(request, response);
-		assertEquals("doIt", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("doIt");
 	}
 
 	@Test
@@ -66,7 +66,7 @@ public class CglibProxyControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/test");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		servlet.service(request, response);
-		assertEquals("doIt", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("doIt");
 	}
 
 	@Test
@@ -76,7 +76,7 @@ public class CglibProxyControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/hotels/bookings");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		servlet.service(request, response);
-		assertEquals("doIt", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("doIt");
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyControllerTests.java

@@ -36,7 +36,7 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Arjen Poutsma
@@ -54,7 +54,7 @@ public class JdkProxyControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/test");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		servlet.service(request, response);
-		assertEquals("doIt", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("doIt");
 	}
 
 	@Test
@@ -64,7 +64,7 @@ public class JdkProxyControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/test");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		servlet.service(request, response);
-		assertEquals("doIt", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("doIt");
 	}
 
 	@Test
@@ -74,7 +74,7 @@ public class JdkProxyControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/hotels/bookings");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		servlet.service(request, response);
-		assertEquals("doIt", response.getContentAsString());
+		assertThat(response.getContentAsString()).isEqualTo("doIt");
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java

@@ -35,9 +35,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.servlet.ModelAndView;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Integration tests for {@link ResponseStatusExceptionResolver}.
@@ -93,7 +91,7 @@ public class ResponseStatusExceptionResolverTests {
 
 			StatusCodeAndReasonMessageException ex = new StatusCodeAndReasonMessageException();
 			exceptionResolver.resolveException(request, response, null, ex);
-			assertEquals("Invalid status reason", "Gone reason message", response.getErrorMessage());
+			assertThat(response.getErrorMessage()).as("Invalid status reason").isEqualTo("Gone reason message");
 		}
 		finally {
 			LocaleContextHolder.resetLocaleContext();
@@ -105,7 +103,7 @@ public class ResponseStatusExceptionResolverTests {
 		Exception ex = new Exception();
 		exceptionResolver.resolveException(request, response, null, ex);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, null, ex);
-		assertNull("ModelAndView returned", mav);
+		assertThat(mav).as("ModelAndView returned").isNull();
 	}
 
 	@Test // SPR-12903
@@ -132,10 +130,10 @@ public class ResponseStatusExceptionResolverTests {
 
 
 	private void assertResolved(ModelAndView mav, int status, String reason) {
-		assertTrue("No Empty ModelAndView returned", mav != null && mav.isEmpty());
-		assertEquals(status, response.getStatus());
-		assertEquals(reason, response.getErrorMessage());
-		assertTrue(response.isCommitted());
+		assertThat(mav != null && mav.isEmpty()).as("No Empty ModelAndView returned").isTrue();
+		assertThat(response.getStatus()).isEqualTo(status);
+		assertThat(response.getErrorMessage()).isEqualTo(reason);
+		assertThat(response.isCommitted()).isTrue();
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/CompositeRequestConditionTests.java

@@ -24,10 +24,8 @@ import org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
 
 /**
  * A test fixture for {@link CompositeRequestCondition} tests.
@@ -61,7 +59,7 @@ public class CompositeRequestConditionTests {
 		CompositeRequestCondition cond2 = new CompositeRequestCondition(this.param2, this.header2);
 		CompositeRequestCondition cond3 = new CompositeRequestCondition(this.param3, this.header3);
 
-		assertEquals(cond3, cond1.combine(cond2));
+		assertThat(cond1.combine(cond2)).isEqualTo(cond3);
 	}
 
 	@Test
@@ -69,9 +67,9 @@ public class CompositeRequestConditionTests {
 		CompositeRequestCondition empty = new CompositeRequestCondition();
 		CompositeRequestCondition notEmpty = new CompositeRequestCondition(this.param1);
 
-		assertSame(empty, empty.combine(empty));
-		assertSame(notEmpty, notEmpty.combine(empty));
-		assertSame(notEmpty, empty.combine(notEmpty));
+		assertThat(empty.combine(empty)).isSameAs(empty);
+		assertThat(notEmpty.combine(empty)).isSameAs(notEmpty);
+		assertThat(empty.combine(notEmpty)).isSameAs(notEmpty);
 	}
 
 	@Test
@@ -94,7 +92,7 @@ public class CompositeRequestConditionTests {
 		CompositeRequestCondition condition = new CompositeRequestCondition(this.param1, getPostCond);
 		CompositeRequestCondition matchingCondition = new CompositeRequestCondition(this.param1, getCond);
 
-		assertEquals(matchingCondition, condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isEqualTo(matchingCondition);
 	}
 
 	@Test
@@ -102,13 +100,13 @@ public class CompositeRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/");
 		CompositeRequestCondition cond = new CompositeRequestCondition(this.param1);
 
-		assertNull(cond.getMatchingCondition(request));
+		assertThat(cond.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
 	public void matchEmpty() {
 		CompositeRequestCondition empty = new CompositeRequestCondition();
-		assertSame(empty, empty.getMatchingCondition(new MockHttpServletRequest()));
+		assertThat(empty.getMatchingCondition(new MockHttpServletRequest())).isSameAs(empty);
 	}
 
 	@Test
@@ -118,8 +116,8 @@ public class CompositeRequestConditionTests {
 		CompositeRequestCondition cond1 = new CompositeRequestCondition(this.param1);
 		CompositeRequestCondition cond3 = new CompositeRequestCondition(this.param3);
 
-		assertEquals(1, cond1.compareTo(cond3, request));
-		assertEquals(-1, cond3.compareTo(cond1, request));
+		assertThat(cond1.compareTo(cond3, request)).isEqualTo(1);
+		assertThat(cond3.compareTo(cond1, request)).isEqualTo(-1);
 	}
 
 	@Test
@@ -129,9 +127,9 @@ public class CompositeRequestConditionTests {
 		CompositeRequestCondition empty = new CompositeRequestCondition();
 		CompositeRequestCondition notEmpty = new CompositeRequestCondition(this.param1);
 
-		assertEquals(0, empty.compareTo(empty, request));
-		assertEquals(-1, notEmpty.compareTo(empty, request));
-		assertEquals(1, empty.compareTo(notEmpty, request));
+		assertThat(empty.compareTo(empty, request)).isEqualTo(0);
+		assertThat(notEmpty.compareTo(empty, request)).isEqualTo(-1);
+		assertThat(empty.compareTo(notEmpty, request)).isEqualTo(1);
 	}
 
 	@Test

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java

@@ -26,10 +26,6 @@ import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.servlet.mvc.condition.ConsumesRequestCondition.ConsumeMediaTypeExpression;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Arjen Poutsma
@@ -43,7 +39,7 @@ public class ConsumesRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setContentType("text/plain");
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -53,13 +49,13 @@ public class ConsumesRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setContentType("text/plain");
 
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
 	public void getConsumableMediaTypesNegatedExpression() {
 		ConsumesRequestCondition condition = new ConsumesRequestCondition("!application/xml");
-		assertEquals(Collections.emptySet(), condition.getConsumableMediaTypes());
+		assertThat(condition.getConsumableMediaTypes()).isEqualTo(Collections.emptySet());
 	}
 
 	@Test
@@ -69,7 +65,7 @@ public class ConsumesRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setContentType("text/plain");
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -79,7 +75,7 @@ public class ConsumesRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setContentType("text/plain");
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -89,7 +85,7 @@ public class ConsumesRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setContentType("application/xml");
 
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
@@ -99,7 +95,7 @@ public class ConsumesRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setContentType("01");
 
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
@@ -109,7 +105,7 @@ public class ConsumesRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setContentType("01");
 
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test // gh-22010
@@ -118,19 +114,19 @@ public class ConsumesRequestConditionTests {
 		condition.setBodyRequired(false);
 
 		MockHttpServletRequest request = new MockHttpServletRequest();
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 
 		request = new MockHttpServletRequest();
 		request.addHeader(HttpHeaders.CONTENT_LENGTH, "0");
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 
 		request = new MockHttpServletRequest();
 		request.addHeader(HttpHeaders.CONTENT_LENGTH, "21");
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 
 		request = new MockHttpServletRequest();
 		request.addHeader(HttpHeaders.TRANSFER_ENCODING, "chunked");
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
@@ -141,10 +137,10 @@ public class ConsumesRequestConditionTests {
 		ConsumesRequestCondition condition2 = new ConsumesRequestCondition("text/*");
 
 		int result = condition1.compareTo(condition2, request);
-		assertTrue("Invalid comparison result: " + result, result < 0);
+		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
 
 		result = condition2.compareTo(condition1, request);
-		assertTrue("Invalid comparison result: " + result, result > 0);
+		assertThat(result > 0).as("Invalid comparison result: " + result).isTrue();
 	}
 
 	@Test
@@ -155,10 +151,10 @@ public class ConsumesRequestConditionTests {
 		ConsumesRequestCondition condition2 = new ConsumesRequestCondition("text/*", "text/plain;q=0.7");
 
 		int result = condition1.compareTo(condition2, request);
-		assertTrue("Invalid comparison result: " + result, result < 0);
+		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
 
 		result = condition2.compareTo(condition1, request);
-		assertTrue("Invalid comparison result: " + result, result > 0);
+		assertThat(result > 0).as("Invalid comparison result: " + result).isTrue();
 	}
 
 
@@ -168,7 +164,7 @@ public class ConsumesRequestConditionTests {
 		ConsumesRequestCondition condition2 = new ConsumesRequestCondition("application/xml");
 
 		ConsumesRequestCondition result = condition1.combine(condition2);
-		assertEquals(condition2, result);
+		assertThat(result).isEqualTo(condition2);
 	}
 
 	@Test
@@ -177,7 +173,7 @@ public class ConsumesRequestConditionTests {
 		ConsumesRequestCondition condition2 = new ConsumesRequestCondition();
 
 		ConsumesRequestCondition result = condition1.combine(condition2);
-		assertEquals(condition1, result);
+		assertThat(result).isEqualTo(condition1);
 	}
 
 	@Test
@@ -202,7 +198,7 @@ public class ConsumesRequestConditionTests {
 		condition = new ConsumesRequestCondition("application/xml");
 
 		result = condition.getMatchingCondition(request);
-		assertNull(result);
+		assertThat(result).isNull();
 	}
 
 	private void assertConditions(ConsumesRequestCondition condition, String... expected) {

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java

@@ -23,11 +23,7 @@ import org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition.HeaderExpression;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Arjen Poutsma
@@ -36,11 +32,11 @@ public class HeadersRequestConditionTests {
 
 	@Test
 	public void headerEquals() {
-		assertEquals(new HeadersRequestCondition("foo"), new HeadersRequestCondition("foo"));
-		assertEquals(new HeadersRequestCondition("foo"), new HeadersRequestCondition("FOO"));
-		assertNotEquals(new HeadersRequestCondition("foo"), new HeadersRequestCondition("bar"));
-		assertEquals(new HeadersRequestCondition("foo=bar"), new HeadersRequestCondition("foo=bar"));
-		assertEquals(new HeadersRequestCondition("foo=bar"), new HeadersRequestCondition("FOO=bar"));
+		assertThat(new HeadersRequestCondition("foo")).isEqualTo(new HeadersRequestCondition("foo"));
+		assertThat(new HeadersRequestCondition("FOO")).isEqualTo(new HeadersRequestCondition("foo"));
+		assertThat(new HeadersRequestCondition("bar")).isNotEqualTo(new HeadersRequestCondition("foo"));
+		assertThat(new HeadersRequestCondition("foo=bar")).isEqualTo(new HeadersRequestCondition("foo=bar"));
+		assertThat(new HeadersRequestCondition("FOO=bar")).isEqualTo(new HeadersRequestCondition("foo=bar"));
 	}
 
 	@Test
@@ -50,7 +46,7 @@ public class HeadersRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addHeader("Accept", "");
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -60,7 +56,7 @@ public class HeadersRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addHeader("bar", "");
 
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
@@ -69,7 +65,7 @@ public class HeadersRequestConditionTests {
 
 		MockHttpServletRequest request = new MockHttpServletRequest();
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -79,7 +75,7 @@ public class HeadersRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addHeader("foo", "bar");
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -89,7 +85,7 @@ public class HeadersRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addHeader("foo", "bazz");
 
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
@@ -99,7 +95,7 @@ public class HeadersRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addHeader("foo", "bar");
 
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
@@ -108,7 +104,7 @@ public class HeadersRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addHeader("foo", "baz");
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -117,7 +113,7 @@ public class HeadersRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addHeader("foo", "bar");
 
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
@@ -128,10 +124,10 @@ public class HeadersRequestConditionTests {
 		HeadersRequestCondition condition2 = new HeadersRequestCondition("foo=a", "bar");
 
 		int result = condition1.compareTo(condition2, request);
-		assertTrue("Invalid comparison result: " + result, result < 0);
+		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
 
 		result = condition2.compareTo(condition1, request);
-		assertTrue("Invalid comparison result: " + result, result > 0);
+		assertThat(result > 0).as("Invalid comparison result: " + result).isTrue();
 	}
 
 	@Test // SPR-16674
@@ -142,10 +138,10 @@ public class HeadersRequestConditionTests {
 		HeadersRequestCondition condition2 = new HeadersRequestCondition("foo");
 
 		int result = condition1.compareTo(condition2, request);
-		assertTrue("Invalid comparison result: " + result, result < 0);
+		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
 
 		result = condition2.compareTo(condition1, request);
-		assertTrue("Invalid comparison result: " + result, result > 0);
+		assertThat(result > 0).as("Invalid comparison result: " + result).isTrue();
 	}
 
 	@Test
@@ -155,8 +151,7 @@ public class HeadersRequestConditionTests {
 		HeadersRequestCondition condition1 = new HeadersRequestCondition("foo!=a");
 		HeadersRequestCondition condition2 = new HeadersRequestCondition("foo");
 
-		assertEquals("Negated match should not count as more specific",
-				0, condition1.compareTo(condition2, request));
+		assertThat(condition1.compareTo(condition2, request)).as("Negated match should not count as more specific").isEqualTo(0);
 	}
 
 	@Test
@@ -166,7 +161,7 @@ public class HeadersRequestConditionTests {
 
 		HeadersRequestCondition result = condition1.combine(condition2);
 		Collection<HeaderExpression> conditions = result.getContent();
-		assertEquals(2, conditions.size());
+		assertThat(conditions.size()).isEqualTo(2);
 	}
 
 	@Test
@@ -177,12 +172,12 @@ public class HeadersRequestConditionTests {
 		HeadersRequestCondition condition = new HeadersRequestCondition("foo");
 
 		HeadersRequestCondition result = condition.getMatchingCondition(request);
-		assertEquals(condition, result);
+		assertThat(result).isEqualTo(condition);
 
 		condition = new HeadersRequestCondition("bar");
 
 		result = condition.getMatchingCondition(request);
-		assertNull(result);
+		assertThat(result).isNull();
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java

@@ -23,11 +23,7 @@ import org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.servlet.mvc.condition.ParamsRequestCondition.ParamExpression;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Unit tests for {@link ParamsRequestCondition}.
@@ -37,11 +33,11 @@ public class ParamsRequestConditionTests {
 
 	@Test
 	public void paramEquals() {
-		assertEquals(new ParamsRequestCondition("foo"), new ParamsRequestCondition("foo"));
-		assertFalse(new ParamsRequestCondition("foo").equals(new ParamsRequestCondition("bar")));
-		assertFalse(new ParamsRequestCondition("foo").equals(new ParamsRequestCondition("FOO")));
-		assertEquals(new ParamsRequestCondition("foo=bar"), new ParamsRequestCondition("foo=bar"));
-		assertFalse(new ParamsRequestCondition("foo=bar").equals(new ParamsRequestCondition("FOO=bar")));
+		assertThat(new ParamsRequestCondition("foo")).isEqualTo(new ParamsRequestCondition("foo"));
+		assertThat(new ParamsRequestCondition("foo").equals(new ParamsRequestCondition("bar"))).isFalse();
+		assertThat(new ParamsRequestCondition("foo").equals(new ParamsRequestCondition("FOO"))).isFalse();
+		assertThat(new ParamsRequestCondition("foo=bar")).isEqualTo(new ParamsRequestCondition("foo=bar"));
+		assertThat(new ParamsRequestCondition("foo=bar").equals(new ParamsRequestCondition("FOO=bar"))).isFalse();
 	}
 
 	@Test
@@ -49,7 +45,7 @@ public class ParamsRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addParameter("foo", "");
 
-		assertNotNull(new ParamsRequestCondition("foo").getMatchingCondition(request));
+		assertThat(new ParamsRequestCondition("foo").getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test // SPR-15831
@@ -57,7 +53,7 @@ public class ParamsRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addParameter("foo", (String) null);
 
-		assertNotNull(new ParamsRequestCondition("foo").getMatchingCondition(request));
+		assertThat(new ParamsRequestCondition("foo").getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -65,7 +61,7 @@ public class ParamsRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addHeader("bar", "");
 
-		assertNull(new ParamsRequestCondition("foo").getMatchingCondition(request));
+		assertThat(new ParamsRequestCondition("foo").getMatchingCondition(request)).isNull();
 	}
 
 	@Test
@@ -73,7 +69,7 @@ public class ParamsRequestConditionTests {
 		ParamsRequestCondition condition = new ParamsRequestCondition("!foo");
 		MockHttpServletRequest request = new MockHttpServletRequest();
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -81,7 +77,7 @@ public class ParamsRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addParameter("foo", "bar");
 
-		assertNotNull(new ParamsRequestCondition("foo=bar").getMatchingCondition(request));
+		assertThat(new ParamsRequestCondition("foo=bar").getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -89,7 +85,7 @@ public class ParamsRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addParameter("foo", "bazz");
 
-		assertNull(new ParamsRequestCondition("foo=bar").getMatchingCondition(request));
+		assertThat(new ParamsRequestCondition("foo=bar").getMatchingCondition(request)).isNull();
 	}
 
 	@Test
@@ -100,10 +96,10 @@ public class ParamsRequestConditionTests {
 		ParamsRequestCondition condition2 = new ParamsRequestCondition("foo=a", "bar");
 
 		int result = condition1.compareTo(condition2, request);
-		assertTrue("Invalid comparison result: " + result, result < 0);
+		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
 
 		result = condition2.compareTo(condition1, request);
-		assertTrue("Invalid comparison result: " + result, result > 0);
+		assertThat(result > 0).as("Invalid comparison result: " + result).isTrue();
 	}
 
 	@Test // SPR-16674
@@ -114,7 +110,7 @@ public class ParamsRequestConditionTests {
 		ParamsRequestCondition condition2 = new ParamsRequestCondition("response_type");
 
 		int result = condition1.compareTo(condition2, request);
-		assertTrue("Invalid comparison result: " + result, result < 0);
+		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
 	}
 
 	@Test
@@ -124,8 +120,7 @@ public class ParamsRequestConditionTests {
 		ParamsRequestCondition condition1 = new ParamsRequestCondition("response_type!=code");
 		ParamsRequestCondition condition2 = new ParamsRequestCondition("response_type");
 
-		assertEquals("Negated match should not count as more specific",
-				0, condition1.compareTo(condition2, request));
+		assertThat(condition1.compareTo(condition2, request)).as("Negated match should not count as more specific").isEqualTo(0);
 	}
 
 	@Test
@@ -135,7 +130,7 @@ public class ParamsRequestConditionTests {
 
 		ParamsRequestCondition result = condition1.combine(condition2);
 		Collection<ParamExpression> conditions = result.getContent();
-		assertEquals(2, conditions.size());
+		assertThat(conditions.size()).isEqualTo(2);
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java

@@ -24,9 +24,7 @@ import org.junit.Test;
 
 import org.springframework.mock.web.test.MockHttpServletRequest;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Rossen Stoyanchev
@@ -36,13 +34,13 @@ public class PatternsRequestConditionTests {
 	@Test
 	public void prependSlash() {
 		PatternsRequestCondition c = new PatternsRequestCondition("foo");
-		assertEquals("/foo", c.getPatterns().iterator().next());
+		assertThat(c.getPatterns().iterator().next()).isEqualTo("/foo");
 	}
 
 	@Test
 	public void prependNonEmptyPatternsOnly() {
 		PatternsRequestCondition c = new PatternsRequestCondition("");
-		assertEquals("Do not prepend empty patterns (SPR-8255)", "", c.getPatterns().iterator().next());
+		assertThat(c.getPatterns().iterator().next()).as("Do not prepend empty patterns (SPR-8255)").isEqualTo("");
 	}
 
 	@Test
@@ -50,7 +48,7 @@ public class PatternsRequestConditionTests {
 		PatternsRequestCondition c1 = new PatternsRequestCondition();
 		PatternsRequestCondition c2 = new PatternsRequestCondition();
 
-		assertEquals(new PatternsRequestCondition(""), c1.combine(c2));
+		assertThat(c1.combine(c2)).isEqualTo(new PatternsRequestCondition(""));
 	}
 
 	@Test
@@ -58,12 +56,12 @@ public class PatternsRequestConditionTests {
 		PatternsRequestCondition c1 = new PatternsRequestCondition("/type1", "/type2");
 		PatternsRequestCondition c2 = new PatternsRequestCondition();
 
-		assertEquals(new PatternsRequestCondition("/type1", "/type2"), c1.combine(c2));
+		assertThat(c1.combine(c2)).isEqualTo(new PatternsRequestCondition("/type1", "/type2"));
 
 		c1 = new PatternsRequestCondition();
 		c2 = new PatternsRequestCondition("/method1", "/method2");
 
-		assertEquals(new PatternsRequestCondition("/method1", "/method2"), c1.combine(c2));
+		assertThat(c1.combine(c2)).isEqualTo(new PatternsRequestCondition("/method1", "/method2"));
 	}
 
 	@Test
@@ -71,7 +69,7 @@ public class PatternsRequestConditionTests {
 		PatternsRequestCondition c1 = new PatternsRequestCondition("/t1", "/t2");
 		PatternsRequestCondition c2 = new PatternsRequestCondition("/m1", "/m2");
 
-		assertEquals(new PatternsRequestCondition("/t1/m1", "/t1/m2", "/t2/m1", "/t2/m2"), c1.combine(c2));
+		assertThat(c1.combine(c2)).isEqualTo(new PatternsRequestCondition("/t1/m1", "/t1/m2", "/t2/m1", "/t2/m2"));
 	}
 
 	@Test
@@ -79,7 +77,7 @@ public class PatternsRequestConditionTests {
 		PatternsRequestCondition condition = new PatternsRequestCondition("/foo");
 		PatternsRequestCondition match = condition.getMatchingCondition(new MockHttpServletRequest("GET", "/foo"));
 
-		assertNotNull(match);
+		assertThat(match).isNotNull();
 	}
 
 	@Test
@@ -87,7 +85,7 @@ public class PatternsRequestConditionTests {
 		PatternsRequestCondition condition = new PatternsRequestCondition("/foo/*");
 		PatternsRequestCondition match = condition.getMatchingCondition(new MockHttpServletRequest("GET", "/foo/bar"));
 
-		assertNotNull(match);
+		assertThat(match).isNotNull();
 	}
 
 	@Test
@@ -96,7 +94,7 @@ public class PatternsRequestConditionTests {
 		PatternsRequestCondition match = condition.getMatchingCondition(new MockHttpServletRequest("GET", "/foo/bar"));
 		PatternsRequestCondition expected = new PatternsRequestCondition("/foo/bar", "/foo/*", "/**");
 
-		assertEquals(expected, match);
+		assertThat(match).isEqualTo(expected);
 	}
 
 	@Test
@@ -106,15 +104,15 @@ public class PatternsRequestConditionTests {
 		PatternsRequestCondition condition = new PatternsRequestCondition("/{foo}");
 		PatternsRequestCondition match = condition.getMatchingCondition(request);
 
-		assertNotNull(match);
-		assertEquals("/{foo}.*", match.getPatterns().iterator().next());
+		assertThat(match).isNotNull();
+		assertThat(match.getPatterns().iterator().next()).isEqualTo("/{foo}.*");
 
 		boolean useSuffixPatternMatch = false;
 		condition = new PatternsRequestCondition(new String[] {"/{foo}"}, null, null, useSuffixPatternMatch, false);
 		match = condition.getMatchingCondition(request);
 
-		assertNotNull(match);
-		assertEquals("/{foo}", match.getPatterns().iterator().next());
+		assertThat(match).isNotNull();
+		assertThat(match.getPatterns().iterator().next()).isEqualTo("/{foo}");
 	}
 
 	@Test // SPR-8410
@@ -126,14 +124,14 @@ public class PatternsRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/jobs/my.job");
 		PatternsRequestCondition match = condition.getMatchingCondition(request);
 
-		assertNotNull(match);
-		assertEquals("/jobs/{jobName}", match.getPatterns().iterator().next());
+		assertThat(match).isNotNull();
+		assertThat(match.getPatterns().iterator().next()).isEqualTo("/jobs/{jobName}");
 
 		request = new MockHttpServletRequest("GET", "/jobs/my.job.json");
 		match = condition.getMatchingCondition(request);
 
-		assertNotNull(match);
-		assertEquals("/jobs/{jobName}.json", match.getPatterns().iterator().next());
+		assertThat(match).isNotNull();
+		assertThat(match.getPatterns().iterator().next()).isEqualTo("/jobs/{jobName}.json");
 	}
 
 	@Test
@@ -149,7 +147,7 @@ public class PatternsRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/prefix/suffix.json");
 		PatternsRequestCondition match = combined.getMatchingCondition(request);
 
-		assertNotNull(match);
+		assertThat(match).isNotNull();
 	}
 
 	@Test
@@ -159,20 +157,19 @@ public class PatternsRequestConditionTests {
 		PatternsRequestCondition condition = new PatternsRequestCondition("/foo");
 		PatternsRequestCondition match = condition.getMatchingCondition(request);
 
-		assertNotNull(match);
-		assertEquals("Should match by default", "/foo/", match.getPatterns().iterator().next());
+		assertThat(match).isNotNull();
+		assertThat(match.getPatterns().iterator().next()).as("Should match by default").isEqualTo("/foo/");
 
 		condition = new PatternsRequestCondition(new String[] {"/foo"}, null, null, false, true);
 		match = condition.getMatchingCondition(request);
 
-		assertNotNull(match);
-		assertEquals("Trailing slash should be insensitive to useSuffixPatternMatch settings (SPR-6164, SPR-5636)",
-				"/foo/", match.getPatterns().iterator().next());
+		assertThat(match).isNotNull();
+		assertThat(match.getPatterns().iterator().next()).as("Trailing slash should be insensitive to useSuffixPatternMatch settings (SPR-6164, SPR-5636)").isEqualTo("/foo/");
 
 		condition = new PatternsRequestCondition(new String[] {"/foo"}, null, null, false, false);
 		match = condition.getMatchingCondition(request);
 
-		assertNull(match);
+		assertThat(match).isNull();
 	}
 
 	@Test
@@ -180,20 +177,20 @@ public class PatternsRequestConditionTests {
 		PatternsRequestCondition condition = new PatternsRequestCondition("/foo.jpg");
 		PatternsRequestCondition match = condition.getMatchingCondition(new MockHttpServletRequest("GET", "/foo.html"));
 
-		assertNull(match);
+		assertThat(match).isNull();
 	}
 
 	@Test // gh-22543
 	public void matchWithEmptyPatterns() {
 		PatternsRequestCondition condition = new PatternsRequestCondition();
-		assertEquals(new PatternsRequestCondition(""), condition);
-		assertNotNull(condition.getMatchingCondition(new MockHttpServletRequest("GET", "")));
-		assertNull(condition.getMatchingCondition(new MockHttpServletRequest("GET", "/anything")));
+		assertThat(condition).isEqualTo(new PatternsRequestCondition(""));
+		assertThat(condition.getMatchingCondition(new MockHttpServletRequest("GET", ""))).isNotNull();
+		assertThat(condition.getMatchingCondition(new MockHttpServletRequest("GET", "/anything"))).isNull();
 
 		condition = condition.combine(new PatternsRequestCondition());
-		assertEquals(new PatternsRequestCondition(""), condition);
-		assertNotNull(condition.getMatchingCondition(new MockHttpServletRequest("GET", "")));
-		assertNull(condition.getMatchingCondition(new MockHttpServletRequest("GET", "/anything")));
+		assertThat(condition).isEqualTo(new PatternsRequestCondition(""));
+		assertThat(condition.getMatchingCondition(new MockHttpServletRequest("GET", ""))).isNotNull();
+		assertThat(condition.getMatchingCondition(new MockHttpServletRequest("GET", "/anything"))).isNull();
 	}
 
 	@Test
@@ -201,7 +198,7 @@ public class PatternsRequestConditionTests {
 		PatternsRequestCondition c1 = new PatternsRequestCondition("/foo*");
 		PatternsRequestCondition c2 = new PatternsRequestCondition("/foo*");
 
-		assertEquals(0, c1.compareTo(c2, new MockHttpServletRequest("GET", "/foo")));
+		assertThat(c1.compareTo(c2, new MockHttpServletRequest("GET", "/foo"))).isEqualTo(0);
 	}
 
 	@Test
@@ -209,7 +206,7 @@ public class PatternsRequestConditionTests {
 		PatternsRequestCondition c1 = new PatternsRequestCondition("/fo*");
 		PatternsRequestCondition c2 = new PatternsRequestCondition("/foo");
 
-		assertEquals(1, c1.compareTo(c2, new MockHttpServletRequest("GET", "/foo")));
+		assertThat(c1.compareTo(c2, new MockHttpServletRequest("GET", "/foo"))).isEqualTo(1);
 	}
 
 	@Test
@@ -222,7 +219,7 @@ public class PatternsRequestConditionTests {
 		PatternsRequestCondition match1 = c1.getMatchingCondition(request);
 		PatternsRequestCondition match2 = c2.getMatchingCondition(request);
 
-		assertEquals(1, match1.compareTo(match2, request));
+		assertThat(match1.compareTo(match2, request)).isEqualTo(1);
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java

@@ -31,10 +31,6 @@ import org.springframework.web.accept.HeaderContentNegotiationStrategy;
 import org.springframework.web.servlet.mvc.condition.ProducesRequestCondition.ProduceMediaTypeExpression;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Unit tests for {@link ProducesRequestCondition}.
@@ -49,7 +45,7 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition = new ProducesRequestCondition("text/plain");
 		HttpServletRequest request = createRequest("text/plain");
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -57,21 +53,21 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition = new ProducesRequestCondition("!text/plain");
 		HttpServletRequest request = createRequest("text/plain");
 
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
 	public void matchNegatedWithoutAcceptHeader() {
 		ProducesRequestCondition condition = new ProducesRequestCondition("!text/plain");
 
-		assertNotNull(condition.getMatchingCondition(new MockHttpServletRequest()));
-		assertEquals(Collections.emptySet(), condition.getProducibleMediaTypes());
+		assertThat(condition.getMatchingCondition(new MockHttpServletRequest())).isNotNull();
+		assertThat(condition.getProducibleMediaTypes()).isEqualTo(Collections.emptySet());
 	}
 
 	@Test
 	public void getProducibleMediaTypes() {
 		ProducesRequestCondition condition = new ProducesRequestCondition("!application/xml");
-		assertEquals(Collections.emptySet(), condition.getProducibleMediaTypes());
+		assertThat(condition.getProducibleMediaTypes()).isEqualTo(Collections.emptySet());
 	}
 
 	@Test
@@ -79,7 +75,7 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition = new ProducesRequestCondition("text/*");
 		HttpServletRequest request = createRequest("text/plain");
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -87,7 +83,7 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition = new ProducesRequestCondition("text/plain", "application/xml");
 		HttpServletRequest request = createRequest("text/plain");
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test
@@ -95,7 +91,7 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition = new ProducesRequestCondition("text/plain");
 		HttpServletRequest request = createRequest("application/xml");
 
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test // gh-21670
@@ -103,23 +99,19 @@ public class ProducesRequestConditionTests {
 		String base = "application/atom+xml";
 		ProducesRequestCondition condition = new ProducesRequestCondition(base + ";type=feed");
 		HttpServletRequest request = createRequest(base + ";type=entry");
-		assertNull("Declared parameter value must match if present in request",
-				condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).as("Declared parameter value must match if present in request").isNull();
 
 		condition = new ProducesRequestCondition(base + ";type=feed");
 		request = createRequest(base + ";type=feed");
-		assertNotNull("Declared parameter value must match if present in request",
-				condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).as("Declared parameter value must match if present in request").isNotNull();
 
 		condition = new ProducesRequestCondition(base + ";type=feed");
 		request = createRequest(base);
-		assertNotNull("Declared parameter has no impact if not present in request",
-				condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).as("Declared parameter has no impact if not present in request").isNotNull();
 
 		condition = new ProducesRequestCondition(base);
 		request = createRequest(base + ";type=feed");
-		assertNotNull("No impact from other parameters in request",
-				condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).as("No impact from other parameters in request").isNotNull();
 	}
 
 	@Test
@@ -127,7 +119,7 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition = new ProducesRequestCondition("text/plain");
 		HttpServletRequest request = createRequest("bogus");
 
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
@@ -135,7 +127,7 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition = new ProducesRequestCondition("!text/plain");
 		HttpServletRequest request = createRequest("bogus");
 
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
@@ -145,7 +137,7 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition = new ProducesRequestCondition(produces, headers);
 		HttpServletRequest request = new MockHttpServletRequest("GET", "/foo.txt");
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test // SPR-17550
@@ -154,7 +146,7 @@ public class ProducesRequestConditionTests {
 		HttpServletRequest request = createRequest(
 				"text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8");
 
-		assertNotNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNotNull();
 	}
 
 	@Test // gh-22853
@@ -172,7 +164,7 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition noneMatch = none.getMatchingCondition(request);
 		ProducesRequestCondition htmlMatch = html.getMatchingCondition(request);
 
-		assertEquals(1, noneMatch.compareTo(htmlMatch, request));
+		assertThat(noneMatch.compareTo(htmlMatch, request)).isEqualTo(1);
 	}
 
 	@Test
@@ -183,28 +175,28 @@ public class ProducesRequestConditionTests {
 
 		HttpServletRequest request = createRequest("application/xml, text/html");
 
-		assertTrue(html.compareTo(xml, request) > 0);
-		assertTrue(xml.compareTo(html, request) < 0);
-		assertTrue(xml.compareTo(none, request) < 0);
-		assertTrue(none.compareTo(xml, request) > 0);
-		assertTrue(html.compareTo(none, request) < 0);
-		assertTrue(none.compareTo(html, request) > 0);
+		assertThat(html.compareTo(xml, request) > 0).isTrue();
+		assertThat(xml.compareTo(html, request) < 0).isTrue();
+		assertThat(xml.compareTo(none, request) < 0).isTrue();
+		assertThat(none.compareTo(xml, request) > 0).isTrue();
+		assertThat(html.compareTo(none, request) < 0).isTrue();
+		assertThat(none.compareTo(html, request) > 0).isTrue();
 
 		request = createRequest("application/xml, text/*");
 
-		assertTrue(html.compareTo(xml, request) > 0);
-		assertTrue(xml.compareTo(html, request) < 0);
+		assertThat(html.compareTo(xml, request) > 0).isTrue();
+		assertThat(xml.compareTo(html, request) < 0).isTrue();
 
 		request = createRequest("application/pdf");
 
-		assertEquals(0, html.compareTo(xml, request));
-		assertEquals(0, xml.compareTo(html, request));
+		assertThat(html.compareTo(xml, request)).isEqualTo(0);
+		assertThat(xml.compareTo(html, request)).isEqualTo(0);
 
 		// See SPR-7000
 		request = createRequest("text/html;q=0.9,application/xml");
 
-		assertTrue(html.compareTo(xml, request) > 0);
-		assertTrue(xml.compareTo(html, request) < 0);
+		assertThat(html.compareTo(xml, request) > 0).isTrue();
+		assertThat(xml.compareTo(html, request) < 0).isTrue();
 	}
 
 	@Test
@@ -215,10 +207,10 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition2 = new ProducesRequestCondition("text/*");
 
 		int result = condition1.compareTo(condition2, request);
-		assertTrue("Invalid comparison result: " + result, result < 0);
+		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
 
 		result = condition2.compareTo(condition1, request);
-		assertTrue("Invalid comparison result: " + result, result > 0);
+		assertThat(result > 0).as("Invalid comparison result: " + result).isTrue();
 	}
 
 	@Test
@@ -229,10 +221,10 @@ public class ProducesRequestConditionTests {
 		HttpServletRequest request = createRequest("text/plain");
 
 		int result = condition1.compareTo(condition2, request);
-		assertTrue("Invalid comparison result: " + result, result < 0);
+		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
 
 		result = condition2.compareTo(condition1, request);
-		assertTrue("Invalid comparison result: " + result, result > 0);
+		assertThat(result > 0).as("Invalid comparison result: " + result).isTrue();
 	}
 
 	@Test
@@ -243,18 +235,18 @@ public class ProducesRequestConditionTests {
 		HttpServletRequest request = createRequest("text/plain", "application/xml");
 
 		int result = condition1.compareTo(condition2, request);
-		assertTrue("Invalid comparison result: " + result, result < 0);
+		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
 
 		result = condition2.compareTo(condition1, request);
-		assertTrue("Invalid comparison result: " + result, result > 0);
+		assertThat(result > 0).as("Invalid comparison result: " + result).isTrue();
 
 		request = createRequest("application/xml", "text/plain");
 
 		result = condition1.compareTo(condition2, request);
-		assertTrue("Invalid comparison result: " + result, result > 0);
+		assertThat(result > 0).as("Invalid comparison result: " + result).isTrue();
 
 		result = condition2.compareTo(condition1, request);
-		assertTrue("Invalid comparison result: " + result, result < 0);
+		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
 	}
 
 	// SPR-8536
@@ -266,30 +258,28 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition1 = new ProducesRequestCondition();
 		ProducesRequestCondition condition2 = new ProducesRequestCondition("application/json");
 
-		assertTrue("Should have picked '*/*' condition as an exact match",
-				condition1.compareTo(condition2, request) < 0);
-		assertTrue("Should have picked '*/*' condition as an exact match",
-				condition2.compareTo(condition1, request) > 0);
+		assertThat(condition1.compareTo(condition2, request) < 0).as("Should have picked '*/*' condition as an exact match").isTrue();
+		assertThat(condition2.compareTo(condition1, request) > 0).as("Should have picked '*/*' condition as an exact match").isTrue();
 
 		condition1 = new ProducesRequestCondition("*/*");
 		condition2 = new ProducesRequestCondition("application/json");
 
-		assertTrue(condition1.compareTo(condition2, request) < 0);
-		assertTrue(condition2.compareTo(condition1, request) > 0);
+		assertThat(condition1.compareTo(condition2, request) < 0).isTrue();
+		assertThat(condition2.compareTo(condition1, request) > 0).isTrue();
 
 		request.addHeader("Accept", "*/*");
 
 		condition1 = new ProducesRequestCondition();
 		condition2 = new ProducesRequestCondition("application/json");
 
-		assertTrue(condition1.compareTo(condition2, request) < 0);
-		assertTrue(condition2.compareTo(condition1, request) > 0);
+		assertThat(condition1.compareTo(condition2, request) < 0).isTrue();
+		assertThat(condition2.compareTo(condition1, request) > 0).isTrue();
 
 		condition1 = new ProducesRequestCondition("*/*");
 		condition2 = new ProducesRequestCondition("application/json");
 
-		assertTrue(condition1.compareTo(condition2, request) < 0);
-		assertTrue(condition2.compareTo(condition1, request) > 0);
+		assertThat(condition1.compareTo(condition2, request) < 0).isTrue();
+		assertThat(condition2.compareTo(condition1, request) > 0).isTrue();
 	}
 
 	// SPR-9021
@@ -301,8 +291,8 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition1 = new ProducesRequestCondition();
 		ProducesRequestCondition condition2 = new ProducesRequestCondition("application/json");
 
-		assertTrue(condition1.compareTo(condition2, request) < 0);
-		assertTrue(condition2.compareTo(condition1, request) > 0);
+		assertThat(condition1.compareTo(condition2, request) < 0).isTrue();
+		assertThat(condition2.compareTo(condition1, request) > 0).isTrue();
 	}
 
 	@Test
@@ -313,10 +303,10 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition2 = new ProducesRequestCondition("text/xhtml");
 
 		int result = condition1.compareTo(condition2, request);
-		assertTrue("Should have used MediaType.equals(Object) to break the match", result < 0);
+		assertThat(result < 0).as("Should have used MediaType.equals(Object) to break the match").isTrue();
 
 		result = condition2.compareTo(condition1, request);
-		assertTrue("Should have used MediaType.equals(Object) to break the match", result > 0);
+		assertThat(result > 0).as("Should have used MediaType.equals(Object) to break the match").isTrue();
 	}
 
 	@Test
@@ -325,7 +315,7 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition2 = new ProducesRequestCondition("application/xml");
 
 		ProducesRequestCondition result = condition1.combine(condition2);
-		assertEquals(condition2, result);
+		assertThat(result).isEqualTo(condition2);
 	}
 
 	@Test
@@ -334,7 +324,7 @@ public class ProducesRequestConditionTests {
 		ProducesRequestCondition condition2 = new ProducesRequestCondition();
 
 		ProducesRequestCondition result = condition1.combine(condition2);
-		assertEquals(condition1, result);
+		assertThat(result).isEqualTo(condition1);
 	}
 
 	@Test
@@ -358,7 +348,7 @@ public class ProducesRequestConditionTests {
 		condition = new ProducesRequestCondition("application/xml");
 
 		result = condition.getMatchingCondition(request);
-		assertNull(result);
+		assertThat(result).isNull();
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolderTests.java

@@ -23,10 +23,8 @@ import org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
 
 /**
  * A test fixture for {@link RequestConditionHolder} tests.
@@ -41,7 +39,7 @@ public class RequestConditionHolderTests {
 		RequestConditionHolder params2 = new RequestConditionHolder(new ParamsRequestCondition("name2"));
 		RequestConditionHolder expected = new RequestConditionHolder(new ParamsRequestCondition("name1", "name2"));
 
-		assertEquals(expected, params1.combine(params2));
+		assertThat(params1.combine(params2)).isEqualTo(expected);
 	}
 
 	@Test
@@ -49,9 +47,9 @@ public class RequestConditionHolderTests {
 		RequestConditionHolder empty = new RequestConditionHolder(null);
 		RequestConditionHolder notEmpty = new RequestConditionHolder(new ParamsRequestCondition("name"));
 
-		assertSame(empty, empty.combine(empty));
-		assertSame(notEmpty, notEmpty.combine(empty));
-		assertSame(notEmpty, empty.combine(notEmpty));
+		assertThat(empty.combine(empty)).isSameAs(empty);
+		assertThat(notEmpty.combine(empty)).isSameAs(notEmpty);
+		assertThat(empty.combine(notEmpty)).isSameAs(notEmpty);
 	}
 
 	@Test
@@ -71,7 +69,7 @@ public class RequestConditionHolderTests {
 		RequestConditionHolder custom = new RequestConditionHolder(rm);
 		RequestMethodsRequestCondition expected = new RequestMethodsRequestCondition(RequestMethod.GET);
 
-		assertEquals(expected, custom.getMatchingCondition(request).getCondition());
+		assertThat(custom.getMatchingCondition(request).getCondition()).isEqualTo(expected);
 	}
 
 	@Test
@@ -81,13 +79,13 @@ public class RequestConditionHolderTests {
 		RequestMethodsRequestCondition rm = new RequestMethodsRequestCondition(RequestMethod.POST);
 		RequestConditionHolder custom = new RequestConditionHolder(rm);
 
-		assertNull(custom.getMatchingCondition(request));
+		assertThat(custom.getMatchingCondition(request)).isNull();
 	}
 
 	@Test
 	public void matchEmpty() {
 		RequestConditionHolder empty = new RequestConditionHolder(null);
-		assertSame(empty, empty.getMatchingCondition(new MockHttpServletRequest()));
+		assertThat(empty.getMatchingCondition(new MockHttpServletRequest())).isSameAs(empty);
 	}
 
 	@Test
@@ -97,8 +95,8 @@ public class RequestConditionHolderTests {
 		RequestConditionHolder params11 = new RequestConditionHolder(new ParamsRequestCondition("1"));
 		RequestConditionHolder params12 = new RequestConditionHolder(new ParamsRequestCondition("1", "2"));
 
-		assertEquals(1, params11.compareTo(params12, request));
-		assertEquals(-1, params12.compareTo(params11, request));
+		assertThat(params11.compareTo(params12, request)).isEqualTo(1);
+		assertThat(params12.compareTo(params11, request)).isEqualTo(-1);
 	}
 
 	@Test
@@ -109,9 +107,9 @@ public class RequestConditionHolderTests {
 		RequestConditionHolder empty2 = new RequestConditionHolder(null);
 		RequestConditionHolder notEmpty = new RequestConditionHolder(new ParamsRequestCondition("name"));
 
-		assertEquals(0, empty.compareTo(empty2, request));
-		assertEquals(-1, notEmpty.compareTo(empty, request));
-		assertEquals(1, empty.compareTo(notEmpty, request));
+		assertThat(empty.compareTo(empty2, request)).isEqualTo(0);
+		assertThat(notEmpty.compareTo(empty, request)).isEqualTo(-1);
+		assertThat(empty.compareTo(notEmpty, request)).isEqualTo(1);
 	}
 
 	@Test

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java

@@ -26,11 +26,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.web.bind.annotation.RequestMethod.DELETE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 import static org.springframework.web.bind.annotation.RequestMethod.HEAD;
@@ -64,7 +60,7 @@ public class RequestMethodsRequestConditionTests {
 		for (RequestMethod method : RequestMethod.values()) {
 			if (method != OPTIONS) {
 				HttpServletRequest request = new MockHttpServletRequest(method.name(), "");
-				assertNotNull(condition.getMatchingCondition(request));
+				assertThat(condition.getMatchingCondition(request)).isNotNull();
 			}
 		}
 		testNoMatch(condition, OPTIONS);
@@ -73,8 +69,8 @@ public class RequestMethodsRequestConditionTests {
 	@Test
 	public void getMatchingConditionWithCustomMethod() {
 		HttpServletRequest request = new MockHttpServletRequest("PROPFIND", "");
-		assertNotNull(new RequestMethodsRequestCondition().getMatchingCondition(request));
-		assertNull(new RequestMethodsRequestCondition(GET, POST).getMatchingCondition(request));
+		assertThat(new RequestMethodsRequestCondition().getMatchingCondition(request)).isNotNull();
+		assertThat(new RequestMethodsRequestCondition(GET, POST).getMatchingCondition(request)).isNull();
 	}
 
 	@Test
@@ -83,9 +79,9 @@ public class RequestMethodsRequestConditionTests {
 		request.addHeader("Origin", "https://example.com");
 		request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "PUT");
 
-		assertNotNull(new RequestMethodsRequestCondition().getMatchingCondition(request));
-		assertNotNull(new RequestMethodsRequestCondition(PUT).getMatchingCondition(request));
-		assertNull(new RequestMethodsRequestCondition(DELETE).getMatchingCondition(request));
+		assertThat(new RequestMethodsRequestCondition().getMatchingCondition(request)).isNotNull();
+		assertThat(new RequestMethodsRequestCondition(PUT).getMatchingCondition(request)).isNotNull();
+		assertThat(new RequestMethodsRequestCondition(DELETE).getMatchingCondition(request)).isNull();
 	}
 
 	@Test // SPR-14410
@@ -96,8 +92,8 @@ public class RequestMethodsRequestConditionTests {
 		RequestMethodsRequestCondition condition = new RequestMethodsRequestCondition();
 		RequestMethodsRequestCondition result = condition.getMatchingCondition(request);
 
-		assertNotNull(result);
-		assertSame(condition, result);
+		assertThat(result).isNotNull();
+		assertThat(result).isSameAs(condition);
 	}
 
 	@Test
@@ -109,16 +105,16 @@ public class RequestMethodsRequestConditionTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 
 		int result = c1.compareTo(c2, request);
-		assertTrue("Invalid comparison result: " + result, result < 0);
+		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
 
 		result = c2.compareTo(c1, request);
-		assertTrue("Invalid comparison result: " + result, result > 0);
+		assertThat(result > 0).as("Invalid comparison result: " + result).isTrue();
 
 		result = c2.compareTo(c3, request);
-		assertTrue("Invalid comparison result: " + result, result < 0);
+		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
 
 		result = c1.compareTo(c1, request);
-		assertEquals("Invalid comparison result ", 0, result);
+		assertThat(result).as("Invalid comparison result ").isEqualTo(0);
 	}
 
 	@Test
@@ -127,20 +123,20 @@ public class RequestMethodsRequestConditionTests {
 		RequestMethodsRequestCondition condition2 = new RequestMethodsRequestCondition(POST);
 
 		RequestMethodsRequestCondition result = condition1.combine(condition2);
-		assertEquals(2, result.getContent().size());
+		assertThat(result.getContent().size()).isEqualTo(2);
 	}
 
 
 	private void testMatch(RequestMethodsRequestCondition condition, RequestMethod method) {
 		MockHttpServletRequest request = new MockHttpServletRequest(method.name(), "");
 		RequestMethodsRequestCondition actual = condition.getMatchingCondition(request);
-		assertNotNull(actual);
-		assertEquals(Collections.singleton(method), actual.getContent());
+		assertThat(actual).isNotNull();
+		assertThat(actual.getContent()).isEqualTo(Collections.singleton(method));
 	}
 
 	private void testNoMatch(RequestMethodsRequestCondition condition, RequestMethod method) {
 		MockHttpServletRequest request = new MockHttpServletRequest(method.name(), "");
-		assertNull(condition.getMatchingCondition(request));
+		assertThat(condition.getMatchingCondition(request)).isNull();
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java

@@ -60,10 +60,6 @@ import org.springframework.web.util.UrlPathHelper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
 
 /**
  * Test fixture with {@link RequestMappingInfoHandlerMapping}.
@@ -105,7 +101,7 @@ public class RequestMappingInfoHandlerMappingTests {
 		RequestMappingInfo info = RequestMappingInfo.paths(patterns).build();
 		Set<String> actual = this.handlerMapping.getMappingPathPatterns(info);
 
-		assertEquals(new HashSet<>(Arrays.asList(patterns)), actual);
+		assertThat(actual).isEqualTo(new HashSet<>(Arrays.asList(patterns)));
 	}
 
 	@Test
@@ -113,14 +109,14 @@ public class RequestMappingInfoHandlerMappingTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo");
 		HandlerMethod handlerMethod = getHandler(request);
 
-		assertEquals(this.fooMethod.getMethod(), handlerMethod.getMethod());
+		assertThat(handlerMethod.getMethod()).isEqualTo(this.fooMethod.getMethod());
 	}
 
 	@Test
 	public void getHandlerGlobMatch() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bar");
 		HandlerMethod handlerMethod = getHandler(request);
-		assertEquals(this.barMethod.getMethod(), handlerMethod.getMethod());
+		assertThat(handlerMethod.getMethod()).isEqualTo(this.barMethod.getMethod());
 	}
 
 	@Test
@@ -128,12 +124,12 @@ public class RequestMappingInfoHandlerMappingTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "");
 		HandlerMethod handlerMethod = getHandler(request);
 
-		assertEquals(this.emptyMethod.getMethod(), handlerMethod.getMethod());
+		assertThat(handlerMethod.getMethod()).isEqualTo(this.emptyMethod.getMethod());
 
 		request = new MockHttpServletRequest("GET", "/");
 		handlerMethod = getHandler(request);
 
-		assertEquals(this.emptyMethod.getMethod(), handlerMethod.getMethod());
+		assertThat(handlerMethod.getMethod()).isEqualTo(this.emptyMethod.getMethod());
 	}
 
 	@Test
@@ -142,7 +138,7 @@ public class RequestMappingInfoHandlerMappingTests {
 		request.setParameter("p", "anything");
 		HandlerMethod handlerMethod = getHandler(request);
 
-		assertEquals(this.fooParamMethod.getMethod(), handlerMethod.getMethod());
+		assertThat(handlerMethod.getMethod()).isEqualTo(this.fooParamMethod.getMethod());
 	}
 
 	@Test
@@ -209,13 +205,13 @@ public class RequestMappingInfoHandlerMappingTests {
 		this.handlerMapping.getHandler(request);
 
 		String name = HandlerMapping.PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE;
-		assertEquals(Collections.singleton(MediaType.APPLICATION_XML), request.getAttribute(name));
+		assertThat(request.getAttribute(name)).isEqualTo(Collections.singleton(MediaType.APPLICATION_XML));
 
 		request = new MockHttpServletRequest("GET", "/content");
 		request.addHeader("Accept", "application/json");
 		this.handlerMapping.getHandler(request);
 
-		assertNull("Negated expression shouldn't be listed as producible type", request.getAttribute(name));
+		assertThat(request.getAttribute(name)).as("Negated expression shouldn't be listed as producible type").isNull();
 	}
 
 	@Test
@@ -230,12 +226,12 @@ public class RequestMappingInfoHandlerMappingTests {
 		mapping.setApplicationContext(new StaticWebApplicationContext());
 
 		HandlerExecutionChain chain = mapping.getHandler(new MockHttpServletRequest("GET", path));
-		assertNotNull(chain);
-		assertNotNull(chain.getInterceptors());
-		assertSame(interceptor, chain.getInterceptors()[0]);
+		assertThat(chain).isNotNull();
+		assertThat(chain.getInterceptors()).isNotNull();
+		assertThat(chain.getInterceptors()[0]).isSameAs(interceptor);
 
 		chain = mapping.getHandler(new MockHttpServletRequest("GET", "/invalid"));
-		assertNull(chain);
+		assertThat(chain).isNull();
 	}
 
 	@SuppressWarnings("unchecked")
@@ -249,9 +245,9 @@ public class RequestMappingInfoHandlerMappingTests {
 		String name = HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE;
 		Map<String, String> uriVariables = (Map<String, String>) request.getAttribute(name);
 
-		assertNotNull(uriVariables);
-		assertEquals("1", uriVariables.get("path1"));
-		assertEquals("2", uriVariables.get("path2"));
+		assertThat(uriVariables).isNotNull();
+		assertThat(uriVariables.get("path1")).isEqualTo("1");
+		assertThat(uriVariables.get("path2")).isEqualTo("2");
 	}
 
 	@SuppressWarnings("unchecked")
@@ -270,9 +266,9 @@ public class RequestMappingInfoHandlerMappingTests {
 		String name = HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE;
 		Map<String, String> uriVariables = (Map<String, String>) request.getAttribute(name);
 
-		assertNotNull(uriVariables);
-		assertEquals("group", uriVariables.get("group"));
-		assertEquals("a/b", uriVariables.get("identifier"));
+		assertThat(uriVariables).isNotNull();
+		assertThat(uriVariables.get("group")).isEqualTo("group");
+		assertThat(uriVariables.get("identifier")).isEqualTo("a/b");
 	}
 
 	@Test
@@ -281,7 +277,7 @@ public class RequestMappingInfoHandlerMappingTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/1/2");
 		this.handlerMapping.handleMatch(key, "/1/2", request);
 
-		assertEquals("/{path1}/2", request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE));
+		assertThat(request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE)).isEqualTo("/{path1}/2");
 	}
 
 	@Test // gh-22543
@@ -289,7 +285,7 @@ public class RequestMappingInfoHandlerMappingTests {
 		String path = "";
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", path);
 		this.handlerMapping.handleMatch(RequestMappingInfo.paths().build(), path, request);
-		assertEquals(path, request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE));
+		assertThat(request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE)).isEqualTo(path);
 	}
 
 	@Test
@@ -305,10 +301,10 @@ public class RequestMappingInfoHandlerMappingTests {
 		matrixVariables = getMatrixVariables(request, "cars");
 		uriVariables = getUriTemplateVariables(request);
 
-		assertNotNull(matrixVariables);
-		assertEquals(Arrays.asList("red", "blue", "green"), matrixVariables.get("colors"));
-		assertEquals("2012", matrixVariables.getFirst("year"));
-		assertEquals("cars", uriVariables.get("cars"));
+		assertThat(matrixVariables).isNotNull();
+		assertThat(matrixVariables.get("colors")).isEqualTo(Arrays.asList("red", "blue", "green"));
+		assertThat(matrixVariables.getFirst("year")).isEqualTo("2012");
+		assertThat(uriVariables.get("cars")).isEqualTo("cars");
 
 		// URI var with regex for path variable, and URI var for matrix params..
 		request = new MockHttpServletRequest();
@@ -317,11 +313,11 @@ public class RequestMappingInfoHandlerMappingTests {
 		matrixVariables = getMatrixVariables(request, "params");
 		uriVariables = getUriTemplateVariables(request);
 
-		assertNotNull(matrixVariables);
-		assertEquals(Arrays.asList("red", "blue", "green"), matrixVariables.get("colors"));
-		assertEquals("2012", matrixVariables.getFirst("year"));
-		assertEquals("cars", uriVariables.get("cars"));
-		assertEquals(";colors=red,blue,green;year=2012", uriVariables.get("params"));
+		assertThat(matrixVariables).isNotNull();
+		assertThat(matrixVariables.get("colors")).isEqualTo(Arrays.asList("red", "blue", "green"));
+		assertThat(matrixVariables.getFirst("year")).isEqualTo("2012");
+		assertThat(uriVariables.get("cars")).isEqualTo("cars");
+		assertThat(uriVariables.get("params")).isEqualTo(";colors=red,blue,green;year=2012");
 
 		// URI var with regex for path variable, and (empty) URI var for matrix params..
 		request = new MockHttpServletRequest();
@@ -330,9 +326,9 @@ public class RequestMappingInfoHandlerMappingTests {
 		matrixVariables = getMatrixVariables(request, "params");
 		uriVariables = getUriTemplateVariables(request);
 
-		assertNull(matrixVariables);
-		assertEquals("cars", uriVariables.get("cars"));
-		assertEquals("", uriVariables.get("params"));
+		assertThat(matrixVariables).isNull();
+		assertThat(uriVariables.get("cars")).isEqualTo("cars");
+		assertThat(uriVariables.get("params")).isEqualTo("");
 
 		// SPR-11897
 		request = new MockHttpServletRequest();
@@ -341,11 +337,11 @@ public class RequestMappingInfoHandlerMappingTests {
 		matrixVariables = getMatrixVariables(request, "foo");
 		uriVariables = getUriTemplateVariables(request);
 
-		assertNotNull(matrixVariables);
-		assertEquals(2, matrixVariables.size());
-		assertEquals("42", matrixVariables.getFirst("a"));
-		assertEquals("c", matrixVariables.getFirst("b"));
-		assertEquals("a=42", uriVariables.get("foo"));
+		assertThat(matrixVariables).isNotNull();
+		assertThat(matrixVariables.size()).isEqualTo(2);
+		assertThat(matrixVariables.getFirst("a")).isEqualTo("42");
+		assertThat(matrixVariables.getFirst("b")).isEqualTo("c");
+		assertThat(uriVariables.get("foo")).isEqualTo("a=42");
 	}
 
 	@Test // SPR-10140, SPR-16867
@@ -365,15 +361,15 @@ public class RequestMappingInfoHandlerMappingTests {
 		MultiValueMap<String, String> matrixVariables = getMatrixVariables(request, "cars");
 		Map<String, String> uriVariables = getUriTemplateVariables(request);
 
-		assertNotNull(matrixVariables);
-		assertEquals(Collections.singletonList("a/b"), matrixVariables.get("mvar"));
-		assertEquals("cars", uriVariables.get("cars"));
+		assertThat(matrixVariables).isNotNull();
+		assertThat(matrixVariables.get("mvar")).isEqualTo(Collections.singletonList("a/b"));
+		assertThat(uriVariables.get("cars")).isEqualTo("cars");
 	}
 
 
 	private HandlerMethod getHandler(MockHttpServletRequest request) throws Exception {
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
-		assertNotNull(chain);
+		assertThat(chain).isNotNull();
 		return (HandlerMethod) chain.getHandler();
 	}
 
@@ -393,9 +389,9 @@ public class RequestMappingInfoHandlerMappingTests {
 		ModelAndViewContainer mavContainer = new ModelAndViewContainer();
 		Object result = new InvocableHandlerMethod(handlerMethod).invokeForRequest(webRequest, mavContainer);
 
-		assertNotNull(result);
-		assertEquals(HttpHeaders.class, result.getClass());
-		assertEquals(allowHeader, ((HttpHeaders) result).getFirst("Allow"));
+		assertThat(result).isNotNull();
+		assertThat(result.getClass()).isEqualTo(HttpHeaders.class);
+		assertThat(((HttpHeaders) result).getFirst("Allow")).isEqualTo(allowHeader);
 	}
 
 	private void testHttpMediaTypeNotAcceptableException(String url) throws Exception {

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMethodMappingNamingStrategyTests.java

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.handler.HandlerMethodMappingNamingStrategy;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Unit tests for
@@ -45,7 +45,7 @@ public class RequestMappingInfoHandlerMethodMappingNamingStrategyTests {
 
 		HandlerMethodMappingNamingStrategy<RequestMappingInfo> strategy = new RequestMappingInfoHandlerMethodMappingNamingStrategy();
 
-		assertEquals("foo", strategy.getName(handlerMethod, rmi));
+		assertThat(strategy.getName(handlerMethod, rmi)).isEqualTo("foo");
 	}
 
 	@Test
@@ -58,7 +58,7 @@ public class RequestMappingInfoHandlerMethodMappingNamingStrategyTests {
 
 		HandlerMethodMappingNamingStrategy<RequestMappingInfo> strategy = new RequestMappingInfoHandlerMethodMappingNamingStrategy();
 
-		assertEquals("TC#handle", strategy.getName(handlerMethod, rmi));
+		assertThat(strategy.getName(handlerMethod, rmi)).isEqualTo("TC#handle");
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java

@@ -28,11 +28,7 @@ import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 import static org.springframework.web.bind.annotation.RequestMethod.HEAD;
 import static org.springframework.web.servlet.mvc.method.RequestMappingInfo.paths;
@@ -49,13 +45,14 @@ public class RequestMappingInfoTests {
 	public void createEmpty() {
 		RequestMappingInfo info = paths().build();
 
-		assertEquals(Collections.singleton(""), info.getPatternsCondition().getPatterns()); // gh-22543
-		assertEquals(0, info.getMethodsCondition().getMethods().size());
-		assertEquals(true, info.getConsumesCondition().isEmpty());
-		assertEquals(true, info.getProducesCondition().isEmpty());
-		assertNotNull(info.getParamsCondition());
-		assertNotNull(info.getHeadersCondition());
-		assertNull(info.getCustomCondition());
+		// gh-22543
+		assertThat(info.getPatternsCondition().getPatterns()).isEqualTo(Collections.singleton(""));
+		assertThat(info.getMethodsCondition().getMethods().size()).isEqualTo(0);
+		assertThat(info.getConsumesCondition().isEmpty()).isEqualTo(true);
+		assertThat(info.getProducesCondition().isEmpty()).isEqualTo(true);
+		assertThat(info.getParamsCondition()).isNotNull();
+		assertThat(info.getHeadersCondition()).isNotNull();
+		assertThat(info.getCustomCondition()).isNull();
 	}
 
 	@Test
@@ -65,12 +62,12 @@ public class RequestMappingInfoTests {
 		RequestMappingInfo info = paths("/foo*", "/bar").build();
 		RequestMappingInfo expected = paths("/foo*").build();
 
-		assertEquals(expected, info.getMatchingCondition(request));
+		assertThat(info.getMatchingCondition(request)).isEqualTo(expected);
 
 		info = paths("/**", "/foo*", "/foo").build();
 		expected = paths("/foo", "/foo*", "/**").build();
 
-		assertEquals(expected, info.getMatchingCondition(request));
+		assertThat(info.getMatchingCondition(request)).isEqualTo(expected);
 	}
 
 	@Test
@@ -81,12 +78,12 @@ public class RequestMappingInfoTests {
 		RequestMappingInfo info = paths("/foo").params("foo=bar").build();
 		RequestMappingInfo match = info.getMatchingCondition(request);
 
-		assertNotNull(match);
+		assertThat(match).isNotNull();
 
 		info = paths("/foo").params("foo!=bar").build();
 		match = info.getMatchingCondition(request);
 
-		assertNull(match);
+		assertThat(match).isNull();
 	}
 
 	@Test
@@ -97,12 +94,12 @@ public class RequestMappingInfoTests {
 		RequestMappingInfo info = paths("/foo").headers("foo=bar").build();
 		RequestMappingInfo match = info.getMatchingCondition(request);
 
-		assertNotNull(match);
+		assertThat(match).isNotNull();
 
 		info = paths("/foo").headers("foo!=bar").build();
 		match = info.getMatchingCondition(request);
 
-		assertNull(match);
+		assertThat(match).isNull();
 	}
 
 	@Test
@@ -113,12 +110,12 @@ public class RequestMappingInfoTests {
 		RequestMappingInfo info = paths("/foo").consumes("text/plain").build();
 		RequestMappingInfo match = info.getMatchingCondition(request);
 
-		assertNotNull(match);
+		assertThat(match).isNotNull();
 
 		info = paths("/foo").consumes("application/xml").build();
 		match = info.getMatchingCondition(request);
 
-		assertNull(match);
+		assertThat(match).isNull();
 	}
 
 	@Test
@@ -129,12 +126,12 @@ public class RequestMappingInfoTests {
 		RequestMappingInfo info = paths("/foo").produces("text/plain").build();
 		RequestMappingInfo match = info.getMatchingCondition(request);
 
-		assertNotNull(match);
+		assertThat(match).isNotNull();
 
 		info = paths("/foo").produces("application/xml").build();
 		match = info.getMatchingCondition(request);
 
-		assertNull(match);
+		assertThat(match).isNull();
 	}
 
 	@Test
@@ -145,12 +142,12 @@ public class RequestMappingInfoTests {
 		RequestMappingInfo info = paths("/foo").params("foo=bar").build();
 		RequestMappingInfo match = info.getMatchingCondition(request);
 
-		assertNotNull(match);
+		assertThat(match).isNotNull();
 
 		info = paths("/foo").params("foo!=bar").params("foo!=bar").build();
 		match = info.getMatchingCondition(request);
 
-		assertNull(match);
+		assertThat(match).isNull();
 	}
 
 	@Test
@@ -166,9 +163,9 @@ public class RequestMappingInfoTests {
 		Collections.shuffle(list);
 		Collections.sort(list, comparator);
 
-		assertEquals(oneMethodOneParam, list.get(0));
-		assertEquals(oneMethod, list.get(1));
-		assertEquals(noMethods, list.get(2));
+		assertThat(list.get(0)).isEqualTo(oneMethodOneParam);
+		assertThat(list.get(1)).isEqualTo(oneMethod);
+		assertThat(list.get(2)).isEqualTo(noMethods);
 	}
 
 	@Test // SPR-14383
@@ -187,9 +184,9 @@ public class RequestMappingInfoTests {
 		Collections.shuffle(list);
 		Collections.sort(list, comparator);
 
-		assertEquals(headMethod, list.get(0));
-		assertEquals(getMethod, list.get(1));
-		assertEquals(noMethods, list.get(2));
+		assertThat(list.get(0)).isEqualTo(headMethod);
+		assertThat(list.get(1)).isEqualTo(getMethod);
+		assertThat(list.get(2)).isEqualTo(noMethods);
 	}
 
 	@Test
@@ -204,64 +201,64 @@ public class RequestMappingInfoTests {
 				.consumes("text/plain").produces("text/plain")
 				.build();
 
-		assertEquals(info1, info2);
-		assertEquals(info1.hashCode(), info2.hashCode());
+		assertThat(info2).isEqualTo(info1);
+		assertThat(info2.hashCode()).isEqualTo(info1.hashCode());
 
 		info2 = paths("/foo", "/NOOOOOO").methods(GET)
 				.params("foo=bar", "customFoo=customBar").headers("foo=bar")
 				.consumes("text/plain").produces("text/plain")
 				.build();
 
-		assertFalse(info1.equals(info2));
-		assertNotEquals(info1.hashCode(), info2.hashCode());
+		assertThat(info1.equals(info2)).isFalse();
+		assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode());
 
 		info2 = paths("/foo").methods(GET, RequestMethod.POST)
 				.params("foo=bar", "customFoo=customBar").headers("foo=bar")
 				.consumes("text/plain").produces("text/plain")
 				.build();
 
-		assertFalse(info1.equals(info2));
-		assertNotEquals(info1.hashCode(), info2.hashCode());
+		assertThat(info1.equals(info2)).isFalse();
+		assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode());
 
 		info2 = paths("/foo").methods(GET)
 				.params("/NOOOOOO", "customFoo=customBar").headers("foo=bar")
 				.consumes("text/plain").produces("text/plain")
 				.build();
 
-		assertFalse(info1.equals(info2));
-		assertNotEquals(info1.hashCode(), info2.hashCode());
+		assertThat(info1.equals(info2)).isFalse();
+		assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode());
 
 		info2 = paths("/foo").methods(GET)
 				.params("foo=bar", "customFoo=customBar").headers("/NOOOOOO")
 				.consumes("text/plain").produces("text/plain")
 				.build();
 
-		assertFalse(info1.equals(info2));
-		assertNotEquals(info1.hashCode(), info2.hashCode());
+		assertThat(info1.equals(info2)).isFalse();
+		assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode());
 
 		info2 = paths("/foo").methods(GET)
 				.params("foo=bar", "customFoo=customBar").headers("foo=bar")
 				.consumes("text/NOOOOOO").produces("text/plain")
 				.build();
 
-		assertFalse(info1.equals(info2));
-		assertNotEquals(info1.hashCode(), info2.hashCode());
+		assertThat(info1.equals(info2)).isFalse();
+		assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode());
 
 		info2 = paths("/foo").methods(GET)
 				.params("foo=bar", "customFoo=customBar").headers("foo=bar")
 				.consumes("text/plain").produces("text/NOOOOOO")
 				.build();
 
-		assertFalse(info1.equals(info2));
-		assertNotEquals(info1.hashCode(), info2.hashCode());
+		assertThat(info1.equals(info2)).isFalse();
+		assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode());
 
 		info2 = paths("/foo").methods(GET)
 				.params("foo=bar", "customFoo=NOOOOOO").headers("foo=bar")
 				.consumes("text/plain").produces("text/plain")
 				.build();
 
-		assertFalse(info1.equals(info2));
-		assertNotEquals(info1.hashCode(), info2.hashCode());
+		assertThat(info1.equals(info2)).isFalse();
+		assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode());
 	}
 
 	@Test
@@ -272,11 +269,11 @@ public class RequestMappingInfoTests {
 
 		RequestMappingInfo info = paths("/foo").methods(RequestMethod.POST).build();
 		RequestMappingInfo match = info.getMatchingCondition(request);
-		assertNotNull(match);
+		assertThat(match).isNotNull();
 
 		info = paths("/foo").methods(RequestMethod.OPTIONS).build();
 		match = info.getMatchingCondition(request);
-		assertNull("Pre-flight should match the ACCESS_CONTROL_REQUEST_METHOD", match);
+		assertThat(match).as("Pre-flight should match the ACCESS_CONTROL_REQUEST_METHOD").isNull();
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java

@@ -41,13 +41,8 @@ import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
@@ -89,8 +84,8 @@ public abstract class AbstractRequestAttributesArgumentResolverTests {
 
 	@Test
 	public void supportsParameter() throws Exception {
-		assertTrue(this.resolver.supportsParameter(new MethodParameter(this.handleMethod, 0)));
-		assertFalse(this.resolver.supportsParameter(new MethodParameter(this.handleMethod, -1)));
+		assertThat(this.resolver.supportsParameter(new MethodParameter(this.handleMethod, 0))).isTrue();
+		assertThat(this.resolver.supportsParameter(new MethodParameter(this.handleMethod, -1))).isFalse();
 	}
 
 	@Test
@@ -102,7 +97,7 @@ public abstract class AbstractRequestAttributesArgumentResolverTests {
 
 		Foo foo = new Foo();
 		this.webRequest.setAttribute("foo", foo, getScope());
-		assertSame(foo, testResolveArgument(param));
+		assertThat(testResolveArgument(param)).isSameAs(foo);
 	}
 
 	@Test
@@ -110,17 +105,17 @@ public abstract class AbstractRequestAttributesArgumentResolverTests {
 		MethodParameter param = initMethodParameter(1);
 		Foo foo = new Foo();
 		this.webRequest.setAttribute("specialFoo", foo, getScope());
-		assertSame(foo, testResolveArgument(param));
+		assertThat(testResolveArgument(param)).isSameAs(foo);
 	}
 
 	@Test
 	public void resolveNotRequired() throws Exception {
 		MethodParameter param = initMethodParameter(2);
-		assertNull(testResolveArgument(param));
+		assertThat(testResolveArgument(param)).isNull();
 
 		Foo foo = new Foo();
 		this.webRequest.setAttribute("foo", foo, getScope());
-		assertSame(foo, testResolveArgument(param));
+		assertThat(testResolveArgument(param)).isSameAs(foo);
 	}
 
 	@Test
@@ -132,18 +127,18 @@ public abstract class AbstractRequestAttributesArgumentResolverTests {
 
 		MethodParameter param = initMethodParameter(3);
 		Object actual = testResolveArgument(param, factory);
-		assertNotNull(actual);
-		assertEquals(Optional.class, actual.getClass());
-		assertFalse(((Optional<?>) actual).isPresent());
+		assertThat(actual).isNotNull();
+		assertThat(actual.getClass()).isEqualTo(Optional.class);
+		assertThat(((Optional<?>) actual).isPresent()).isFalse();
 
 		Foo foo = new Foo();
 		this.webRequest.setAttribute("foo", foo, getScope());
 
 		actual = testResolveArgument(param, factory);
-		assertNotNull(actual);
-		assertEquals(Optional.class, actual.getClass());
-		assertTrue(((Optional<?>) actual).isPresent());
-		assertSame(foo, ((Optional<?>) actual).get());
+		assertThat(actual).isNotNull();
+		assertThat(actual.getClass()).isEqualTo(Optional.class);
+		assertThat(((Optional<?>) actual).isPresent()).isTrue();
+		assertThat(((Optional<?>) actual).get()).isSameAs(foo);
 	}
 
 	private Object testResolveArgument(MethodParameter param) throws Exception {

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java

@@ -30,7 +30,7 @@ import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.mvc.annotation.ResponseStatusExceptionResolver;
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
 
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Base class for tests using on the DispatcherServlet and HandlerMethod infrastructure classes:
@@ -48,7 +48,7 @@ public abstract class AbstractServletHandlerMethodTests {
 
 
 	protected DispatcherServlet getServlet() {
-		assertNotNull("DispatcherServlet not initialized", servlet);
+		assertThat(servlet).as("DispatcherServlet not initialized").isNotNull();
 		return servlet;
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/CrossOriginTests.java

@@ -53,13 +53,8 @@ import org.springframework.web.servlet.mvc.condition.ProducesRequestCondition;
 import org.springframework.web.servlet.mvc.condition.RequestMethodsRequestCondition;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Test fixture for {@link CrossOrigin @CrossOrigin} annotated methods.
@@ -98,7 +93,7 @@ public class CrossOriginTests {
 		this.handlerMapping.registerHandler(new MethodLevelController());
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/no");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
-		assertNull(getCorsConfiguration(chain, false));
+		assertThat(getCorsConfiguration(chain, false)).isNull();
 	}
 
 	@Test  // SPR-12931
@@ -106,7 +101,7 @@ public class CrossOriginTests {
 		this.handlerMapping.registerHandler(new MethodLevelController());
 		this.request.setRequestURI("/no");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
-		assertNull(getCorsConfiguration(chain, false));
+		assertThat(getCorsConfiguration(chain, false)).isNull();
 	}
 
 	@Test  // SPR-12931
@@ -115,7 +110,7 @@ public class CrossOriginTests {
 		this.request.setMethod("POST");
 		this.request.setRequestURI("/no");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
-		assertNull(getCorsConfiguration(chain, false));
+		assertThat(getCorsConfiguration(chain, false)).isNull();
 	}
 
 	@Test
@@ -124,13 +119,13 @@ public class CrossOriginTests {
 		this.request.setRequestURI("/default");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
 		CorsConfiguration config = getCorsConfiguration(chain, false);
-		assertNotNull(config);
-		assertArrayEquals(new String[] {"GET"}, config.getAllowedMethods().toArray());
-		assertArrayEquals(new String[] {"*"}, config.getAllowedOrigins().toArray());
-		assertNull(config.getAllowCredentials());
-		assertArrayEquals(new String[] {"*"}, config.getAllowedHeaders().toArray());
-		assertTrue(CollectionUtils.isEmpty(config.getExposedHeaders()));
-		assertEquals(new Long(1800), config.getMaxAge());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"GET"});
+		assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[] {"*"});
+		assertThat(config.getAllowCredentials()).isNull();
+		assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] {"*"});
+		assertThat(CollectionUtils.isEmpty(config.getExposedHeaders())).isTrue();
+		assertThat(config.getMaxAge()).isEqualTo(new Long(1800));
 	}
 
 	@Test
@@ -139,13 +134,13 @@ public class CrossOriginTests {
 		this.request.setRequestURI("/customized");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
 		CorsConfiguration config = getCorsConfiguration(chain, false);
-		assertNotNull(config);
-		assertArrayEquals(new String[] {"DELETE"}, config.getAllowedMethods().toArray());
-		assertArrayEquals(new String[] {"https://site1.com", "https://site2.com"}, config.getAllowedOrigins().toArray());
-		assertArrayEquals(new String[] {"header1", "header2"}, config.getAllowedHeaders().toArray());
-		assertArrayEquals(new String[] {"header3", "header4"}, config.getExposedHeaders().toArray());
-		assertEquals(new Long(123), config.getMaxAge());
-		assertFalse(config.getAllowCredentials());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"DELETE"});
+		assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[] {"https://site1.com", "https://site2.com"});
+		assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] {"header1", "header2"});
+		assertThat(config.getExposedHeaders().toArray()).isEqualTo(new String[] {"header3", "header4"});
+		assertThat(config.getMaxAge()).isEqualTo(new Long(123));
+		assertThat((boolean) config.getAllowCredentials()).isFalse();
 	}
 
 	@Test
@@ -154,9 +149,9 @@ public class CrossOriginTests {
 		this.request.setRequestURI("/customOrigin");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
 		CorsConfiguration config = getCorsConfiguration(chain, false);
-		assertNotNull(config);
-		assertEquals(Arrays.asList("https://example.com"), config.getAllowedOrigins());
-		assertNull(config.getAllowCredentials());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedOrigins()).isEqualTo(Arrays.asList("https://example.com"));
+		assertThat(config.getAllowCredentials()).isNull();
 	}
 
 	@Test
@@ -165,9 +160,9 @@ public class CrossOriginTests {
 		this.request.setRequestURI("/someOrigin");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
 		CorsConfiguration config = getCorsConfiguration(chain, false);
-		assertNotNull(config);
-		assertEquals(Arrays.asList("https://example.com"), config.getAllowedOrigins());
-		assertNull(config.getAllowCredentials());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedOrigins()).isEqualTo(Arrays.asList("https://example.com"));
+		assertThat(config.getAllowCredentials()).isNull();
 	}
 
 	@Test
@@ -185,26 +180,26 @@ public class CrossOriginTests {
 		this.request.setRequestURI("/foo");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
 		CorsConfiguration config = getCorsConfiguration(chain, false);
-		assertNotNull(config);
-		assertArrayEquals(new String[] {"GET"}, config.getAllowedMethods().toArray());
-		assertArrayEquals(new String[] {"*"}, config.getAllowedOrigins().toArray());
-		assertFalse(config.getAllowCredentials());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"GET"});
+		assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[] {"*"});
+		assertThat((boolean) config.getAllowCredentials()).isFalse();
 
 		this.request.setRequestURI("/bar");
 		chain = this.handlerMapping.getHandler(request);
 		config = getCorsConfiguration(chain, false);
-		assertNotNull(config);
-		assertArrayEquals(new String[] {"GET"}, config.getAllowedMethods().toArray());
-		assertArrayEquals(new String[] {"*"}, config.getAllowedOrigins().toArray());
-		assertFalse(config.getAllowCredentials());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"GET"});
+		assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[] {"*"});
+		assertThat((boolean) config.getAllowCredentials()).isFalse();
 
 		this.request.setRequestURI("/baz");
 		chain = this.handlerMapping.getHandler(request);
 		config = getCorsConfiguration(chain, false);
-		assertNotNull(config);
-		assertArrayEquals(new String[] {"GET"}, config.getAllowedMethods().toArray());
-		assertArrayEquals(new String[] {"*"}, config.getAllowedOrigins().toArray());
-		assertTrue(config.getAllowCredentials());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"GET"});
+		assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[] {"*"});
+		assertThat((boolean) config.getAllowCredentials()).isTrue();
 	}
 
 	@Test // SPR-13468
@@ -214,10 +209,10 @@ public class CrossOriginTests {
 		this.request.setRequestURI("/foo");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
 		CorsConfiguration config = getCorsConfiguration(chain, false);
-		assertNotNull(config);
-		assertArrayEquals(new String[] {"GET"}, config.getAllowedMethods().toArray());
-		assertArrayEquals(new String[] {"http://www.foo.com/"}, config.getAllowedOrigins().toArray());
-		assertTrue(config.getAllowCredentials());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"GET"});
+		assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[] {"http://www.foo.com/"});
+		assertThat((boolean) config.getAllowCredentials()).isTrue();
 	}
 
 	@Test // SPR-13468
@@ -227,10 +222,10 @@ public class CrossOriginTests {
 		this.request.setRequestURI("/foo");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
 		CorsConfiguration config = getCorsConfiguration(chain, false);
-		assertNotNull(config);
-		assertArrayEquals(new String[] {"GET"}, config.getAllowedMethods().toArray());
-		assertArrayEquals(new String[] {"http://www.foo.com/"}, config.getAllowedOrigins().toArray());
-		assertTrue(config.getAllowCredentials());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"GET"});
+		assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[] {"http://www.foo.com/"});
+		assertThat((boolean) config.getAllowCredentials()).isTrue();
 	}
 
 	@Test
@@ -241,13 +236,13 @@ public class CrossOriginTests {
 		this.request.setRequestURI("/default");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
 		CorsConfiguration config = getCorsConfiguration(chain, true);
-		assertNotNull(config);
-		assertArrayEquals(new String[] {"GET"}, config.getAllowedMethods().toArray());
-		assertArrayEquals(new String[] {"*"}, config.getAllowedOrigins().toArray());
-		assertNull(config.getAllowCredentials());
-		assertArrayEquals(new String[] {"*"}, config.getAllowedHeaders().toArray());
-		assertTrue(CollectionUtils.isEmpty(config.getExposedHeaders()));
-		assertEquals(new Long(1800), config.getMaxAge());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"GET"});
+		assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[] {"*"});
+		assertThat(config.getAllowCredentials()).isNull();
+		assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] {"*"});
+		assertThat(CollectionUtils.isEmpty(config.getExposedHeaders())).isTrue();
+		assertThat(config.getMaxAge()).isEqualTo(new Long(1800));
 	}
 
 	@Test
@@ -259,13 +254,13 @@ public class CrossOriginTests {
 		this.request.setRequestURI("/ambiguous-header");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
 		CorsConfiguration config = getCorsConfiguration(chain, true);
-		assertNotNull(config);
-		assertArrayEquals(new String[] {"*"}, config.getAllowedMethods().toArray());
-		assertArrayEquals(new String[] {"*"}, config.getAllowedOrigins().toArray());
-		assertArrayEquals(new String[] {"*"}, config.getAllowedHeaders().toArray());
-		assertTrue(config.getAllowCredentials());
-		assertTrue(CollectionUtils.isEmpty(config.getExposedHeaders()));
-		assertNull(config.getMaxAge());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"*"});
+		assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[] {"*"});
+		assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] {"*"});
+		assertThat((boolean) config.getAllowCredentials()).isTrue();
+		assertThat(CollectionUtils.isEmpty(config.getExposedHeaders())).isTrue();
+		assertThat(config.getMaxAge()).isNull();
 	}
 
 	@Test
@@ -276,27 +271,27 @@ public class CrossOriginTests {
 		this.request.setRequestURI("/ambiguous-produces");
 		HandlerExecutionChain chain = this.handlerMapping.getHandler(request);
 		CorsConfiguration config = getCorsConfiguration(chain, true);
-		assertNotNull(config);
-		assertArrayEquals(new String[] {"*"}, config.getAllowedMethods().toArray());
-		assertArrayEquals(new String[] {"*"}, config.getAllowedOrigins().toArray());
-		assertArrayEquals(new String[] {"*"}, config.getAllowedHeaders().toArray());
-		assertTrue(config.getAllowCredentials());
-		assertTrue(CollectionUtils.isEmpty(config.getExposedHeaders()));
-		assertNull(config.getMaxAge());
+		assertThat(config).isNotNull();
+		assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"*"});
+		assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[] {"*"});
+		assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] {"*"});
+		assertThat((boolean) config.getAllowCredentials()).isTrue();
+		assertThat(CollectionUtils.isEmpty(config.getExposedHeaders())).isTrue();
+		assertThat(config.getMaxAge()).isNull();
 	}
 
 	@Test
 	public void preFlightRequestWithoutRequestMethodHeader() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest("OPTIONS", "/default");
 		request.addHeader(HttpHeaders.ORIGIN, "https://domain2.com");
-		assertNull(this.handlerMapping.getHandler(request));
+		assertThat(this.handlerMapping.getHandler(request)).isNull();
 	}
 
 
 	private CorsConfiguration getCorsConfiguration(HandlerExecutionChain chain, boolean isPreFlightRequest) {
 		if (isPreFlightRequest) {
 			Object handler = chain.getHandler();
-			assertTrue(handler.getClass().getSimpleName().equals("PreFlightHandler"));
+			assertThat(handler.getClass().getSimpleName().equals("PreFlightHandler")).isTrue();
 			DirectFieldAccessor accessor = new DirectFieldAccessor(handler);
 			return (CorsConfiguration)accessor.getPropertyValue("config");
 		}

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java

@@ -34,9 +34,7 @@ import org.springframework.web.context.request.async.StandardServletAsyncWebRequ
 import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.web.method.ResolvableMethod.on;
 
 /**
@@ -68,19 +66,19 @@ public class DeferredResultReturnValueHandlerTests {
 
 	@Test
 	public void supportsReturnType() throws Exception {
-		assertTrue(this.handler.supportsReturnType(
-				on(TestController.class).resolveReturnType(DeferredResult.class, String.class)));
+		assertThat(this.handler.supportsReturnType(
+				on(TestController.class).resolveReturnType(DeferredResult.class, String.class))).isTrue();
 
-		assertTrue(this.handler.supportsReturnType(
-				on(TestController.class).resolveReturnType(ListenableFuture.class, String.class)));
+		assertThat(this.handler.supportsReturnType(
+				on(TestController.class).resolveReturnType(ListenableFuture.class, String.class))).isTrue();
 
-		assertTrue(this.handler.supportsReturnType(
-				on(TestController.class).resolveReturnType(CompletableFuture.class, String.class)));
+		assertThat(this.handler.supportsReturnType(
+				on(TestController.class).resolveReturnType(CompletableFuture.class, String.class))).isTrue();
 	}
 
 	@Test
 	public void doesNotSupportReturnType() throws Exception {
-		assertFalse(this.handler.supportsReturnType(on(TestController.class).resolveReturnType(String.class)));
+		assertThat(this.handler.supportsReturnType(on(TestController.class).resolveReturnType(String.class))).isFalse();
 	}
 
 	@Test
@@ -130,13 +128,13 @@ public class DeferredResultReturnValueHandlerTests {
 		MethodParameter returnType = on(TestController.class).resolveReturnType(asyncType, String.class);
 		this.handler.handleReturnValue(returnValue, returnType, mavContainer, this.webRequest);
 
-		assertTrue(this.request.isAsyncStarted());
-		assertFalse(WebAsyncUtils.getAsyncManager(this.webRequest).hasConcurrentResult());
+		assertThat(this.request.isAsyncStarted()).isTrue();
+		assertThat(WebAsyncUtils.getAsyncManager(this.webRequest).hasConcurrentResult()).isFalse();
 
 		setResultTask.run();
 
-		assertTrue(WebAsyncUtils.getAsyncManager(this.webRequest).hasConcurrentResult());
-		assertEquals(expectedValue, WebAsyncUtils.getAsyncManager(this.webRequest).getConcurrentResult());
+		assertThat(WebAsyncUtils.getAsyncManager(this.webRequest).hasConcurrentResult()).isTrue();
+		assertThat(WebAsyncUtils.getAsyncManager(this.webRequest).getConcurrentResult()).isEqualTo(expectedValue);
 	}
 
 

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

@@ -50,11 +50,7 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.util.NestedServletException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture with {@link ExceptionHandlerExceptionResolver}.
@@ -102,7 +98,7 @@ public class ExceptionHandlerExceptionResolverTests {
 		Object handler = null;
 		this.resolver.afterPropertiesSet();
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handler, null);
-		assertNull("Exception can be resolved only if there is a HandlerMethod", mav);
+		assertThat(mav).as("Exception can be resolved only if there is a HandlerMethod").isNull();
 	}
 
 	@Test
@@ -111,7 +107,7 @@ public class ExceptionHandlerExceptionResolverTests {
 		this.resolver.setCustomArgumentResolvers(Collections.singletonList(resolver));
 		this.resolver.afterPropertiesSet();
 
-		assertTrue(this.resolver.getArgumentResolvers().getResolvers().contains(resolver));
+		assertThat(this.resolver.getArgumentResolvers().getResolvers().contains(resolver)).isTrue();
 		assertMethodProcessorCount(RESOLVER_COUNT + 1, HANDLER_COUNT);
 	}
 
@@ -130,7 +126,7 @@ public class ExceptionHandlerExceptionResolverTests {
 		this.resolver.setCustomReturnValueHandlers(Collections.singletonList(handler));
 		this.resolver.afterPropertiesSet();
 
-		assertTrue(this.resolver.getReturnValueHandlers().getHandlers().contains(handler));
+		assertThat(this.resolver.getReturnValueHandlers().getHandlers().contains(handler)).isTrue();
 		assertMethodProcessorCount(RESOLVER_COUNT, HANDLER_COUNT + 1);
 	}
 
@@ -150,7 +146,7 @@ public class ExceptionHandlerExceptionResolverTests {
 		this.resolver.afterPropertiesSet();
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, npe);
 
-		assertNull("NPE should not have been handled", mav);
+		assertThat(mav).as("NPE should not have been handled").isNull();
 	}
 
 	@Test
@@ -160,10 +156,10 @@ public class ExceptionHandlerExceptionResolverTests {
 		this.resolver.afterPropertiesSet();
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex);
 
-		assertNotNull(mav);
-		assertFalse(mav.isEmpty());
-		assertEquals("errorView", mav.getViewName());
-		assertEquals("Bad argument", mav.getModel().get("detail"));
+		assertThat(mav).isNotNull();
+		assertThat(mav.isEmpty()).isFalse();
+		assertThat(mav.getViewName()).isEqualTo("errorView");
+		assertThat(mav.getModel().get("detail")).isEqualTo("Bad argument");
 	}
 
 	@Test
@@ -173,9 +169,9 @@ public class ExceptionHandlerExceptionResolverTests {
 		this.resolver.afterPropertiesSet();
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex);
 
-		assertNotNull(mav);
-		assertTrue(mav.isEmpty());
-		assertEquals("IllegalArgumentException", this.response.getContentAsString());
+		assertThat(mav).isNotNull();
+		assertThat(mav.isEmpty()).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo("IllegalArgumentException");
 	}
 
 	@Test
@@ -185,9 +181,9 @@ public class ExceptionHandlerExceptionResolverTests {
 		this.resolver.afterPropertiesSet();
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex);
 
-		assertNotNull(mav);
-		assertTrue(mav.isEmpty());
-		assertEquals("IllegalArgumentException", this.response.getContentAsString());
+		assertThat(mav).isNotNull();
+		assertThat(mav.isEmpty()).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo("IllegalArgumentException");
 	}
 
 	@Test  // SPR-13546
@@ -197,9 +193,9 @@ public class ExceptionHandlerExceptionResolverTests {
 		this.resolver.afterPropertiesSet();
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex);
 
-		assertNotNull(mav);
-		assertEquals(1, mav.getModelMap().size());
-		assertEquals("IllegalArgumentException", mav.getModelMap().get("exceptionClassName"));
+		assertThat(mav).isNotNull();
+		assertThat(mav.getModelMap().size()).isEqualTo(1);
+		assertThat(mav.getModelMap().get("exceptionClassName")).isEqualTo("IllegalArgumentException");
 	}
 
 	@Test  // SPR-14651
@@ -209,11 +205,11 @@ public class ExceptionHandlerExceptionResolverTests {
 		this.resolver.afterPropertiesSet();
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex);
 
-		assertNotNull(mav);
-		assertEquals("redirect:/", mav.getViewName());
+		assertThat(mav).isNotNull();
+		assertThat(mav.getViewName()).isEqualTo("redirect:/");
 		FlashMap flashMap = (FlashMap) this.request.getAttribute(DispatcherServlet.OUTPUT_FLASH_MAP_ATTRIBUTE);
-		assertNotNull("output FlashMap should exist", flashMap);
-		assertEquals("IllegalArgumentException", flashMap.get("exceptionClassName"));
+		assertThat((Object) flashMap).as("output FlashMap should exist").isNotNull();
+		assertThat(flashMap.get("exceptionClassName")).isEqualTo("IllegalArgumentException");
 	}
 
 	@Test
@@ -226,9 +222,9 @@ public class ExceptionHandlerExceptionResolverTests {
 		HandlerMethod handlerMethod = new HandlerMethod(new ResponseBodyController(), "handle");
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex);
 
-		assertNotNull("Exception was not handled", mav);
-		assertTrue(mav.isEmpty());
-		assertEquals("AnotherTestExceptionResolver: IllegalAccessException", this.response.getContentAsString());
+		assertThat(mav).as("Exception was not handled").isNotNull();
+		assertThat(mav.isEmpty()).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo("AnotherTestExceptionResolver: IllegalAccessException");
 	}
 
 	@Test
@@ -241,9 +237,9 @@ public class ExceptionHandlerExceptionResolverTests {
 		HandlerMethod handlerMethod = new HandlerMethod(new ResponseBodyController(), "handle");
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex);
 
-		assertNotNull("Exception was not handled", mav);
-		assertTrue(mav.isEmpty());
-		assertEquals("TestExceptionResolver: IllegalStateException", this.response.getContentAsString());
+		assertThat(mav).as("Exception was not handled").isNotNull();
+		assertThat(mav.isEmpty()).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo("TestExceptionResolver: IllegalStateException");
 	}
 
 	@Test  // SPR-12605
@@ -256,9 +252,9 @@ public class ExceptionHandlerExceptionResolverTests {
 		HandlerMethod handlerMethod = new HandlerMethod(new ResponseBodyController(), "handle");
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex);
 
-		assertNotNull("Exception was not handled", mav);
-		assertTrue(mav.isEmpty());
-		assertEquals("HandlerMethod: handle", this.response.getContentAsString());
+		assertThat(mav).as("Exception was not handled").isNotNull();
+		assertThat(mav.isEmpty()).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo("HandlerMethod: handle");
 	}
 
 	@Test
@@ -272,9 +268,9 @@ public class ExceptionHandlerExceptionResolverTests {
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod,
 				new NestedServletException("Handler dispatch failed", err));
 
-		assertNotNull("Exception was not handled", mav);
-		assertTrue(mav.isEmpty());
-		assertEquals(err.toString(), this.response.getContentAsString());
+		assertThat(mav).as("Exception was not handled").isNotNull();
+		assertThat(mav.isEmpty()).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo(err.toString());
 	}
 
 	@Test
@@ -288,9 +284,9 @@ public class ExceptionHandlerExceptionResolverTests {
 		HandlerMethod handlerMethod = new HandlerMethod(new ResponseBodyController(), "handle");
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex);
 
-		assertNotNull("Exception was not handled", mav);
-		assertTrue(mav.isEmpty());
-		assertEquals(err.toString(), this.response.getContentAsString());
+		assertThat(mav).as("Exception was not handled").isNotNull();
+		assertThat(mav.isEmpty()).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo(err.toString());
 	}
 
 	@Test
@@ -303,9 +299,9 @@ public class ExceptionHandlerExceptionResolverTests {
 		HandlerMethod handlerMethod = new HandlerMethod(new ResponseBodyController(), "handle");
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex);
 
-		assertNotNull("Exception was not handled", mav);
-		assertTrue(mav.isEmpty());
-		assertEquals("BasePackageTestExceptionResolver: IllegalStateException", this.response.getContentAsString());
+		assertThat(mav).as("Exception was not handled").isNotNull();
+		assertThat(mav.isEmpty()).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo("BasePackageTestExceptionResolver: IllegalStateException");
 	}
 
 	@Test
@@ -317,9 +313,9 @@ public class ExceptionHandlerExceptionResolverTests {
 		IllegalStateException ex = new IllegalStateException();
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, null, ex);
 
-		assertNotNull("Exception was not handled", mav);
-		assertTrue(mav.isEmpty());
-		assertEquals("DefaultTestExceptionResolver: IllegalStateException", this.response.getContentAsString());
+		assertThat(mav).as("Exception was not handled").isNotNull();
+		assertThat(mav.isEmpty()).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo("DefaultTestExceptionResolver: IllegalStateException");
 	}
 
 	@Test  // SPR-16496
@@ -332,15 +328,15 @@ public class ExceptionHandlerExceptionResolverTests {
 		HandlerMethod handlerMethod = new HandlerMethod(new ProxyFactory(new ResponseBodyController()).getProxy(), "handle");
 		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex);
 
-		assertNotNull("Exception was not handled", mav);
-		assertTrue(mav.isEmpty());
-		assertEquals("BasePackageTestExceptionResolver: IllegalStateException", this.response.getContentAsString());
+		assertThat(mav).as("Exception was not handled").isNotNull();
+		assertThat(mav.isEmpty()).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo("BasePackageTestExceptionResolver: IllegalStateException");
 	}
 
 
 	private void assertMethodProcessorCount(int resolverCount, int handlerCount) {
-		assertEquals(resolverCount, this.resolver.getArgumentResolvers().getResolvers().size());
-		assertEquals(handlerCount, this.resolver.getReturnValueHandlers().getHandlers().size());
+		assertThat(this.resolver.getArgumentResolvers().getResolvers().size()).isEqualTo(resolverCount);
+		assertThat(this.resolver.getReturnValueHandlers().getHandlers().size()).isEqualTo(handlerCount);
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java

@@ -28,7 +28,7 @@ import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.servlet.HandlerMapping;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture for {@link ExtendedServletRequestDataBinder}.
@@ -55,8 +55,8 @@ public class ExtendedServletRequestDataBinderTests {
 		WebDataBinder binder = new ExtendedServletRequestDataBinder(target, "");
 		((ServletRequestDataBinder) binder).bind(request);
 
-		assertEquals("nameValue", target.getName());
-		assertEquals(25, target.getAge());
+		assertThat(target.getName()).isEqualTo("nameValue");
+		assertThat(target.getAge()).isEqualTo(25);
 	}
 
 	@Test
@@ -72,8 +72,8 @@ public class ExtendedServletRequestDataBinderTests {
 		WebDataBinder binder = new ExtendedServletRequestDataBinder(target, "");
 		((ServletRequestDataBinder) binder).bind(request);
 
-		assertEquals("nameValue", target.getName());
-		assertEquals(35, target.getAge());
+		assertThat(target.getName()).isEqualTo("nameValue");
+		assertThat(target.getAge()).isEqualTo(35);
 	}
 
 	@Test
@@ -82,8 +82,8 @@ public class ExtendedServletRequestDataBinderTests {
 		WebDataBinder binder = new ExtendedServletRequestDataBinder(target, "");
 		((ServletRequestDataBinder) binder).bind(request);
 
-		assertEquals(null, target.getName());
-		assertEquals(0, target.getAge());
+		assertThat(target.getName()).isEqualTo(null);
+		assertThat(target.getAge()).isEqualTo(0);
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java

@@ -50,8 +50,7 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
 import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.ModelAndView;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test various scenarios for detecting method-level and method parameter annotations depending
@@ -134,17 +133,17 @@ public class HandlerMethodAnnotationDetectionTests {
 		request.addHeader("header2", dateB);
 
 		HandlerExecutionChain chain = handlerMapping.getHandler(request);
-		assertNotNull(chain);
+		assertThat(chain).isNotNull();
 
 		ModelAndView mav = handlerAdapter.handle(request, new MockHttpServletResponse(), chain.getHandler());
 
-		assertEquals("model attr1:", dateFormat.parse(dateA), mav.getModel().get("attr1"));
-		assertEquals("model attr2:", dateFormat.parse(dateB), mav.getModel().get("attr2"));
+		assertThat(mav.getModel().get("attr1")).as("model attr1:").isEqualTo(dateFormat.parse(dateA));
+		assertThat(mav.getModel().get("attr2")).as("model attr2:").isEqualTo(dateFormat.parse(dateB));
 
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		exceptionResolver.resolveException(request, response, chain.getHandler(), new Exception("failure"));
-		assertEquals("text/plain;charset=ISO-8859-1", response.getHeader("Content-Type"));
-		assertEquals("failure", response.getContentAsString());
+		assertThat(response.getHeader("Content-Type")).isEqualTo("text/plain;charset=ISO-8859-1");
+		assertThat(response.getContentAsString()).isEqualTo("failure");
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java

@@ -59,9 +59,6 @@ import static java.time.Instant.ofEpochMilli;
 import static java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyCollection;
 import static org.mockito.ArgumentMatchers.argThat;
@@ -172,20 +169,19 @@ public class HttpEntityMethodProcessorMockTests {
 
 	@Test
 	public void supportsParameter() {
-		assertTrue("HttpEntity parameter not supported", processor.supportsParameter(paramHttpEntity));
-		assertTrue("RequestEntity parameter not supported", processor.supportsParameter(paramRequestEntity));
-		assertFalse("ResponseEntity parameter supported", processor.supportsParameter(paramResponseEntity));
-		assertFalse("non-entity parameter supported", processor.supportsParameter(paramInt));
+		assertThat(processor.supportsParameter(paramHttpEntity)).as("HttpEntity parameter not supported").isTrue();
+		assertThat(processor.supportsParameter(paramRequestEntity)).as("RequestEntity parameter not supported").isTrue();
+		assertThat(processor.supportsParameter(paramResponseEntity)).as("ResponseEntity parameter supported").isFalse();
+		assertThat(processor.supportsParameter(paramInt)).as("non-entity parameter supported").isFalse();
 	}
 
 	@Test
 	public void supportsReturnType() {
-		assertTrue("ResponseEntity return type not supported", processor.supportsReturnType(returnTypeResponseEntity));
-		assertTrue("HttpEntity return type not supported", processor.supportsReturnType(returnTypeHttpEntity));
-		assertTrue("Custom HttpEntity subclass not supported", processor.supportsReturnType(returnTypeHttpEntitySubclass));
-		assertFalse("RequestEntity parameter supported",
-				processor.supportsReturnType(paramRequestEntity));
-		assertFalse("non-ResponseBody return type supported", processor.supportsReturnType(returnTypeInt));
+		assertThat(processor.supportsReturnType(returnTypeResponseEntity)).as("ResponseEntity return type not supported").isTrue();
+		assertThat(processor.supportsReturnType(returnTypeHttpEntity)).as("HttpEntity return type not supported").isTrue();
+		assertThat(processor.supportsReturnType(returnTypeHttpEntitySubclass)).as("Custom HttpEntity subclass not supported").isTrue();
+		assertThat(processor.supportsReturnType(paramRequestEntity)).as("RequestEntity parameter supported").isFalse();
+		assertThat(processor.supportsReturnType(returnTypeInt)).as("non-ResponseBody return type supported").isFalse();
 	}
 
 	@Test
@@ -201,9 +197,9 @@ public class HttpEntityMethodProcessorMockTests {
 
 		Object result = processor.resolveArgument(paramHttpEntity, mavContainer, webRequest, null);
 
-		assertTrue(result instanceof HttpEntity);
-		assertFalse("The requestHandled flag shouldn't change", mavContainer.isRequestHandled());
-		assertEquals("Invalid argument", body, ((HttpEntity<?>) result).getBody());
+		assertThat(result instanceof HttpEntity).isTrue();
+		assertThat(mavContainer.isRequestHandled()).as("The requestHandled flag shouldn't change").isFalse();
+		assertThat(((HttpEntity<?>) result).getBody()).as("Invalid argument").isEqualTo(body);
 	}
 
 	@Test
@@ -223,14 +219,14 @@ public class HttpEntityMethodProcessorMockTests {
 
 		Object result = processor.resolveArgument(paramRequestEntity, mavContainer, webRequest, null);
 
-		assertTrue(result instanceof RequestEntity);
-		assertFalse("The requestHandled flag shouldn't change", mavContainer.isRequestHandled());
+		assertThat(result instanceof RequestEntity).isTrue();
+		assertThat(mavContainer.isRequestHandled()).as("The requestHandled flag shouldn't change").isFalse();
 		RequestEntity<?> requestEntity = (RequestEntity<?>) result;
-		assertEquals("Invalid method", HttpMethod.GET, requestEntity.getMethod());
+		assertThat(requestEntity.getMethod()).as("Invalid method").isEqualTo(HttpMethod.GET);
 		// using default port (which is 80), so do not need to append the port (-1 means ignore)
 		URI uri = new URI("http", null, "www.example.com", -1, "/path", null, null);
-		assertEquals("Invalid url", uri, requestEntity.getUrl());
-		assertEquals("Invalid argument", body, requestEntity.getBody());
+		assertThat(requestEntity.getUrl()).as("Invalid url").isEqualTo(uri);
+		assertThat(requestEntity.getBody()).as("Invalid argument").isEqualTo(body);
 	}
 
 	@Test
@@ -264,7 +260,7 @@ public class HttpEntityMethodProcessorMockTests {
 
 		processor.handleReturnValue(returnValue, returnTypeResponseEntity, mavContainer, webRequest);
 
-		assertTrue(mavContainer.isRequestHandled());
+		assertThat(mavContainer.isRequestHandled()).isTrue();
 		verify(stringHttpMessageConverter).write(eq(body), eq(accepted), isA(HttpOutputMessage.class));
 	}
 
@@ -278,7 +274,7 @@ public class HttpEntityMethodProcessorMockTests {
 
 		processor.handleReturnValue(returnValue, returnTypeResponseEntityProduces, mavContainer, webRequest);
 
-		assertTrue(mavContainer.isRequestHandled());
+		assertThat(mavContainer.isRequestHandled()).isTrue();
 		verify(stringHttpMessageConverter).write(eq(body), eq(MediaType.TEXT_HTML), isA(HttpOutputMessage.class));
 	}
 
@@ -300,7 +296,7 @@ public class HttpEntityMethodProcessorMockTests {
 
 		processor.handleReturnValue(returnValue, returnTypeResponseEntity, mavContainer, webRequest);
 
-		assertTrue(mavContainer.isRequestHandled());
+		assertThat(mavContainer.isRequestHandled()).isTrue();
 		verify(stringHttpMessageConverter).write(eq("Foo"), eq(MediaType.TEXT_HTML), isA(HttpOutputMessage.class));
 	}
 
@@ -352,8 +348,8 @@ public class HttpEntityMethodProcessorMockTests {
 
 		processor.handleReturnValue(returnValue, returnTypeResponseEntity, mavContainer, webRequest);
 
-		assertTrue(mavContainer.isRequestHandled());
-		assertEquals("headerValue", servletResponse.getHeader("headerName"));
+		assertThat(mavContainer.isRequestHandled()).isTrue();
+		assertThat(servletResponse.getHeader("headerName")).isEqualTo("headerValue");
 	}
 
 	@Test
@@ -367,8 +363,8 @@ public class HttpEntityMethodProcessorMockTests {
 
 		ArgumentCaptor<HttpOutputMessage> outputMessage = ArgumentCaptor.forClass(HttpOutputMessage.class);
 		verify(stringHttpMessageConverter).write(eq("body"), eq(TEXT_PLAIN), outputMessage.capture());
-		assertTrue(mavContainer.isRequestHandled());
-		assertEquals("headerValue", outputMessage.getValue().getHeaders().get("header").get(0));
+		assertThat(mavContainer.isRequestHandled()).isTrue();
+		assertThat(outputMessage.getValue().getHeaders().get("header").get(0)).isEqualTo("headerValue");
 	}
 
 	@Test
@@ -525,7 +521,7 @@ public class HttpEntityMethodProcessorMockTests {
 
 		then(resourceMessageConverter).should(times(1)).write(
 				any(ByteArrayResource.class), eq(APPLICATION_OCTET_STREAM), any(HttpOutputMessage.class));
-		assertEquals(200, servletResponse.getStatus());
+		assertThat(servletResponse.getStatus()).isEqualTo(200);
 	}
 
 	@Test
@@ -542,7 +538,7 @@ public class HttpEntityMethodProcessorMockTests {
 		then(resourceRegionMessageConverter).should(times(1)).write(
 				anyCollection(), eq(APPLICATION_OCTET_STREAM),
 				argThat(outputMessage -> "bytes".equals(outputMessage.getHeaders().getFirst(HttpHeaders.ACCEPT_RANGES))));
-		assertEquals(206, servletResponse.getStatus());
+		assertThat(servletResponse.getStatus()).isEqualTo(206);
 	}
 
 	@Test
@@ -558,7 +554,7 @@ public class HttpEntityMethodProcessorMockTests {
 
 		then(resourceRegionMessageConverter).should(never()).write(
 				anyCollection(), eq(APPLICATION_OCTET_STREAM), any(HttpOutputMessage.class));
-		assertEquals(416, servletResponse.getStatus());
+		assertThat(servletResponse.getStatus()).isEqualTo(416);
 	}
 
 	@Test //SPR-16754
@@ -574,7 +570,7 @@ public class HttpEntityMethodProcessorMockTests {
 		processor.handleReturnValue(returnValue, returnTypeResponseEntityResource, mavContainer, webRequest);
 		then(resourceMessageConverter).should(times(1)).write(
 				any(InputStreamResource.class), eq(APPLICATION_OCTET_STREAM), any(HttpOutputMessage.class));
-		assertEquals(200, servletResponse.getStatus());
+		assertThat(servletResponse.getStatus()).isEqualTo(200);
 		assertThat(servletResponse.getHeader(HttpHeaders.ACCEPT_RANGES)).isNull();
 	}
 
@@ -591,7 +587,7 @@ public class HttpEntityMethodProcessorMockTests {
 		processor.handleReturnValue(returnValue, returnTypeResponseEntityResource, mavContainer, webRequest);
 
 		then(resourceRegionMessageConverter).should(never()).write(anyCollection(), any(), any());
-		assertEquals(206, servletResponse.getStatus());
+		assertThat(servletResponse.getStatus()).isEqualTo(206);
 	}
 
 	@Test  //SPR-14767
@@ -670,8 +666,8 @@ public class HttpEntityMethodProcessorMockTests {
 		initStringMessageConversion(TEXT_PLAIN);
 		processor.handleReturnValue(returnValue, returnTypeResponseEntity, mavContainer, webRequest);
 
-		assertTrue(mavContainer.isRequestHandled());
-		assertEquals(Arrays.asList(expected), servletResponse.getHeaders("Vary"));
+		assertThat(mavContainer.isRequestHandled()).isTrue();
+		assertThat(servletResponse.getHeaders("Vary")).isEqualTo(Arrays.asList(expected));
 		verify(stringHttpMessageConverter).write(eq("Foo"), eq(TEXT_PLAIN), isA(HttpOutputMessage.class));
 	}
 
@@ -689,21 +685,21 @@ public class HttpEntityMethodProcessorMockTests {
 	private void assertConditionalResponse(HttpStatus status, String body, String etag, long lastModified)
 			throws IOException {
 
-		assertEquals(status.value(), servletResponse.getStatus());
-		assertTrue(mavContainer.isRequestHandled());
+		assertThat(servletResponse.getStatus()).isEqualTo(status.value());
+		assertThat(mavContainer.isRequestHandled()).isTrue();
 		if (body != null) {
 			assertResponseBody(body);
 		}
 		else {
-			assertEquals(0, servletResponse.getContentAsByteArray().length);
+			assertThat(servletResponse.getContentAsByteArray().length).isEqualTo(0);
 		}
 		if (etag != null) {
-			assertEquals(1, servletResponse.getHeaderValues(HttpHeaders.ETAG).size());
-			assertEquals(etag, servletResponse.getHeader(HttpHeaders.ETAG));
+			assertThat(servletResponse.getHeaderValues(HttpHeaders.ETAG).size()).isEqualTo(1);
+			assertThat(servletResponse.getHeader(HttpHeaders.ETAG)).isEqualTo(etag);
 		}
 		if (lastModified != -1) {
-			assertEquals(1, servletResponse.getHeaderValues(HttpHeaders.LAST_MODIFIED).size());
-			assertEquals(lastModified / 1000, servletResponse.getDateHeader(HttpHeaders.LAST_MODIFIED) / 1000);
+			assertThat(servletResponse.getHeaderValues(HttpHeaders.LAST_MODIFIED).size()).isEqualTo(1);
+			assertThat((servletResponse.getDateHeader(HttpHeaders.LAST_MODIFIED) / 1000)).isEqualTo((lastModified / 1000));
 		}
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java

@@ -47,10 +47,7 @@ import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture with {@link HttpEntityMethodProcessor} delegating to
@@ -107,8 +104,8 @@ public class HttpEntityMethodProcessorTests {
 		HttpEntity<SimpleBean> result = (HttpEntity<SimpleBean>) processor.resolveArgument(
 				paramSimpleBean, mavContainer, webRequest, binderFactory);
 
-		assertNotNull(result);
-		assertEquals("Jad", result.getBody().getName());
+		assertThat(result).isNotNull();
+		assertThat(result.getBody().getName()).isEqualTo("Jad");
 	}
 
 	@Test  // SPR-12861
@@ -123,8 +120,8 @@ public class HttpEntityMethodProcessorTests {
 		HttpEntity<?> result = (HttpEntity<?>) processor.resolveArgument(this.paramSimpleBean,
 				this.mavContainer, this.webRequest, this.binderFactory);
 
-		assertNotNull(result);
-		assertNull(result.getBody());
+		assertThat(result).isNotNull();
+		assertThat(result.getBody()).isNull();
 	}
 
 	@Test
@@ -141,9 +138,9 @@ public class HttpEntityMethodProcessorTests {
 		HttpEntity<List<SimpleBean>> result = (HttpEntity<List<SimpleBean>>) processor.resolveArgument(
 				paramList, mavContainer, webRequest, binderFactory);
 
-		assertNotNull(result);
-		assertEquals("Jad", result.getBody().get(0).getName());
-		assertEquals("Robert", result.getBody().get(1).getName());
+		assertThat(result).isNotNull();
+		assertThat(result.getBody().get(0).getName()).isEqualTo("Jad");
+		assertThat(result.getBody().get(1).getName()).isEqualTo("Robert");
 	}
 
 	@Test
@@ -164,8 +161,8 @@ public class HttpEntityMethodProcessorTests {
 		HttpEntity<SimpleBean> result = (HttpEntity<SimpleBean>)
 				processor.resolveArgument(methodParam, mavContainer, webRequest, binderFactory);
 
-		assertNotNull(result);
-		assertEquals("Jad", result.getBody().getName());
+		assertThat(result).isNotNull();
+		assertThat(result.getBody().getName()).isEqualTo("Jad");
 	}
 
 	@Test  // SPR-12811
@@ -182,8 +179,8 @@ public class HttpEntityMethodProcessorTests {
 		processor.handleReturnValue(returnValue, methodReturnType, this.mavContainer, this.webRequest);
 
 		String content = this.servletResponse.getContentAsString();
-		assertTrue(content.contains("\"type\":\"foo\""));
-		assertTrue(content.contains("\"type\":\"bar\""));
+		assertThat(content.contains("\"type\":\"foo\"")).isTrue();
+		assertThat(content.contains("\"type\":\"bar\"")).isTrue();
 	}
 
 	@Test  // SPR-13423
@@ -199,8 +196,8 @@ public class HttpEntityMethodProcessorTests {
 		HttpEntityMethodProcessor processor = new HttpEntityMethodProcessor(converters);
 		processor.handleReturnValue(returnValue, returnType, mavContainer, webRequest);
 
-		assertEquals("text/plain;charset=ISO-8859-1", servletResponse.getHeader("Content-Type"));
-		assertEquals("Foo", servletResponse.getContentAsString());
+		assertThat(servletResponse.getHeader("Content-Type")).isEqualTo("text/plain;charset=ISO-8859-1");
+		assertThat(servletResponse.getContentAsString()).isEqualTo("Foo");
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariablesMapMethodArgumentResolverTests.java

@@ -35,9 +35,7 @@ import org.springframework.web.method.ResolvableMethod;
 import org.springframework.web.method.support.ModelAndViewContainer;
 import org.springframework.web.servlet.HandlerMapping;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.web.method.MvcAnnotationPredicates.matrixAttribute;
 
 /**
@@ -73,19 +71,19 @@ public class MatrixVariablesMapMethodArgumentResolverTests {
 	@Test
 	public void supportsParameter() {
 
-		assertFalse(this.resolver.supportsParameter(this.testMethod.arg(String.class)));
+		assertThat(this.resolver.supportsParameter(this.testMethod.arg(String.class))).isFalse();
 
-		assertTrue(this.resolver.supportsParameter(this.testMethod.annot(matrixAttribute().noName())
-				.arg(Map.class, String.class, String.class)));
+		assertThat(this.resolver.supportsParameter(this.testMethod.annot(matrixAttribute().noName())
+				.arg(Map.class, String.class, String.class))).isTrue();
 
-		assertTrue(this.resolver.supportsParameter(this.testMethod.annot(matrixAttribute().noPathVar())
-				.arg(MultiValueMap.class, String.class, String.class)));
+		assertThat(this.resolver.supportsParameter(this.testMethod.annot(matrixAttribute().noPathVar())
+				.arg(MultiValueMap.class, String.class, String.class))).isTrue();
 
-		assertTrue(this.resolver.supportsParameter(this.testMethod.annot(matrixAttribute().pathVar("cars"))
-				.arg(MultiValueMap.class, String.class, String.class)));
+		assertThat(this.resolver.supportsParameter(this.testMethod.annot(matrixAttribute().pathVar("cars"))
+				.arg(MultiValueMap.class, String.class, String.class))).isTrue();
 
-		assertFalse(this.resolver.supportsParameter(this.testMethod.annot(matrixAttribute().name("name"))
-				.arg(Map.class, String.class, String.class)));
+		assertThat(this.resolver.supportsParameter(this.testMethod.annot(matrixAttribute().name("name"))
+				.arg(Map.class, String.class, String.class))).isFalse();
 	}
 
 	@Test
@@ -103,7 +101,7 @@ public class MatrixVariablesMapMethodArgumentResolverTests {
 		Map<String, String> map = (Map<String, String>)
 				this.resolver.resolveArgument(param, this.mavContainer, this.webRequest, null);
 
-		assertEquals("red", map.get("colors"));
+		assertThat(map.get("colors")).isEqualTo("red");
 
 		param = this.testMethod
 				.annot(matrixAttribute().noPathVar())
@@ -113,7 +111,7 @@ public class MatrixVariablesMapMethodArgumentResolverTests {
 		MultiValueMap<String, String> multivalueMap = (MultiValueMap<String, String>)
 				this.resolver.resolveArgument(param, this.mavContainer, this.webRequest, null);
 
-		assertEquals(Arrays.asList("red", "green", "blue"), multivalueMap.get("colors"));
+		assertThat(multivalueMap.get("colors")).isEqualTo(Arrays.asList("red", "green", "blue"));
 	}
 
 	@Test
@@ -130,10 +128,10 @@ public class MatrixVariablesMapMethodArgumentResolverTests {
 				.arg(MultiValueMap.class, String.class, String.class);
 
 		@SuppressWarnings("unchecked")
-		Map<String, String> mapForPathVar = (Map<String, String>) this.resolver.resolveArgument(
+		Map<String, ?> mapForPathVar = (Map<String, ?>) this.resolver.resolveArgument(
 				param, this.mavContainer, this.webRequest, null);
 
-		assertEquals(Arrays.asList("red", "purple"), mapForPathVar.get("colors"));
+		assertThat(mapForPathVar.get("colors")).isEqualTo(Arrays.asList("red", "purple"));
 
 		param = this.testMethod.annot(matrixAttribute().noName()).arg(Map.class, String.class, String.class);
 
@@ -141,7 +139,7 @@ public class MatrixVariablesMapMethodArgumentResolverTests {
 		Map<String, String> mapAll = (Map<String, String>)
 				this.resolver.resolveArgument(param, this.mavContainer, this.webRequest, null);
 
-		assertEquals("red", mapAll.get("colors"));
+		assertThat(mapAll.get("colors")).isEqualTo("red");
 	}
 
 	@Test
@@ -154,7 +152,7 @@ public class MatrixVariablesMapMethodArgumentResolverTests {
 		Map<String, String> map = (Map<String, String>)
 				this.resolver.resolveArgument(param, this.mavContainer, this.webRequest, null);
 
-		assertEquals(Collections.emptyMap(), map);
+		assertThat(map).isEqualTo(Collections.emptyMap());
 	}
 
 	@Test
@@ -170,7 +168,7 @@ public class MatrixVariablesMapMethodArgumentResolverTests {
 		Map<String, String> map = (Map<String, String>)
 				this.resolver.resolveArgument(param, this.mavContainer, this.webRequest, null);
 
-		assertEquals(Collections.emptyMap(), map);
+		assertThat(map).isEqualTo(Collections.emptyMap());
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariablesMethodArgumentResolverTests.java

@@ -36,10 +36,8 @@ import org.springframework.web.method.ResolvableMethod;
 import org.springframework.web.method.support.ModelAndViewContainer;
 import org.springframework.web.servlet.HandlerMapping;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.springframework.web.method.MvcAnnotationPredicates.matrixAttribute;
 
 /**
@@ -74,13 +72,13 @@ public class MatrixVariablesMethodArgumentResolverTests {
 	@Test
 	public void supportsParameter() {
 
-		assertFalse(this.resolver.supportsParameter(this.testMethod.arg(String.class)));
+		assertThat(this.resolver.supportsParameter(this.testMethod.arg(String.class))).isFalse();
 
-		assertTrue(this.resolver.supportsParameter(
-				this.testMethod.annot(matrixAttribute().noName()).arg(List.class, String.class)));
+		assertThat(this.resolver.supportsParameter(
+				this.testMethod.annot(matrixAttribute().noName()).arg(List.class, String.class))).isTrue();
 
-		assertTrue(this.resolver.supportsParameter(
-				this.testMethod.annot(matrixAttribute().name("year")).arg(int.class)));
+		assertThat(this.resolver.supportsParameter(
+				this.testMethod.annot(matrixAttribute().name("year")).arg(int.class))).isTrue();
 	}
 
 	@Test
@@ -91,8 +89,7 @@ public class MatrixVariablesMethodArgumentResolverTests {
 		params.add("colors", "blue");
 		MethodParameter param = this.testMethod.annot(matrixAttribute().noName()).arg(List.class, String.class);
 
-		assertEquals(Arrays.asList("red", "green", "blue"),
-				this.resolver.resolveArgument(param, this.mavContainer, this.webRequest, null));
+		assertThat(this.resolver.resolveArgument(param, this.mavContainer, this.webRequest, null)).isEqualTo(Arrays.asList("red", "green", "blue"));
 	}
 
 	@Test
@@ -101,13 +98,13 @@ public class MatrixVariablesMethodArgumentResolverTests {
 		getVariablesFor("bikes").add("year", "2005");
 		MethodParameter param = this.testMethod.annot(matrixAttribute().name("year")).arg(int.class);
 
-		assertEquals("2006", this.resolver.resolveArgument(param, this.mavContainer, this.webRequest, null));
+		assertThat(this.resolver.resolveArgument(param, this.mavContainer, this.webRequest, null)).isEqualTo("2006");
 	}
 
 	@Test
 	public void resolveArgumentDefaultValue() throws Exception {
 		MethodParameter param = this.testMethod.annot(matrixAttribute().name("year")).arg(int.class);
-		assertEquals("2013", resolver.resolveArgument(param, this.mavContainer, this.webRequest, null));
+		assertThat(resolver.resolveArgument(param, this.mavContainer, this.webRequest, null)).isEqualTo("2013");
 	}
 
 	@Test
@@ -133,7 +130,7 @@ public class MatrixVariablesMethodArgumentResolverTests {
 		params.add("anotherYear", "2012");
 		MethodParameter param = this.testMethod.annot(matrixAttribute().name("year")).arg(int.class);
 
-		assertEquals("2013", this.resolver.resolveArgument(param, this.mavContainer, this.webRequest, null));
+		assertThat(this.resolver.resolveArgument(param, this.mavContainer, this.webRequest, null)).isEqualTo("2013");
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java

@@ -30,11 +30,7 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributesModelMap;
 import org.springframework.web.servlet.view.RedirectView;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture with {@link ModelAndViewMethodReturnValueHandler}.
@@ -63,8 +59,8 @@ public class ModelAndViewMethodReturnValueHandlerTests {
 
 	@Test
 	public void supportsReturnType() throws Exception {
-		assertTrue(handler.supportsReturnType(returnParamModelAndView));
-		assertFalse(handler.supportsReturnType(getReturnValueParam("viewName")));
+		assertThat(handler.supportsReturnType(returnParamModelAndView)).isTrue();
+		assertThat(handler.supportsReturnType(getReturnValueParam("viewName"))).isFalse();
 	}
 
 	@Test
@@ -72,8 +68,8 @@ public class ModelAndViewMethodReturnValueHandlerTests {
 		ModelAndView mav = new ModelAndView("viewName", "attrName", "attrValue");
 		handler.handleReturnValue(mav, returnParamModelAndView, mavContainer, webRequest);
 
-		assertEquals("viewName", mavContainer.getView());
-		assertEquals("attrValue", mavContainer.getModel().get("attrName"));
+		assertThat(mavContainer.getView()).isEqualTo("viewName");
+		assertThat(mavContainer.getModel().get("attrName")).isEqualTo("attrValue");
 	}
 
 	@Test
@@ -81,15 +77,15 @@ public class ModelAndViewMethodReturnValueHandlerTests {
 		ModelAndView mav = new ModelAndView(new RedirectView(), "attrName", "attrValue");
 		handler.handleReturnValue(mav, returnParamModelAndView, mavContainer, webRequest);
 
-		assertEquals(RedirectView.class, mavContainer.getView().getClass());
-		assertEquals("attrValue", mavContainer.getModel().get("attrName"));
+		assertThat(mavContainer.getView().getClass()).isEqualTo(RedirectView.class);
+		assertThat(mavContainer.getModel().get("attrName")).isEqualTo("attrValue");
 	}
 
 	@Test
 	public void handleNull() throws Exception {
 		handler.handleReturnValue(null, returnParamModelAndView, mavContainer, webRequest);
 
-		assertTrue(mavContainer.isRequestHandled());
+		assertThat(mavContainer.isRequestHandled()).isTrue();
 	}
 
 	@Test
@@ -100,10 +96,9 @@ public class ModelAndViewMethodReturnValueHandlerTests {
 		ModelAndView mav = new ModelAndView(new RedirectView(), "attrName", "attrValue");
 		handler.handleReturnValue(mav, returnParamModelAndView, mavContainer, webRequest);
 
-		assertEquals(RedirectView.class, mavContainer.getView().getClass());
-		assertEquals("attrValue", mavContainer.getModel().get("attrName"));
-		assertSame("RedirectAttributes should be used if controller redirects", redirectAttributes,
-				mavContainer.getModel());
+		assertThat(mavContainer.getView().getClass()).isEqualTo(RedirectView.class);
+		assertThat(mavContainer.getModel().get("attrName")).isEqualTo("attrValue");
+		assertThat(mavContainer.getModel()).as("RedirectAttributes should be used if controller redirects").isSameAs(redirectAttributes);
 	}
 
 	@Test
@@ -115,9 +110,9 @@ public class ModelAndViewMethodReturnValueHandlerTests {
 		handler.handleReturnValue(mav, returnParamModelAndView, mavContainer, webRequest);
 
 		ModelMap model = mavContainer.getModel();
-		assertEquals("redirect:viewName", mavContainer.getViewName());
-		assertEquals("attrValue", model.get("attrName"));
-		assertSame(redirectAttributes, model);
+		assertThat(mavContainer.getViewName()).isEqualTo("redirect:viewName");
+		assertThat(model.get("attrName")).isEqualTo("attrValue");
+		assertThat(model).isSameAs(redirectAttributes);
 	}
 
 	@Test
@@ -130,9 +125,9 @@ public class ModelAndViewMethodReturnValueHandlerTests {
 		handler.handleReturnValue(mav, returnParamModelAndView, mavContainer, webRequest);
 
 		ModelMap model = mavContainer.getModel();
-		assertEquals("myRedirect:viewName", mavContainer.getViewName());
-		assertEquals("attrValue", model.get("attrName"));
-		assertSame(redirectAttributes, model);
+		assertThat(mavContainer.getViewName()).isEqualTo("myRedirect:viewName");
+		assertThat(model.get("attrName")).isEqualTo("attrValue");
+		assertThat(model).isSameAs(redirectAttributes);
 	}
 
 	@Test
@@ -144,9 +139,9 @@ public class ModelAndViewMethodReturnValueHandlerTests {
 		handler.handleReturnValue(mav, returnParamModelAndView, mavContainer, webRequest);
 
 		ModelMap model = mavContainer.getModel();
-		assertEquals(null, mavContainer.getView());
-		assertTrue(mavContainer.getModel().isEmpty());
-		assertNotSame("RedirectAttributes should not be used if controller doesn't redirect", redirectAttributes, model);
+		assertThat(mavContainer.getView()).isEqualTo(null);
+		assertThat(mavContainer.getModel().isEmpty()).isTrue();
+		assertThat(model).as("RedirectAttributes should not be used if controller doesn't redirect").isNotSameAs(redirectAttributes);
 	}
 
 	@Test  // SPR-14045
@@ -158,9 +153,9 @@ public class ModelAndViewMethodReturnValueHandlerTests {
 		handler.handleReturnValue(mav, returnParamModelAndView, mavContainer, webRequest);
 
 		ModelMap model = mavContainer.getModel();
-		assertSame(redirectView, mavContainer.getView());
-		assertEquals(1, model.size());
-		assertEquals("value", model.get("name"));
+		assertThat(mavContainer.getView()).isSameAs(redirectView);
+		assertThat(model.size()).isEqualTo(1);
+		assertThat(model.get("name")).isEqualTo("value");
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java

@@ -33,12 +33,8 @@ import org.springframework.web.method.support.ModelAndViewContainer;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.annotation.ModelAndViewResolver;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Test fixture with {@link ModelAndViewResolverMethodReturnValueHandler}.
@@ -73,9 +69,9 @@ public class ModelAndViewResolverMethodReturnValueHandlerTests {
 
 		handler.handleReturnValue(testBean, returnType, mavContainer, request);
 
-		assertEquals("viewName", mavContainer.getViewName());
-		assertSame(testBean, mavContainer.getModel().get("modelAttrName"));
-		assertFalse(mavContainer.isRequestHandled());
+		assertThat(mavContainer.getViewName()).isEqualTo("viewName");
+		assertThat(mavContainer.getModel().get("modelAttrName")).isSameAs(testBean);
+		assertThat(mavContainer.isRequestHandled()).isFalse();
 	}
 
 	@Test
@@ -91,9 +87,9 @@ public class ModelAndViewResolverMethodReturnValueHandlerTests {
 		MethodParameter returnType = new MethodParameter(getClass().getDeclaredMethod("testBeanReturnValue"), -1);
 		handler.handleReturnValue(null, returnType, mavContainer, request);
 
-		assertNull(mavContainer.getView());
-		assertNull(mavContainer.getViewName());
-		assertTrue(mavContainer.getModel().isEmpty());
+		assertThat(mavContainer.getView()).isNull();
+		assertThat(mavContainer.getViewName()).isNull();
+		assertThat(mavContainer.getModel().isEmpty()).isTrue();
 	}
 
 	@Test
@@ -108,7 +104,7 @@ public class ModelAndViewResolverMethodReturnValueHandlerTests {
 		MethodParameter returnType = new MethodParameter(getClass().getDeclaredMethod("testBeanReturnValue"), -1);
 		handler.handleReturnValue(new TestBean(), returnType, mavContainer, request);
 
-		assertTrue(mavContainer.containsAttribute("testBean"));
+		assertThat(mavContainer.containsAttribute("testBean")).isTrue();
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java

@@ -63,7 +63,6 @@ import org.springframework.web.util.UriComponentsBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.junit.Assert.assertEquals;
 import static org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder.fromController;
 import static org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder.fromMappingName;
 import static org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder.fromMethodCall;
@@ -131,8 +130,8 @@ public class MvcUriComponentsBuilderTests {
 		UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("https://example.org:9090/base");
 		UriComponents uriComponents = fromController(builder, PersonControllerImpl.class).build();
 
-		assertEquals("https://example.org:9090/base/people", uriComponents.toString());
-		assertEquals("https://example.org:9090/base", builder.toUriString());
+		assertThat(uriComponents.toString()).isEqualTo("https://example.org:9090/base/people");
+		assertThat(builder.toUriString()).isEqualTo("https://example.org:9090/base");
 	}
 
 	@Test
@@ -141,8 +140,8 @@ public class MvcUriComponentsBuilderTests {
 		MvcUriComponentsBuilder mvcBuilder = relativeTo(builder);
 		UriComponents uriComponents = mvcBuilder.withController(PersonControllerImpl.class).build();
 
-		assertEquals("https://example.org:9090/base/people", uriComponents.toString());
-		assertEquals("https://example.org:9090/base", builder.toUriString());
+		assertThat(uriComponents.toString()).isEqualTo("https://example.org:9090/base/people");
+		assertThat(builder.toUriString()).isEqualTo("https://example.org:9090/base");
 	}
 
 	@Test
@@ -247,8 +246,8 @@ public class MvcUriComponentsBuilderTests {
 		UriComponents uriComponents = fromMethodName(builder, ControllerWithMethods.class,
 				"methodWithPathVariable", "1").build();
 
-		assertEquals("https://example.org:9090/base/something/1/foo", uriComponents.toString());
-		assertEquals("https://example.org:9090/base", builder.toUriString());
+		assertThat(uriComponents.toString()).isEqualTo("https://example.org:9090/base/something/1/foo");
+		assertThat(builder.toUriString()).isEqualTo("https://example.org:9090/base");
 	}
 
 	@Test
@@ -258,8 +257,8 @@ public class MvcUriComponentsBuilderTests {
 		UriComponents uriComponents = mvcBuilder.withMethodName(ControllerWithMethods.class,
 				"methodWithPathVariable", "1").build();
 
-		assertEquals("https://example.org:9090/base/something/1/foo", uriComponents.toString());
-		assertEquals("https://example.org:9090/base", builder.toUriString());
+		assertThat(uriComponents.toString()).isEqualTo("https://example.org:9090/base/something/1/foo");
+		assertThat(builder.toUriString()).isEqualTo("https://example.org:9090/base");
 	}
 
 	@Test  // SPR-14405
@@ -348,8 +347,8 @@ public class MvcUriComponentsBuilderTests {
 		UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("https://example.org:9090/base");
 		UriComponents uriComponents = fromMethodCall(builder, on(ControllerWithMethods.class).myMethod(null)).build();
 
-		assertEquals("https://example.org:9090/base/something/else", uriComponents.toString());
-		assertEquals("https://example.org:9090/base", builder.toUriString());
+		assertThat(uriComponents.toString()).isEqualTo("https://example.org:9090/base/something/else");
+		assertThat(builder.toUriString()).isEqualTo("https://example.org:9090/base");
 	}
 
 	@Test
@@ -358,8 +357,8 @@ public class MvcUriComponentsBuilderTests {
 		MvcUriComponentsBuilder mvcBuilder = relativeTo(builder);
 		UriComponents result = mvcBuilder.withMethodCall(on(ControllerWithMethods.class).myMethod(null)).build();
 
-		assertEquals("https://example.org:9090/base/something/else", result.toString());
-		assertEquals("https://example.org:9090/base", builder.toUriString());
+		assertThat(result.toString()).isEqualTo("https://example.org:9090/base/something/else");
+		assertThat(builder.toUriString()).isEqualTo("https://example.org:9090/base");
 	}
 
 	@Test  // SPR-16710
@@ -367,7 +366,7 @@ public class MvcUriComponentsBuilderTests {
 		UriComponents uriComponents = fromMethodCall(
 				on(BookingControllerWithModelAndView.class).getBooking(21L)).buildAndExpand(42);
 
-		assertEquals("http://localhost/hotels/42/bookings/21", uriComponents.encode().toUri().toString());
+		assertThat(uriComponents.encode().toUri().toString()).isEqualTo("http://localhost/hotels/42/bookings/21");
 	}
 
 	@Test  // SPR-16710
@@ -375,7 +374,7 @@ public class MvcUriComponentsBuilderTests {
 		UriComponents uriComponents = fromMethodCall(
 				on(BookingControllerWithObject.class).getBooking(21L)).buildAndExpand(42);
 
-		assertEquals("http://localhost/hotels/42/bookings/21", uriComponents.encode().toUri().toString());
+		assertThat(uriComponents.encode().toUri().toString()).isEqualTo("http://localhost/hotels/42/bookings/21");
 	}
 
 	@Test // SPR-16710
@@ -392,7 +391,7 @@ public class MvcUriComponentsBuilderTests {
 		UriComponents uriComponents = fromMethodName(
 				BookingControllerWithString.class, "getBooking", 21L).buildAndExpand(42);
 
-		assertEquals("http://localhost/hotels/42/bookings/21", uriComponents.encode().toUri().toString());
+		assertThat(uriComponents.encode().toUri().toString()).isEqualTo("http://localhost/hotels/42/bookings/21");
 	}
 
 	@Test
@@ -406,7 +405,7 @@ public class MvcUriComponentsBuilderTests {
 
 		String mappingName = "PAC#getAddressesForCountry";
 		String url = fromMappingName(mappingName).arg(0, "DE").buildAndExpand(123);
-		assertEquals("/base/people/123/addresses/DE", url);
+		assertThat(url).isEqualTo("/base/people/123/addresses/DE");
 	}
 
 	@Test
@@ -417,7 +416,7 @@ public class MvcUriComponentsBuilderTests {
 		UriComponentsBuilder baseUrl = UriComponentsBuilder.fromUriString("https://example.org:9999/base");
 		MvcUriComponentsBuilder mvcBuilder = relativeTo(baseUrl);
 		String url = mvcBuilder.withMappingName("PAC#getAddressesForCountry").arg(0, "DE").buildAndExpand(123);
-		assertEquals("https://example.org:9999/base/people/123/addresses/DE", url);
+		assertThat(url).isEqualTo("https://example.org:9999/base/people/123/addresses/DE");
 	}
 
 	@Test // SPR-17027
@@ -431,7 +430,7 @@ public class MvcUriComponentsBuilderTests {
 
 		String mappingName = "PAC#getAddressesForCountry";
 		String url = fromMappingName(mappingName).arg(0, "DE;FR").encode().buildAndExpand("_+_");
-		assertEquals("/base/people/_%2B_/addresses/DE%3BFR", url);
+		assertThat(url).isEqualTo("/base/people/_%2B_/addresses/DE%3BFR");
 	}
 
 	@Test
@@ -444,8 +443,7 @@ public class MvcUriComponentsBuilderTests {
 		this.request.setServerPort(9999);
 		this.request.setContextPath("/base");
 
-		assertEquals("https://example.org:9999/base/api/people/123/addresses",
-				fromController(PersonsAddressesController.class).buildAndExpand("123").toString());
+		assertThat(fromController(PersonsAddressesController.class).buildAndExpand("123").toString()).isEqualTo("https://example.org:9999/base/api/people/123/addresses");
 	}
 
 	@Test
@@ -458,9 +456,8 @@ public class MvcUriComponentsBuilderTests {
 		this.request.setServerPort(9999);
 		this.request.setContextPath("/base");
 
-		assertEquals("https://example.org:9999/base/api/people/123/addresses/DE",
-				fromMethodCall(on(PersonsAddressesController.class).getAddressesForCountry("DE"))
-						.buildAndExpand("123").toString());
+		assertThat(fromMethodCall(on(PersonsAddressesController.class).getAddressesForCountry("DE"))
+				.buildAndExpand("123").toString()).isEqualTo("https://example.org:9999/base/api/people/123/addresses/DE");
 	}
 
 	private void initWebApplicationContext(Class<?> configClass) {

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java

@@ -32,9 +32,7 @@ import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.method.support.ModelAndViewContainer;
 import org.springframework.web.servlet.HandlerMapping;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture with {@link PathVariableMapMethodArgumentResolver}.
@@ -72,9 +70,9 @@ public class PathVariableMapMethodArgumentResolverTests {
 
 	@Test
 	public void supportsParameter() {
-		assertTrue(resolver.supportsParameter(paramMap));
-		assertFalse(resolver.supportsParameter(paramNamedMap));
-		assertFalse(resolver.supportsParameter(paramMapNoAnnot));
+		assertThat(resolver.supportsParameter(paramMap)).isTrue();
+		assertThat(resolver.supportsParameter(paramNamedMap)).isFalse();
+		assertThat(resolver.supportsParameter(paramMapNoAnnot)).isFalse();
 	}
 
 	@Test
@@ -86,7 +84,7 @@ public class PathVariableMapMethodArgumentResolverTests {
 
 		Object result = resolver.resolveArgument(paramMap, mavContainer, webRequest, null);
 
-		assertEquals(uriTemplateVars, result);
+		assertThat(result).isEqualTo(uriTemplateVars);
 	}
 
 	@Test
@@ -94,7 +92,7 @@ public class PathVariableMapMethodArgumentResolverTests {
 	public void resolveArgumentNoUriVars() throws Exception {
 		Map<String, String> map = (Map<String, String>) resolver.resolveArgument(paramMap, mavContainer, webRequest, null);
 
-		assertEquals(Collections.emptyMap(), map);
+		assertThat(map).isEqualTo(Collections.emptyMap());
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java

@@ -40,12 +40,8 @@ import org.springframework.web.method.support.ModelAndViewContainer;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.View;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Test fixture with {@link PathVariableMethodArgumentResolver}.
@@ -86,8 +82,8 @@ public class PathVariableMethodArgumentResolverTests {
 
 	@Test
 	public void supportsParameter() {
-		assertTrue("Parameter with @PathVariable annotation", resolver.supportsParameter(paramNamedString));
-		assertFalse("Parameter without @PathVariable annotation", resolver.supportsParameter(paramString));
+		assertThat(resolver.supportsParameter(paramNamedString)).as("Parameter with @PathVariable annotation").isTrue();
+		assertThat(resolver.supportsParameter(paramString)).as("Parameter without @PathVariable annotation").isFalse();
 	}
 
 	@Test
@@ -97,13 +93,13 @@ public class PathVariableMethodArgumentResolverTests {
 		request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, uriTemplateVars);
 
 		String result = (String) resolver.resolveArgument(paramNamedString, mavContainer, webRequest, null);
-		assertEquals("PathVariable not resolved correctly", "value", result);
+		assertThat(result).as("PathVariable not resolved correctly").isEqualTo("value");
 
 		@SuppressWarnings("unchecked")
 		Map<String, Object> pathVars = (Map<String, Object>) request.getAttribute(View.PATH_VARIABLES);
-		assertNotNull(pathVars);
-		assertEquals(1, pathVars.size());
-		assertEquals("value", pathVars.get("name"));
+		assertThat(pathVars).isNotNull();
+		assertThat(pathVars.size()).isEqualTo(1);
+		assertThat(pathVars.get("name")).isEqualTo("value");
 	}
 
 	@Test
@@ -113,13 +109,13 @@ public class PathVariableMethodArgumentResolverTests {
 		request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, uriTemplateVars);
 
 		String result = (String) resolver.resolveArgument(paramNotRequired, mavContainer, webRequest, null);
-		assertEquals("PathVariable not resolved correctly", "value", result);
+		assertThat(result).as("PathVariable not resolved correctly").isEqualTo("value");
 
 		@SuppressWarnings("unchecked")
 		Map<String, Object> pathVars = (Map<String, Object>) request.getAttribute(View.PATH_VARIABLES);
-		assertNotNull(pathVars);
-		assertEquals(1, pathVars.size());
-		assertEquals("value", pathVars.get("name"));
+		assertThat(pathVars).isNotNull();
+		assertThat(pathVars.size()).isEqualTo(1);
+		assertThat(pathVars.get("name")).isEqualTo("value");
 	}
 
 	@Test
@@ -135,13 +131,13 @@ public class PathVariableMethodArgumentResolverTests {
 		@SuppressWarnings("unchecked")
 		Optional<String> result = (Optional<String>)
 				resolver.resolveArgument(paramOptional, mavContainer, webRequest, binderFactory);
-		assertEquals("PathVariable not resolved correctly", "value", result.get());
+		assertThat(result.get()).as("PathVariable not resolved correctly").isEqualTo("value");
 
 		@SuppressWarnings("unchecked")
 		Map<String, Object> pathVars = (Map<String, Object>) request.getAttribute(View.PATH_VARIABLES);
-		assertNotNull(pathVars);
-		assertEquals(1, pathVars.size());
-		assertEquals(Optional.of("value"), pathVars.get("name"));
+		assertThat(pathVars).isNotNull();
+		assertThat(pathVars.size()).isEqualTo(1);
+		assertThat(pathVars.get("name")).isEqualTo(Optional.of("value"));
 	}
 
 	@Test
@@ -154,14 +150,14 @@ public class PathVariableMethodArgumentResolverTests {
 		request.setAttribute(View.PATH_VARIABLES, uriTemplateVars);
 
 		String result = (String) resolver.resolveArgument(paramNamedString, mavContainer, webRequest, null);
-		assertEquals("PathVariable not resolved correctly", "value", result);
+		assertThat(result).as("PathVariable not resolved correctly").isEqualTo("value");
 
 		@SuppressWarnings("unchecked")
 		Map<String, Object> pathVars = (Map<String, Object>) request.getAttribute(View.PATH_VARIABLES);
-		assertNotNull(pathVars);
-		assertEquals(2, pathVars.size());
-		assertEquals("value", pathVars.get("name"));
-		assertEquals("oldValue", pathVars.get("oldName"));
+		assertThat(pathVars).isNotNull();
+		assertThat(pathVars.size()).isEqualTo(2);
+		assertThat(pathVars.get("name")).isEqualTo("value");
+		assertThat(pathVars.get("oldName")).isEqualTo("oldValue");
 	}
 
 	@Test
@@ -172,7 +168,7 @@ public class PathVariableMethodArgumentResolverTests {
 
 	@Test
 	public void nullIfNotRequired() throws Exception {
-		assertNull(resolver.resolveArgument(paramNotRequired, mavContainer, webRequest, null));
+		assertThat(resolver.resolveArgument(paramNotRequired, mavContainer, webRequest, null)).isNull();
 	}
 
 	@Test
@@ -181,7 +177,7 @@ public class PathVariableMethodArgumentResolverTests {
 		initializer.setConversionService(new DefaultConversionService());
 		WebDataBinderFactory binderFactory = new DefaultDataBinderFactory(initializer);
 
-		assertEquals(Optional.empty(), resolver.resolveArgument(paramOptional, mavContainer, webRequest, binderFactory));
+		assertThat(resolver.resolveArgument(paramOptional, mavContainer, webRequest, binderFactory)).isEqualTo(Optional.empty());
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandlerTests.java

@@ -54,10 +54,7 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.method.support.ModelAndViewContainer;
 import org.springframework.web.servlet.HandlerMapping;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.core.ResolvableType.forClass;
 import static org.springframework.web.method.ResolvableMethod.on;
 
@@ -99,14 +96,14 @@ public class ReactiveTypeHandlerTests {
 
 	@Test
 	public void supportsType() throws Exception {
-		assertTrue(this.handler.isReactiveType(Mono.class));
-		assertTrue(this.handler.isReactiveType(Single.class));
-		assertTrue(this.handler.isReactiveType(io.reactivex.Single.class));
+		assertThat(this.handler.isReactiveType(Mono.class)).isTrue();
+		assertThat(this.handler.isReactiveType(Single.class)).isTrue();
+		assertThat(this.handler.isReactiveType(io.reactivex.Single.class)).isTrue();
 	}
 
 	@Test
 	public void doesNotSupportType() throws Exception {
-		assertFalse(this.handler.isReactiveType(String.class));
+		assertThat(this.handler.isReactiveType(String.class)).isFalse();
 	}
 
 	@Test
@@ -195,7 +192,8 @@ public class ReactiveTypeHandlerTests {
 
 	private void testSseResponse(boolean expectSseEmitter) throws Exception {
 		ResponseBodyEmitter emitter = handleValue(Flux.empty(), Flux.class, forClass(String.class));
-		assertEquals(expectSseEmitter, emitter instanceof SseEmitter);
+		Object actual = emitter instanceof SseEmitter;
+		assertThat(actual).isEqualTo(expectSseEmitter);
 		resetRequest();
 	}
 
@@ -214,7 +212,7 @@ public class ReactiveTypeHandlerTests {
 		processor.onNext("baz");
 		processor.onComplete();
 
-		assertEquals("data:foo\n\ndata:bar\n\ndata:baz\n\n", emitterHandler.getValuesAsText());
+		assertThat(emitterHandler.getValuesAsText()).isEqualTo("data:foo\n\ndata:bar\n\ndata:baz\n\n");
 	}
 
 	@Test
@@ -233,8 +231,7 @@ public class ReactiveTypeHandlerTests {
 		processor.onNext(ServerSentEvent.builder("baz").id("3").build());
 		processor.onComplete();
 
-		assertEquals("id:1\ndata:foo\n\nid:2\ndata:bar\n\nid:3\ndata:baz\n\n",
-				emitterHandler.getValuesAsText());
+		assertThat(emitterHandler.getValuesAsText()).isEqualTo("id:1\ndata:foo\n\nid:2\ndata:bar\n\nid:3\ndata:baz\n\n");
 	}
 
 	@Test
@@ -258,8 +255,8 @@ public class ReactiveTypeHandlerTests {
 		processor.onNext(bar2);
 		processor.onComplete();
 
-		assertEquals("application/stream+json", message.getHeaders().getContentType().toString());
-		assertEquals(Arrays.asList(bar1, "\n", bar2, "\n"), emitterHandler.getValues());
+		assertThat(message.getHeaders().getContentType().toString()).isEqualTo("application/stream+json");
+		assertThat(emitterHandler.getValues()).isEqualTo(Arrays.asList(bar1, "\n", bar2, "\n"));
 	}
 
 	@Test
@@ -276,7 +273,7 @@ public class ReactiveTypeHandlerTests {
 		processor.onNext("the lazy dog");
 		processor.onComplete();
 
-		assertEquals("The quick brown fox jumps over the lazy dog", emitterHandler.getValuesAsText());
+		assertThat(emitterHandler.getValuesAsText()).isEqualTo("The quick brown fox jumps over the lazy dog");
 	}
 
 	@Test
@@ -306,7 +303,7 @@ public class ReactiveTypeHandlerTests {
 		ServletServerHttpResponse message = new ServletServerHttpResponse(this.servletResponse);
 		ResponseBodyEmitter emitter = handleValue(Flux.empty(), Flux.class, forClass(String.class));
 		emitter.extendResponse(message);
-		assertEquals(expected, message.getHeaders().getContentType().toString());
+		assertThat(message.getHeaders().getContentType().toString()).isEqualTo(expected);
 		resetRequest();
 	}
 
@@ -315,15 +312,15 @@ public class ReactiveTypeHandlerTests {
 			ResolvableType elementType, Runnable produceTask, Object expected) throws Exception {
 
 		ResponseBodyEmitter emitter = handleValue(returnValue, asyncType, elementType);
-		assertNull(emitter);
+		assertThat(emitter).isNull();
 
-		assertTrue(this.servletRequest.isAsyncStarted());
-		assertFalse(WebAsyncUtils.getAsyncManager(this.webRequest).hasConcurrentResult());
+		assertThat(this.servletRequest.isAsyncStarted()).isTrue();
+		assertThat(WebAsyncUtils.getAsyncManager(this.webRequest).hasConcurrentResult()).isFalse();
 
 		produceTask.run();
 
-		assertTrue(WebAsyncUtils.getAsyncManager(this.webRequest).hasConcurrentResult());
-		assertEquals(expected, WebAsyncUtils.getAsyncManager(this.webRequest).getConcurrentResult());
+		assertThat(WebAsyncUtils.getAsyncManager(this.webRequest).hasConcurrentResult()).isTrue();
+		assertThat(WebAsyncUtils.getAsyncManager(this.webRequest).getConcurrentResult()).isEqualTo(expected);
 
 		resetRequest();
 	}

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java

@@ -85,12 +85,6 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
 /**
  * A test fixture with a controller with all supported method signature styles
@@ -181,49 +175,49 @@ public class RequestMappingHandlerAdapterIntegrationTests {
 		ModelAndView mav = handlerAdapter.handle(request, response, handlerMethod);
 		ModelMap model = mav.getModelMap();
 
-		assertEquals("viewName", mav.getViewName());
-		assertEquals(99, model.get("cookie"));
-		assertEquals("pathvarValue", model.get("pathvar"));
-		assertEquals("headerValue", model.get("header"));
-		assertEquals(date, model.get("dateParam"));
+		assertThat(mav.getViewName()).isEqualTo("viewName");
+		assertThat(model.get("cookie")).isEqualTo(99);
+		assertThat(model.get("pathvar")).isEqualTo("pathvarValue");
+		assertThat(model.get("header")).isEqualTo("headerValue");
+		assertThat(model.get("dateParam")).isEqualTo(date);
 
 		Map<?, ?> map = (Map<?, ?>) model.get("headerMap");
-		assertEquals("headerValue", map.get("header"));
-		assertEquals("anotherHeaderValue", map.get("anotherHeader"));
-		assertEquals("systemHeaderValue", model.get("systemHeader"));
+		assertThat(map.get("header")).isEqualTo("headerValue");
+		assertThat(map.get("anotherHeader")).isEqualTo("anotherHeaderValue");
+		assertThat(model.get("systemHeader")).isEqualTo("systemHeaderValue");
 
 		map = (Map<?, ?>) model.get("paramMap");
-		assertEquals(formattedDate, map.get("dateParam"));
-		assertEquals("paramByConventionValue", map.get("paramByConvention"));
+		assertThat(map.get("dateParam")).isEqualTo(formattedDate);
+		assertThat(map.get("paramByConvention")).isEqualTo("paramByConventionValue");
 
-		assertEquals("/contextPath", model.get("value"));
+		assertThat(model.get("value")).isEqualTo("/contextPath");
 
 		TestBean modelAttr = (TestBean) model.get("modelAttr");
-		assertEquals(25, modelAttr.getAge());
-		assertEquals("Set by model method [modelAttr]", modelAttr.getName());
-		assertSame(modelAttr, request.getSession().getAttribute("modelAttr"));
+		assertThat(modelAttr.getAge()).isEqualTo(25);
+		assertThat(modelAttr.getName()).isEqualTo("Set by model method [modelAttr]");
+		assertThat(request.getSession().getAttribute("modelAttr")).isSameAs(modelAttr);
 
 		BindingResult bindingResult = (BindingResult) model.get(BindingResult.MODEL_KEY_PREFIX + "modelAttr");
-		assertSame(modelAttr, bindingResult.getTarget());
-		assertEquals(1, bindingResult.getErrorCount());
+		assertThat(bindingResult.getTarget()).isSameAs(modelAttr);
+		assertThat(bindingResult.getErrorCount()).isEqualTo(1);
 
 		String conventionAttrName = "testBean";
 		TestBean modelAttrByConvention = (TestBean) model.get(conventionAttrName);
-		assertEquals(25, modelAttrByConvention.getAge());
-		assertEquals("Set by model method [modelAttrByConvention]", modelAttrByConvention.getName());
-		assertSame(modelAttrByConvention, request.getSession().getAttribute(conventionAttrName));
+		assertThat(modelAttrByConvention.getAge()).isEqualTo(25);
+		assertThat(modelAttrByConvention.getName()).isEqualTo("Set by model method [modelAttrByConvention]");
+		assertThat(request.getSession().getAttribute(conventionAttrName)).isSameAs(modelAttrByConvention);
 
 		bindingResult = (BindingResult) model.get(BindingResult.MODEL_KEY_PREFIX + conventionAttrName);
-		assertSame(modelAttrByConvention, bindingResult.getTarget());
+		assertThat(bindingResult.getTarget()).isSameAs(modelAttrByConvention);
 
-		assertTrue(model.get("customArg") instanceof Color);
-		assertEquals(User.class, model.get("user").getClass());
-		assertEquals(OtherUser.class, model.get("otherUser").getClass());
+		assertThat(model.get("customArg") instanceof Color).isTrue();
+		assertThat(model.get("user").getClass()).isEqualTo(User.class);
+		assertThat(model.get("otherUser").getClass()).isEqualTo(OtherUser.class);
 
-		assertSame(sessionAttribute, model.get("sessionAttribute"));
-		assertSame(requestAttribute, model.get("requestAttribute"));
+		assertThat(model.get("sessionAttribute")).isSameAs(sessionAttribute);
+		assertThat(model.get("requestAttribute")).isSameAs(requestAttribute);
 
-		assertEquals(new URI("http://localhost/contextPath/main/path"), model.get("url"));
+		assertThat(model.get("url")).isEqualTo(new URI("http://localhost/contextPath/main/path"));
 	}
 
 	@Test
@@ -262,49 +256,49 @@ public class RequestMappingHandlerAdapterIntegrationTests {
 		ModelAndView mav = handlerAdapter.handle(request, response, handlerMethod);
 		ModelMap model = mav.getModelMap();
 
-		assertEquals("viewName", mav.getViewName());
-		assertEquals(99, model.get("cookie"));
-		assertEquals("pathvarValue", model.get("pathvar"));
-		assertEquals("headerValue", model.get("header"));
-		assertEquals(date, model.get("dateParam"));
+		assertThat(mav.getViewName()).isEqualTo("viewName");
+		assertThat(model.get("cookie")).isEqualTo(99);
+		assertThat(model.get("pathvar")).isEqualTo("pathvarValue");
+		assertThat(model.get("header")).isEqualTo("headerValue");
+		assertThat(model.get("dateParam")).isEqualTo(date);
 
 		Map<?, ?> map = (Map<?, ?>) model.get("headerMap");
-		assertEquals("headerValue", map.get("header"));
-		assertEquals("anotherHeaderValue", map.get("anotherHeader"));
-		assertEquals("systemHeaderValue", model.get("systemHeader"));
+		assertThat(map.get("header")).isEqualTo("headerValue");
+		assertThat(map.get("anotherHeader")).isEqualTo("anotherHeaderValue");
+		assertThat(model.get("systemHeader")).isEqualTo("systemHeaderValue");
 
 		map = (Map<?, ?>) model.get("paramMap");
-		assertEquals(formattedDate, map.get("dateParam"));
-		assertEquals("paramByConventionValue", map.get("paramByConvention"));
+		assertThat(map.get("dateParam")).isEqualTo(formattedDate);
+		assertThat(map.get("paramByConvention")).isEqualTo("paramByConventionValue");
 
-		assertEquals("/contextPath", model.get("value"));
+		assertThat(model.get("value")).isEqualTo("/contextPath");
 
 		TestBean modelAttr = (TestBean) model.get("modelAttr");
-		assertEquals(25, modelAttr.getAge());
-		assertEquals("Set by model method [modelAttr]", modelAttr.getName());
-		assertSame(modelAttr, request.getSession().getAttribute("modelAttr"));
+		assertThat(modelAttr.getAge()).isEqualTo(25);
+		assertThat(modelAttr.getName()).isEqualTo("Set by model method [modelAttr]");
+		assertThat(request.getSession().getAttribute("modelAttr")).isSameAs(modelAttr);
 
 		BindingResult bindingResult = (BindingResult) model.get(BindingResult.MODEL_KEY_PREFIX + "modelAttr");
-		assertSame(modelAttr, bindingResult.getTarget());
-		assertEquals(1, bindingResult.getErrorCount());
+		assertThat(bindingResult.getTarget()).isSameAs(modelAttr);
+		assertThat(bindingResult.getErrorCount()).isEqualTo(1);
 
 		String conventionAttrName = "testBean";
 		TestBean modelAttrByConvention = (TestBean) model.get(conventionAttrName);
-		assertEquals(25, modelAttrByConvention.getAge());
-		assertEquals("Set by model method [modelAttrByConvention]", modelAttrByConvention.getName());
-		assertSame(modelAttrByConvention, request.getSession().getAttribute(conventionAttrName));
+		assertThat(modelAttrByConvention.getAge()).isEqualTo(25);
+		assertThat(modelAttrByConvention.getName()).isEqualTo("Set by model method [modelAttrByConvention]");
+		assertThat(request.getSession().getAttribute(conventionAttrName)).isSameAs(modelAttrByConvention);
 
 		bindingResult = (BindingResult) model.get(BindingResult.MODEL_KEY_PREFIX + conventionAttrName);
-		assertSame(modelAttrByConvention, bindingResult.getTarget());
+		assertThat(bindingResult.getTarget()).isSameAs(modelAttrByConvention);
 
-		assertTrue(model.get("customArg") instanceof Color);
-		assertEquals(User.class, model.get("user").getClass());
-		assertEquals(OtherUser.class, model.get("otherUser").getClass());
+		assertThat(model.get("customArg") instanceof Color).isTrue();
+		assertThat(model.get("user").getClass()).isEqualTo(User.class);
+		assertThat(model.get("otherUser").getClass()).isEqualTo(OtherUser.class);
 
-		assertSame(sessionAttribute, model.get("sessionAttribute"));
-		assertSame(requestAttribute, model.get("requestAttribute"));
+		assertThat(model.get("sessionAttribute")).isSameAs(sessionAttribute);
+		assertThat(model.get("requestAttribute")).isSameAs(requestAttribute);
 
-		assertEquals(new URI("http://localhost/contextPath/main/path"), model.get("url"));
+		assertThat(model.get("url")).isEqualTo(new URI("http://localhost/contextPath/main/path"));
 	}
 
 	@Test
@@ -319,9 +313,9 @@ public class RequestMappingHandlerAdapterIntegrationTests {
 
 		ModelAndView mav = handlerAdapter.handle(request, response, handlerMethod);
 
-		assertNull(mav);
-		assertEquals("Handled requestBody=[Hello Server]", new String(response.getContentAsByteArray(), "UTF-8"));
-		assertEquals(HttpStatus.ACCEPTED.value(), response.getStatus());
+		assertThat(mav).isNull();
+		assertThat(new String(response.getContentAsByteArray(), "UTF-8")).isEqualTo("Handled requestBody=[Hello Server]");
+		assertThat(response.getStatus()).isEqualTo(HttpStatus.ACCEPTED.value());
 	}
 
 	@Test
@@ -335,9 +329,9 @@ public class RequestMappingHandlerAdapterIntegrationTests {
 
 		ModelAndView mav = handlerAdapter.handle(request, response, handlerMethod);
 
-		assertNull(mav);
-		assertEquals("Error count [1]", new String(response.getContentAsByteArray(), "UTF-8"));
-		assertEquals(HttpStatus.ACCEPTED.value(), response.getStatus());
+		assertThat(mav).isNull();
+		assertThat(new String(response.getContentAsByteArray(), "UTF-8")).isEqualTo("Error count [1]");
+		assertThat(response.getStatus()).isEqualTo(HttpStatus.ACCEPTED.value());
 	}
 
 	@Test
@@ -351,12 +345,12 @@ public class RequestMappingHandlerAdapterIntegrationTests {
 
 		ModelAndView mav = handlerAdapter.handle(request, response, handlerMethod);
 
-		assertNull(mav);
-		assertEquals(HttpStatus.ACCEPTED.value(), response.getStatus());
-		assertEquals("Handled requestBody=[Hello Server]", new String(response.getContentAsByteArray(), "UTF-8"));
-		assertEquals("headerValue", response.getHeader("header"));
+		assertThat(mav).isNull();
+		assertThat(response.getStatus()).isEqualTo(HttpStatus.ACCEPTED.value());
+		assertThat(new String(response.getContentAsByteArray(), "UTF-8")).isEqualTo("Handled requestBody=[Hello Server]");
+		assertThat(response.getHeader("header")).isEqualTo("headerValue");
 		// set because of @SesstionAttributes
-		assertEquals("no-store", response.getHeader("Cache-Control"));
+		assertThat(response.getHeader("Cache-Control")).isEqualTo("no-store");
 	}
 
 	// SPR-13867
@@ -369,9 +363,9 @@ public class RequestMappingHandlerAdapterIntegrationTests {
 		HandlerMethod handlerMethod = handlerMethod("handleHttpEntityWithCacheControl", parameterTypes);
 		ModelAndView mav = handlerAdapter.handle(request, response, handlerMethod);
 
-		assertNull(mav);
-		assertEquals(HttpStatus.OK.value(), response.getStatus());
-		assertEquals("Handled requestBody=[Hello Server]", new String(response.getContentAsByteArray(), "UTF-8"));
+		assertThat(mav).isNull();
+		assertThat(response.getStatus()).isEqualTo(HttpStatus.OK.value());
+		assertThat(new String(response.getContentAsByteArray(), "UTF-8")).isEqualTo("Handled requestBody=[Hello Server]");
 		assertThat(response.getHeaderValues("Cache-Control")).containsExactly("max-age=3600");
 	}
 
@@ -383,8 +377,8 @@ public class RequestMappingHandlerAdapterIntegrationTests {
 		HandlerMethod handlerMethod = handlerMethod("handleRequestPart", String.class, Model.class);
 		ModelAndView mav = handlerAdapter.handle(multipartRequest, response, handlerMethod);
 
-		assertNotNull(mav);
-		assertEquals("content", mav.getModelMap().get("requestPart"));
+		assertThat(mav).isNotNull();
+		assertThat(mav.getModelMap().get("requestPart")).isEqualTo("content");
 	}
 
 	@Test
@@ -395,8 +389,8 @@ public class RequestMappingHandlerAdapterIntegrationTests {
 		HandlerMethod handlerMethod = handlerMethod("handleAndValidateRequestPart", String.class, Errors.class, Model.class);
 		ModelAndView mav = handlerAdapter.handle(multipartRequest, response, handlerMethod);
 
-		assertNotNull(mav);
-		assertEquals(1, mav.getModelMap().get("error count"));
+		assertThat(mav).isNotNull();
+		assertThat(mav.getModelMap().get("error count")).isEqualTo(1);
 	}
 
 	@Test
@@ -404,7 +398,7 @@ public class RequestMappingHandlerAdapterIntegrationTests {
 		HandlerMethod handlerMethod = handlerMethod("handleAndCompleteSession", SessionStatus.class);
 		handlerAdapter.handle(request, response, handlerMethod);
 
-		assertFalse(request.getSession().getAttributeNames().hasMoreElements());
+		assertThat(request.getSession().getAttributeNames().hasMoreElements()).isFalse();
 	}
 
 	private HandlerMethod handlerMethod(String methodName, Class<?>... paramTypes) throws Exception {
@@ -495,8 +489,8 @@ public class RequestMappingHandlerAdapterIntegrationTests {
 					.addAttribute("requestAttribute", requestAttribute)
 					.addAttribute("url", builder.path("/path").build().toUri());
 
-			assertNotNull(request);
-			assertNotNull(response);
+			assertThat(request).isNotNull();
+			assertThat(response).isNotNull();
 
 			return "viewName";
 		}
@@ -534,8 +528,8 @@ public class RequestMappingHandlerAdapterIntegrationTests {
 					.addAttribute("requestAttribute", requestAttribute)
 					.addAttribute("url", builder.path("/path").build().toUri());
 
-			assertNotNull(request);
-			assertNotNull(response);
+			assertThat(request).isNotNull();
+			assertThat(response).isNotNull();
 
 			return "viewName";
 		}

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

@@ -58,8 +58,7 @@ import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.FlashMap;
 import org.springframework.web.servlet.ModelAndView;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Unit tests for {@link RequestMappingHandlerAdapter}.
@@ -115,7 +114,7 @@ public class RequestMappingHandlerAdapterTests {
 		this.handlerAdapter.afterPropertiesSet();
 
 		this.handlerAdapter.handle(this.request, this.response, handlerMethod);
-		assertTrue(response.getHeader("Cache-Control").contains("max-age"));
+		assertThat(response.getHeader("Cache-Control").contains("max-age")).isTrue();
 	}
 
 	@Test
@@ -125,7 +124,7 @@ public class RequestMappingHandlerAdapterTests {
 		this.handlerAdapter.afterPropertiesSet();
 
 		this.handlerAdapter.handle(this.request, this.response, handlerMethod(handler, "handle"));
-		assertEquals("no-store", this.response.getHeader("Cache-Control"));
+		assertThat(this.response.getHeader("Cache-Control")).isEqualTo("no-store");
 	}
 
 	@Test
@@ -144,7 +143,7 @@ public class RequestMappingHandlerAdapterTests {
 		HandlerMethod handlerMethod = handlerMethod(new RedirectAttributeController(), "handle", Model.class);
 		ModelAndView mav = this.handlerAdapter.handle(request, response, handlerMethod);
 
-		assertTrue("Without RedirectAttributes arg, model should be empty", mav.getModel().isEmpty());
+		assertThat(mav.getModel().isEmpty()).as("Without RedirectAttributes arg, model should be empty").isTrue();
 	}
 
 	@Test
@@ -153,7 +152,7 @@ public class RequestMappingHandlerAdapterTests {
 		this.handlerAdapter.setCustomArgumentResolvers(Collections.singletonList(resolver));
 		this.handlerAdapter.afterPropertiesSet();
 
-		assertTrue(this.handlerAdapter.getArgumentResolvers().contains(resolver));
+		assertThat(this.handlerAdapter.getArgumentResolvers().contains(resolver)).isTrue();
 		assertMethodProcessorCount(RESOLVER_COUNT + 1, INIT_BINDER_RESOLVER_COUNT + 1, HANDLER_COUNT);
 	}
 
@@ -181,7 +180,7 @@ public class RequestMappingHandlerAdapterTests {
 		this.handlerAdapter.setCustomReturnValueHandlers(Collections.singletonList(handler));
 		this.handlerAdapter.afterPropertiesSet();
 
-		assertTrue(this.handlerAdapter.getReturnValueHandlers().contains(handler));
+		assertThat(this.handlerAdapter.getReturnValueHandlers().contains(handler)).isTrue();
 		assertMethodProcessorCount(RESOLVER_COUNT, INIT_BINDER_RESOLVER_COUNT, HANDLER_COUNT + 1);
 	}
 
@@ -203,8 +202,8 @@ public class RequestMappingHandlerAdapterTests {
 		this.handlerAdapter.afterPropertiesSet();
 		ModelAndView mav = this.handlerAdapter.handle(this.request, this.response, handlerMethod);
 
-		assertEquals("lAttr1", mav.getModel().get("attr1"));
-		assertEquals("gAttr2", mav.getModel().get("attr2"));
+		assertThat(mav.getModel().get("attr1")).isEqualTo("lAttr1");
+		assertThat(mav.getModel().get("attr2")).isEqualTo("gAttr2");
 	}
 
 	@Test
@@ -219,8 +218,8 @@ public class RequestMappingHandlerAdapterTests {
 		this.handlerAdapter.afterPropertiesSet();
 		ModelAndView mav = this.handlerAdapter.handle(this.request, this.response, handlerMethod);
 
-		assertEquals("lAttr1", mav.getModel().get("attr1"));
-		assertEquals("gAttr2", mav.getModel().get("attr2"));
+		assertThat(mav.getModel().get("attr1")).isEqualTo("lAttr1");
+		assertThat(mav.getModel().get("attr2")).isEqualTo("gAttr2");
 	}
 
 	@Test
@@ -233,9 +232,9 @@ public class RequestMappingHandlerAdapterTests {
 		this.handlerAdapter.afterPropertiesSet();
 		ModelAndView mav = this.handlerAdapter.handle(this.request, this.response, handlerMethod);
 
-		assertEquals("lAttr1", mav.getModel().get("attr1"));
-		assertEquals("gAttr2", mav.getModel().get("attr2"));
-		assertEquals(null,mav.getModel().get("attr3"));
+		assertThat(mav.getModel().get("attr1")).isEqualTo("lAttr1");
+		assertThat(mav.getModel().get("attr2")).isEqualTo("gAttr2");
+		assertThat(mav.getModel().get("attr3")).isEqualTo(null);
 	}
 
 	// SPR-10859
@@ -256,8 +255,8 @@ public class RequestMappingHandlerAdapterTests {
 		this.handlerAdapter.afterPropertiesSet();
 		this.handlerAdapter.handle(this.request, this.response, handlerMethod);
 
-		assertEquals(200, this.response.getStatus());
-		assertEquals("{\"status\":400,\"message\":\"body\"}", this.response.getContentAsString());
+		assertThat(this.response.getStatus()).isEqualTo(200);
+		assertThat(this.response.getContentAsString()).isEqualTo("{\"status\":400,\"message\":\"body\"}");
 	}
 
 	private HandlerMethod handlerMethod(Object handler, String methodName, Class<?>... paramTypes) throws Exception {
@@ -266,9 +265,9 @@ public class RequestMappingHandlerAdapterTests {
 	}
 
 	private void assertMethodProcessorCount(int resolverCount, int initBinderResolverCount, int handlerCount) {
-		assertEquals(resolverCount, this.handlerAdapter.getArgumentResolvers().size());
-		assertEquals(initBinderResolverCount, this.handlerAdapter.getInitBinderArgumentResolvers().size());
-		assertEquals(handlerCount, this.handlerAdapter.getReturnValueHandlers().size());
+		assertThat(this.handlerAdapter.getArgumentResolvers().size()).isEqualTo(resolverCount);
+		assertThat(this.handlerAdapter.getInitBinderArgumentResolvers().size()).isEqualTo(initBinderResolverCount);
+		assertThat(this.handlerAdapter.getReturnValueHandlers().size()).isEqualTo(handlerCount);
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java

@@ -50,11 +50,7 @@ import org.springframework.web.method.HandlerTypePredicate;
 import org.springframework.web.servlet.mvc.condition.ConsumesRequestCondition;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -75,8 +71,8 @@ public class RequestMappingHandlerMappingTests {
 
 	@Test
 	public void useRegisteredSuffixPatternMatch() {
-		assertTrue(this.handlerMapping.useSuffixPatternMatch());
-		assertFalse(this.handlerMapping.useRegisteredSuffixPatternMatch());
+		assertThat(this.handlerMapping.useSuffixPatternMatch()).isTrue();
+		assertThat(this.handlerMapping.useRegisteredSuffixPatternMatch()).isFalse();
 
 		Map<String, MediaType> fileExtensions = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
 		PathExtensionContentNegotiationStrategy strategy = new PathExtensionContentNegotiationStrategy(fileExtensions);
@@ -86,9 +82,9 @@ public class RequestMappingHandlerMappingTests {
 		this.handlerMapping.setUseRegisteredSuffixPatternMatch(true);
 		this.handlerMapping.afterPropertiesSet();
 
-		assertTrue(this.handlerMapping.useSuffixPatternMatch());
-		assertTrue(this.handlerMapping.useRegisteredSuffixPatternMatch());
-		assertEquals(Arrays.asList("json"), this.handlerMapping.getFileExtensions());
+		assertThat(this.handlerMapping.useSuffixPatternMatch()).isTrue();
+		assertThat(this.handlerMapping.useRegisteredSuffixPatternMatch()).isTrue();
+		assertThat(this.handlerMapping.getFileExtensions()).isEqualTo(Arrays.asList("json"));
 	}
 
 	@Test
@@ -115,23 +111,21 @@ public class RequestMappingHandlerMappingTests {
 		hm.setApplicationContext(wac);
 		hm.afterPropertiesSet();
 
-		assertEquals(Collections.singleton("json"), extensions);
+		assertThat(extensions).isEqualTo(Collections.singleton("json"));
 	}
 
 	@Test
 	public void useSuffixPatternMatch() {
-		assertTrue(this.handlerMapping.useSuffixPatternMatch());
+		assertThat(this.handlerMapping.useSuffixPatternMatch()).isTrue();
 
 		this.handlerMapping.setUseSuffixPatternMatch(false);
-		assertFalse(this.handlerMapping.useSuffixPatternMatch());
+		assertThat(this.handlerMapping.useSuffixPatternMatch()).isFalse();
 
 		this.handlerMapping.setUseRegisteredSuffixPatternMatch(false);
-		assertFalse("'false' registeredSuffixPatternMatch shouldn't impact suffixPatternMatch",
-				this.handlerMapping.useSuffixPatternMatch());
+		assertThat(this.handlerMapping.useSuffixPatternMatch()).as("'false' registeredSuffixPatternMatch shouldn't impact suffixPatternMatch").isFalse();
 
 		this.handlerMapping.setUseRegisteredSuffixPatternMatch(true);
-		assertTrue("'true' registeredSuffixPatternMatch should enable suffixPatternMatch",
-				this.handlerMapping.useSuffixPatternMatch());
+		assertThat(this.handlerMapping.useSuffixPatternMatch()).as("'true' registeredSuffixPatternMatch should enable suffixPatternMatch").isTrue();
 	}
 
 	@Test
@@ -143,7 +137,7 @@ public class RequestMappingHandlerMappingTests {
 		String[] patterns = new String[] { "/foo", "/${pattern}/bar" };
 		String[] result = this.handlerMapping.resolveEmbeddedValuesInPatterns(patterns);
 
-		assertArrayEquals(new String[] { "/foo", "/foo/bar" }, result);
+		assertThat(result).isEqualTo(new String[] { "/foo", "/foo/bar" });
 	}
 
 	@Test
@@ -155,18 +149,16 @@ public class RequestMappingHandlerMappingTests {
 		Method method = UserController.class.getMethod("getUser");
 		RequestMappingInfo info = this.handlerMapping.getMappingForMethod(method, UserController.class);
 
-		assertNotNull(info);
-		assertEquals(Collections.singleton("/api/user/{id}"), info.getPatternsCondition().getPatterns());
+		assertThat(info).isNotNull();
+		assertThat(info.getPatternsCondition().getPatterns()).isEqualTo(Collections.singleton("/api/user/{id}"));
 	}
 
 	@Test
 	public void resolveRequestMappingViaComposedAnnotation() throws Exception {
 		RequestMappingInfo info = assertComposedAnnotationMapping("postJson", "/postJson", RequestMethod.POST);
 
-		assertEquals(MediaType.APPLICATION_JSON_VALUE,
-			info.getConsumesCondition().getConsumableMediaTypes().iterator().next().toString());
-		assertEquals(MediaType.APPLICATION_JSON_VALUE,
-			info.getProducesCondition().getProducibleMediaTypes().iterator().next().toString());
+		assertThat(info.getConsumesCondition().getConsumableMediaTypes().iterator().next().toString()).isEqualTo(MediaType.APPLICATION_JSON_VALUE);
+		assertThat(info.getProducesCondition().getProducibleMediaTypes().iterator().next().toString()).isEqualTo(MediaType.APPLICATION_JSON_VALUE);
 	}
 
 	@Test // SPR-14988
@@ -174,7 +166,7 @@ public class RequestMappingHandlerMappingTests {
 		RequestMappingInfo requestMappingInfo = assertComposedAnnotationMapping(RequestMethod.POST);
 
 		ConsumesRequestCondition condition = requestMappingInfo.getConsumesCondition();
-		assertEquals(Collections.singleton(MediaType.APPLICATION_XML), condition.getConsumableMediaTypes());
+		assertThat(condition.getConsumableMediaTypes()).isEqualTo(Collections.singleton(MediaType.APPLICATION_XML));
 	}
 
 	@Test // gh-22010
@@ -187,7 +179,7 @@ public class RequestMappingHandlerMappingTests {
 				.findFirst()
 				.orElseThrow(() -> new AssertionError("No /post"));
 
-		assertFalse(info.getConsumesCondition().isBodyRequired());
+		assertThat(info.getConsumesCondition().isBodyRequired()).isFalse();
 	}
 
 	@Test
@@ -229,15 +221,15 @@ public class RequestMappingHandlerMappingTests {
 		Method method = ClassUtils.getMethod(clazz, methodName, (Class<?>[]) null);
 		RequestMappingInfo info = this.handlerMapping.getMappingForMethod(method, clazz);
 
-		assertNotNull(info);
+		assertThat(info).isNotNull();
 
 		Set<String> paths = info.getPatternsCondition().getPatterns();
-		assertEquals(1, paths.size());
-		assertEquals(path, paths.iterator().next());
+		assertThat(paths.size()).isEqualTo(1);
+		assertThat(paths.iterator().next()).isEqualTo(path);
 
 		Set<RequestMethod> methods = info.getMethodsCondition().getMethods();
-		assertEquals(1, methods.size());
-		assertEquals(requestMethod, methods.iterator().next());
+		assertThat(methods.size()).isEqualTo(1);
+		assertThat(methods.iterator().next()).isEqualTo(requestMethod);
 
 		return info;
 	}

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java

@@ -66,8 +66,7 @@ import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
 /**
@@ -178,7 +177,7 @@ public class RequestPartIntegrationTests {
 		this.restTemplate.setMessageConverters(Collections.singletonList(converter));
 
 		ResponseEntity<Void> responseEntity = restTemplate.exchange(requestEntity, Void.class);
-		assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
+		assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
 	private void testCreate(String url, String basename) {
@@ -192,7 +191,7 @@ public class RequestPartIntegrationTests {
 		parts.add("iso-8859-1-data", new HttpEntity<>(new byte[] {(byte) 0xC4}, headers)); // SPR-13096
 
 		URI location = restTemplate.postForLocation(url, parts);
-		assertEquals("http://localhost:8080/test/" + basename + "/logo.jpg", location.toString());
+		assertThat(location.toString()).isEqualTo(("http://localhost:8080/test/" + basename + "/logo.jpg"));
 	}
 
 
@@ -239,7 +238,7 @@ public class RequestPartIntegrationTests {
 				@RequestPart(name = "empty-data", required = false) TestData emptyData,
 				@RequestPart(name = "iso-8859-1-data") byte[] iso88591Data) {
 
-			assertArrayEquals(new byte[]{(byte) 0xC4}, iso88591Data);
+			assertThat(iso88591Data).isEqualTo(new byte[]{(byte) 0xC4});
 
 			String url = "http://localhost:8080/test/" + testData.getName() + "/" + file.get().getOriginalFilename();
 			HttpHeaders headers = new HttpHeaders();
@@ -249,7 +248,7 @@ public class RequestPartIntegrationTests {
 
 		@RequestMapping(value = "/spr13319", method = POST, consumes = "multipart/form-data")
 		public ResponseEntity<Void> create(@RequestPart("file") MultipartFile multipartFile) {
-			assertEquals("élève.txt", multipartFile.getOriginalFilename());
+			assertThat(multipartFile.getOriginalFilename()).isEqualTo("élève.txt");
 			return ResponseEntity.ok().build();
 		}
 	}

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java

@@ -58,11 +58,6 @@ import org.springframework.web.multipart.support.MissingServletRequestPartExcept
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.BDDMockito.given;
@@ -156,47 +151,49 @@ public class RequestPartMethodArgumentResolverTests {
 
 	@Test
 	public void supportsParameter() {
-		assertTrue(resolver.supportsParameter(paramRequestPart));
-		assertTrue(resolver.supportsParameter(paramNamedRequestPart));
-		assertTrue(resolver.supportsParameter(paramValidRequestPart));
-		assertTrue(resolver.supportsParameter(paramMultipartFile));
-		assertTrue(resolver.supportsParameter(paramMultipartFileList));
-		assertTrue(resolver.supportsParameter(paramMultipartFileArray));
-		assertFalse(resolver.supportsParameter(paramInt));
-		assertTrue(resolver.supportsParameter(paramMultipartFileNotAnnot));
-		assertTrue(resolver.supportsParameter(paramPart));
-		assertTrue(resolver.supportsParameter(paramPartList));
-		assertTrue(resolver.supportsParameter(paramPartArray));
-		assertFalse(resolver.supportsParameter(paramRequestParamAnnot));
-		assertTrue(resolver.supportsParameter(optionalMultipartFile));
-		assertTrue(resolver.supportsParameter(optionalMultipartFileList));
-		assertTrue(resolver.supportsParameter(optionalPart));
-		assertTrue(resolver.supportsParameter(optionalPartList));
-		assertTrue(resolver.supportsParameter(optionalRequestPart));
+		assertThat(resolver.supportsParameter(paramRequestPart)).isTrue();
+		assertThat(resolver.supportsParameter(paramNamedRequestPart)).isTrue();
+		assertThat(resolver.supportsParameter(paramValidRequestPart)).isTrue();
+		assertThat(resolver.supportsParameter(paramMultipartFile)).isTrue();
+		assertThat(resolver.supportsParameter(paramMultipartFileList)).isTrue();
+		assertThat(resolver.supportsParameter(paramMultipartFileArray)).isTrue();
+		assertThat(resolver.supportsParameter(paramInt)).isFalse();
+		assertThat(resolver.supportsParameter(paramMultipartFileNotAnnot)).isTrue();
+		assertThat(resolver.supportsParameter(paramPart)).isTrue();
+		assertThat(resolver.supportsParameter(paramPartList)).isTrue();
+		assertThat(resolver.supportsParameter(paramPartArray)).isTrue();
+		assertThat(resolver.supportsParameter(paramRequestParamAnnot)).isFalse();
+		assertThat(resolver.supportsParameter(optionalMultipartFile)).isTrue();
+		assertThat(resolver.supportsParameter(optionalMultipartFileList)).isTrue();
+		assertThat(resolver.supportsParameter(optionalPart)).isTrue();
+		assertThat(resolver.supportsParameter(optionalPartList)).isTrue();
+		assertThat(resolver.supportsParameter(optionalRequestPart)).isTrue();
 	}
 
 	@Test
 	public void resolveMultipartFile() throws Exception {
 		Object actual = resolver.resolveArgument(paramMultipartFile, null, webRequest, null);
-		assertSame(multipartFile1, actual);
+		assertThat(actual).isSameAs(multipartFile1);
 	}
 
 	@Test
 	public void resolveMultipartFileList() throws Exception {
 		Object actual = resolver.resolveArgument(paramMultipartFileList, null, webRequest, null);
-		assertTrue(actual instanceof List);
-		assertEquals(Arrays.asList(multipartFile1, multipartFile2), actual);
+		boolean condition = actual instanceof List;
+		assertThat(condition).isTrue();
+		assertThat(actual).isEqualTo(Arrays.asList(multipartFile1, multipartFile2));
 	}
 
 	@Test
 	public void resolveMultipartFileArray() throws Exception {
 		Object actual = resolver.resolveArgument(paramMultipartFileArray, null, webRequest, null);
-		assertNotNull(actual);
-		assertTrue(actual instanceof MultipartFile[]);
+		assertThat(actual).isNotNull();
+		boolean condition = actual instanceof MultipartFile[];
+		assertThat(condition).isTrue();
 		MultipartFile[] parts = (MultipartFile[]) actual;
-		assertEquals(2, parts.length);
-		assertEquals(parts[0], multipartFile1);
-		assertEquals(parts[1], multipartFile2);
+		assertThat(parts.length).isEqualTo(2);
+		assertThat(multipartFile1).isEqualTo(parts[0]);
+		assertThat(multipartFile2).isEqualTo(parts[1]);
 	}
 
 	@Test
@@ -209,8 +206,9 @@ public class RequestPartMethodArgumentResolverTests {
 
 		Object result = resolver.resolveArgument(paramMultipartFileNotAnnot, null, webRequest, null);
 
-		assertTrue(result instanceof MultipartFile);
-		assertEquals("Invalid result", expected, result);
+		boolean condition = result instanceof MultipartFile;
+		assertThat(condition).isTrue();
+		assertThat(result).as("Invalid result").isEqualTo(expected);
 	}
 
 	@Test
@@ -224,8 +222,9 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(request);
 
 		Object result = resolver.resolveArgument(paramPart, null, webRequest, null);
-		assertTrue(result instanceof Part);
-		assertEquals("Invalid result", expected, result);
+		boolean condition = result instanceof Part;
+		assertThat(condition).isTrue();
+		assertThat(result).as("Invalid result").isEqualTo(expected);
 	}
 
 	@Test
@@ -241,8 +240,9 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(request);
 
 		Object result = resolver.resolveArgument(paramPartList, null, webRequest, null);
-		assertTrue(result instanceof List);
-		assertEquals(Arrays.asList(part1, part2), result);
+		boolean condition = result instanceof List;
+		assertThat(condition).isTrue();
+		assertThat(result).isEqualTo(Arrays.asList(part1, part2));
 	}
 
 	@Test
@@ -258,11 +258,12 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(request);
 
 		Object result = resolver.resolveArgument(paramPartArray, null, webRequest, null);
-		assertTrue(result instanceof Part[]);
+		boolean condition = result instanceof Part[];
+		assertThat(condition).isTrue();
 		Part[] parts = (Part[]) result;
-		assertEquals(2, parts.length);
-		assertEquals(parts[0], part1);
-		assertEquals(parts[1], part2);
+		assertThat(parts.length).isEqualTo(2);
+		assertThat(part1).isEqualTo(parts[0]);
+		assertThat(part2).isEqualTo(parts[1]);
 	}
 
 	@Test
@@ -320,7 +321,7 @@ public class RequestPartMethodArgumentResolverTests {
 	public void isMultipartRequestPut() throws Exception {
 		this.multipartRequest.setMethod("PUT");
 		Object actualValue = resolver.resolveArgument(paramMultipartFile, null, webRequest, null);
-		assertSame(multipartFile1, actualValue);
+		assertThat(actualValue).isSameAs(multipartFile1);
 	}
 
 	@Test
@@ -332,12 +333,14 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(request);
 
 		Object actualValue = resolver.resolveArgument(optionalMultipartFile, null, webRequest, null);
-		assertTrue(actualValue instanceof Optional);
-		assertEquals("Invalid result", expected, ((Optional<?>) actualValue).get());
+		boolean condition1 = actualValue instanceof Optional;
+		assertThat(condition1).isTrue();
+		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(expected);
 
 		actualValue = resolver.resolveArgument(optionalMultipartFile, null, webRequest, null);
-		assertTrue(actualValue instanceof Optional);
-		assertEquals("Invalid result", expected, ((Optional<?>) actualValue).get());
+		boolean condition = actualValue instanceof Optional;
+		assertThat(condition).isTrue();
+		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(expected);
 	}
 
 	@Test
@@ -346,10 +349,10 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(request);
 
 		Object actualValue = resolver.resolveArgument(optionalMultipartFile, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 
 		actualValue = resolver.resolveArgument(optionalMultipartFile, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 	}
 
 	@Test
@@ -357,10 +360,10 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(new MockHttpServletRequest());
 
 		Object actualValue = resolver.resolveArgument(optionalMultipartFile, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 
 		actualValue = resolver.resolveArgument(optionalMultipartFile, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 	}
 
 	@Test
@@ -372,12 +375,14 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(request);
 
 		Object actualValue = resolver.resolveArgument(optionalMultipartFileList, null, webRequest, null);
-		assertTrue(actualValue instanceof Optional);
-		assertEquals("Invalid result", Collections.singletonList(expected), ((Optional<?>) actualValue).get());
+		boolean condition1 = actualValue instanceof Optional;
+		assertThat(condition1).isTrue();
+		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(Collections.singletonList(expected));
 
 		actualValue = resolver.resolveArgument(optionalMultipartFileList, null, webRequest, null);
-		assertTrue(actualValue instanceof Optional);
-		assertEquals("Invalid result", Collections.singletonList(expected), ((Optional<?>) actualValue).get());
+		boolean condition = actualValue instanceof Optional;
+		assertThat(condition).isTrue();
+		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(Collections.singletonList(expected));
 	}
 
 	@Test
@@ -386,10 +391,10 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(request);
 
 		Object actualValue = resolver.resolveArgument(optionalMultipartFileList, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 
 		actualValue = resolver.resolveArgument(optionalMultipartFileList, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 	}
 
 	@Test
@@ -397,10 +402,10 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(new MockHttpServletRequest());
 
 		Object actualValue = resolver.resolveArgument(optionalMultipartFileList, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 
 		actualValue = resolver.resolveArgument(optionalMultipartFileList, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 	}
 
 	@Test
@@ -414,12 +419,14 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(request);
 
 		Object actualValue = resolver.resolveArgument(optionalPart, null, webRequest, null);
-		assertTrue(actualValue instanceof Optional);
-		assertEquals("Invalid result", expected, ((Optional<?>) actualValue).get());
+		boolean condition1 = actualValue instanceof Optional;
+		assertThat(condition1).isTrue();
+		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(expected);
 
 		actualValue = resolver.resolveArgument(optionalPart, null, webRequest, null);
-		assertTrue(actualValue instanceof Optional);
-		assertEquals("Invalid result", expected, ((Optional<?>) actualValue).get());
+		boolean condition = actualValue instanceof Optional;
+		assertThat(condition).isTrue();
+		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(expected);
 	}
 
 	@Test
@@ -430,10 +437,10 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(request);
 
 		Object actualValue = resolver.resolveArgument(optionalPart, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 
 		actualValue = resolver.resolveArgument(optionalPart, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 	}
 
 	@Test
@@ -441,10 +448,10 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(new MockHttpServletRequest());
 
 		Object actualValue = resolver.resolveArgument(optionalPart, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 
 		actualValue = resolver.resolveArgument(optionalPart, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 	}
 
 	@Test
@@ -458,12 +465,14 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(request);
 
 		Object actualValue = resolver.resolveArgument(optionalPartList, null, webRequest, null);
-		assertTrue(actualValue instanceof Optional);
-		assertEquals("Invalid result", Collections.singletonList(expected), ((Optional<?>) actualValue).get());
+		boolean condition1 = actualValue instanceof Optional;
+		assertThat(condition1).isTrue();
+		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(Collections.singletonList(expected));
 
 		actualValue = resolver.resolveArgument(optionalPartList, null, webRequest, null);
-		assertTrue(actualValue instanceof Optional);
-		assertEquals("Invalid result", Collections.singletonList(expected), ((Optional<?>) actualValue).get());
+		boolean condition = actualValue instanceof Optional;
+		assertThat(condition).isTrue();
+		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(Collections.singletonList(expected));
 	}
 
 	@Test
@@ -474,10 +483,10 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(request);
 
 		Object actualValue = resolver.resolveArgument(optionalPartList, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 
 		actualValue = resolver.resolveArgument(optionalPartList, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 	}
 
 	@Test
@@ -485,10 +494,10 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(new MockHttpServletRequest());
 
 		Object actualValue = resolver.resolveArgument(optionalPartList, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 
 		actualValue = resolver.resolveArgument(optionalPartList, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 	}
 
 	@Test
@@ -501,12 +510,12 @@ public class RequestPartMethodArgumentResolverTests {
 
 		Object actualValue = resolver.resolveArgument(
 				optionalRequestPart, mavContainer, webRequest, new ValidatingBinderFactory());
-		assertEquals("Invalid argument value", Optional.of(simpleBean), actualValue);
-		assertFalse("The requestHandled flag shouldn't change", mavContainer.isRequestHandled());
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.of(simpleBean));
+		assertThat(mavContainer.isRequestHandled()).as("The requestHandled flag shouldn't change").isFalse();
 
 		actualValue = resolver.resolveArgument(optionalRequestPart, mavContainer, webRequest, new ValidatingBinderFactory());
-		assertEquals("Invalid argument value", Optional.of(simpleBean), actualValue);
-		assertFalse("The requestHandled flag shouldn't change", mavContainer.isRequestHandled());
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.of(simpleBean));
+		assertThat(mavContainer.isRequestHandled()).as("The requestHandled flag shouldn't change").isFalse();
 	}
 
 	@Test
@@ -517,10 +526,10 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(request);
 
 		Object actualValue = resolver.resolveArgument(optionalRequestPart, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 
 		actualValue = resolver.resolveArgument(optionalRequestPart, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 	}
 
 	@Test
@@ -528,10 +537,10 @@ public class RequestPartMethodArgumentResolverTests {
 		webRequest = new ServletWebRequest(new MockHttpServletRequest());
 
 		Object actualValue = resolver.resolveArgument(optionalRequestPart, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 
 		actualValue = resolver.resolveArgument(optionalRequestPart, null, webRequest, null);
-		assertEquals("Invalid argument value", Optional.empty(), actualValue);
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(Optional.empty());
 	}
 
 
@@ -542,8 +551,8 @@ public class RequestPartMethodArgumentResolverTests {
 		ModelAndViewContainer mavContainer = new ModelAndViewContainer();
 
 		Object actualValue = resolver.resolveArgument(parameter, mavContainer, webRequest, new ValidatingBinderFactory());
-		assertEquals("Invalid argument value", argValue, actualValue);
-		assertFalse("The requestHandled flag shouldn't change", mavContainer.isRequestHandled());
+		assertThat(actualValue).as("Invalid argument value").isEqualTo(argValue);
+		assertThat(mavContainer.isRequestHandled()).as("The requestHandled flag shouldn't change").isFalse();
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyAdviceChainTests.java

@@ -42,8 +42,7 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.method.ControllerAdviceBean;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.BDDMockito.given;
@@ -94,14 +93,14 @@ public class RequestResponseBodyAdviceChainTests {
 		given(requestAdvice.beforeBodyRead(eq(this.request), eq(this.paramType), eq(String.class),
 				eq(this.converterType))).willReturn(wrapped);
 
-		assertSame(wrapped, chain.beforeBodyRead(this.request, this.paramType, String.class, this.converterType));
+		assertThat(chain.beforeBodyRead(this.request, this.paramType, String.class, this.converterType)).isSameAs(wrapped);
 
 		String modified = "body++";
 		given(requestAdvice.afterBodyRead(eq(this.body), eq(this.request), eq(this.paramType),
 				eq(String.class), eq(this.converterType))).willReturn(modified);
 
-		assertEquals(modified, chain.afterBodyRead(this.body, this.request, this.paramType,
-				String.class, this.converterType));
+		assertThat(chain.afterBodyRead(this.body, this.request, this.paramType,
+				String.class, this.converterType)).isEqualTo(modified);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -120,7 +119,7 @@ public class RequestResponseBodyAdviceChainTests {
 		String actual = (String) chain.beforeBodyWrite(this.body, this.returnType, this.contentType,
 				this.converterType, this.request, this.response);
 
-		assertEquals(expected, actual);
+		assertThat(actual).isEqualTo(expected);
 	}
 
 	@Test
@@ -131,7 +130,7 @@ public class RequestResponseBodyAdviceChainTests {
 		String actual = (String) chain.beforeBodyWrite(this.body, this.returnType, this.contentType,
 				this.converterType, this.request, this.response);
 
-		assertEquals("body-MyControllerAdvice", actual);
+		assertThat(actual).isEqualTo("body-MyControllerAdvice");
 	}
 
 	@Test
@@ -142,7 +141,7 @@ public class RequestResponseBodyAdviceChainTests {
 		String actual = (String) chain.beforeBodyWrite(this.body, this.returnType, this.contentType,
 				this.converterType, this.request, this.response);
 
-		assertEquals(this.body, actual);
+		assertThat(actual).isEqualTo(this.body);
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java

@@ -56,10 +56,6 @@ import org.springframework.web.servlet.HandlerMapping;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyCollection;
 import static org.mockito.ArgumentMatchers.argThat;
@@ -144,14 +140,14 @@ public class RequestResponseBodyMethodProcessorMockTests {
 
 	@Test
 	public void supportsParameter() {
-		assertTrue("RequestBody parameter not supported", processor.supportsParameter(paramRequestBodyString));
-		assertFalse("non-RequestBody parameter supported", processor.supportsParameter(paramInt));
+		assertThat(processor.supportsParameter(paramRequestBodyString)).as("RequestBody parameter not supported").isTrue();
+		assertThat(processor.supportsParameter(paramInt)).as("non-RequestBody parameter supported").isFalse();
 	}
 
 	@Test
 	public void supportsReturnType() {
-		assertTrue("ResponseBody return type not supported", processor.supportsReturnType(returnTypeString));
-		assertFalse("non-ResponseBody return type supported", processor.supportsReturnType(returnTypeInt));
+		assertThat(processor.supportsReturnType(returnTypeString)).as("ResponseBody return type not supported").isTrue();
+		assertThat(processor.supportsReturnType(returnTypeInt)).as("non-ResponseBody return type supported").isFalse();
 	}
 
 	@Test
@@ -168,8 +164,8 @@ public class RequestResponseBodyMethodProcessorMockTests {
 		Object result = processor.resolveArgument(paramRequestBodyString, mavContainer,
 				webRequest, new ValidatingBinderFactory());
 
-		assertEquals("Invalid argument", body, result);
-		assertFalse("The requestHandled flag shouldn't change", mavContainer.isRequestHandled());
+		assertThat(result).as("Invalid argument").isEqualTo(body);
+		assertThat(mavContainer.isRequestHandled()).as("The requestHandled flag shouldn't change").isFalse();
 	}
 
 	@Test
@@ -248,8 +244,8 @@ public class RequestResponseBodyMethodProcessorMockTests {
 		servletRequest.setMethod("GET");
 		servletRequest.setContent(new byte[0]);
 		given(stringMessageConverter.canRead(String.class, MediaType.APPLICATION_OCTET_STREAM)).willReturn(false);
-		assertNull(processor.resolveArgument(paramStringNotRequired, mavContainer,
-				webRequest, new ValidatingBinderFactory()));
+		assertThat(processor.resolveArgument(paramStringNotRequired, mavContainer,
+				webRequest, new ValidatingBinderFactory())).isNull();
 	}
 
 	@Test
@@ -258,8 +254,8 @@ public class RequestResponseBodyMethodProcessorMockTests {
 		servletRequest.setContent("body".getBytes());
 		given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true);
 		given(stringMessageConverter.read(eq(String.class), isA(HttpInputMessage.class))).willReturn("body");
-		assertEquals("body", processor.resolveArgument(paramStringNotRequired, mavContainer,
-				webRequest, new ValidatingBinderFactory()));
+		assertThat(processor.resolveArgument(paramStringNotRequired, mavContainer,
+				webRequest, new ValidatingBinderFactory())).isEqualTo("body");
 	}
 
 	@Test
@@ -267,8 +263,8 @@ public class RequestResponseBodyMethodProcessorMockTests {
 		servletRequest.setContentType("text/plain");
 		servletRequest.setContent(new byte[0]);
 		given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true);
-		assertNull(processor.resolveArgument(paramStringNotRequired, mavContainer,
-				webRequest, new ValidatingBinderFactory()));
+		assertThat(processor.resolveArgument(paramStringNotRequired, mavContainer,
+				webRequest, new ValidatingBinderFactory())).isNull();
 	}
 
 	@Test  // SPR-13417
@@ -276,8 +272,8 @@ public class RequestResponseBodyMethodProcessorMockTests {
 		servletRequest.setContent(new byte[0]);
 		given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true);
 		given(stringMessageConverter.canRead(String.class, MediaType.APPLICATION_OCTET_STREAM)).willReturn(false);
-		assertNull(processor.resolveArgument(paramStringNotRequired, mavContainer,
-				webRequest, new ValidatingBinderFactory()));
+		assertThat(processor.resolveArgument(paramStringNotRequired, mavContainer,
+				webRequest, new ValidatingBinderFactory())).isNull();
 	}
 
 	@Test
@@ -286,8 +282,8 @@ public class RequestResponseBodyMethodProcessorMockTests {
 		servletRequest.setContent("body".getBytes());
 		given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true);
 		given(stringMessageConverter.read(eq(String.class), isA(HttpInputMessage.class))).willReturn("body");
-		assertEquals(Optional.of("body"), processor.resolveArgument(paramOptionalString, mavContainer,
-				webRequest, new ValidatingBinderFactory()));
+		assertThat(processor.resolveArgument(paramOptionalString, mavContainer,
+				webRequest, new ValidatingBinderFactory())).isEqualTo(Optional.of("body"));
 	}
 
 	@Test
@@ -295,7 +291,7 @@ public class RequestResponseBodyMethodProcessorMockTests {
 		servletRequest.setContentType("text/plain");
 		servletRequest.setContent(new byte[0]);
 		given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true);
-		assertEquals(Optional.empty(), processor.resolveArgument(paramOptionalString, mavContainer, webRequest, new ValidatingBinderFactory()));
+		assertThat(processor.resolveArgument(paramOptionalString, mavContainer, webRequest, new ValidatingBinderFactory())).isEqualTo(Optional.empty());
 	}
 
 	@Test
@@ -303,8 +299,8 @@ public class RequestResponseBodyMethodProcessorMockTests {
 		servletRequest.setContent(new byte[0]);
 		given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true);
 		given(stringMessageConverter.canRead(String.class, MediaType.APPLICATION_OCTET_STREAM)).willReturn(false);
-		assertEquals(Optional.empty(), processor.resolveArgument(paramOptionalString, mavContainer,
-				webRequest, new ValidatingBinderFactory()));
+		assertThat(processor.resolveArgument(paramOptionalString, mavContainer,
+				webRequest, new ValidatingBinderFactory())).isEqualTo(Optional.empty());
 	}
 
 	@Test
@@ -319,7 +315,7 @@ public class RequestResponseBodyMethodProcessorMockTests {
 
 		processor.handleReturnValue(body, returnTypeString, mavContainer, webRequest);
 
-		assertTrue("The requestHandled flag wasn't set", mavContainer.isRequestHandled());
+		assertThat(mavContainer.isRequestHandled()).as("The requestHandled flag wasn't set").isTrue();
 		verify(stringMessageConverter).write(eq(body), eq(accepted), isA(HttpOutputMessage.class));
 	}
 
@@ -335,7 +331,7 @@ public class RequestResponseBodyMethodProcessorMockTests {
 
 		processor.handleReturnValue(body, returnTypeStringProduces, mavContainer, webRequest);
 
-		assertTrue(mavContainer.isRequestHandled());
+		assertThat(mavContainer.isRequestHandled()).isTrue();
 		verify(stringMessageConverter).write(eq(body), eq(MediaType.TEXT_HTML), isA(HttpOutputMessage.class));
 	}
 
@@ -379,7 +375,7 @@ public class RequestResponseBodyMethodProcessorMockTests {
 
 		then(resourceMessageConverter).should(times(1)).write(any(ByteArrayResource.class),
 				eq(MediaType.APPLICATION_OCTET_STREAM), any(HttpOutputMessage.class));
-		assertEquals(200, servletResponse.getStatus());
+		assertThat(servletResponse.getStatus()).isEqualTo(200);
 	}
 
 	@Test  // SPR-9841
@@ -396,7 +392,7 @@ public class RequestResponseBodyMethodProcessorMockTests {
 
 		processor.handleReturnValue(body, returnTypeStringProduces, mavContainer, webRequest);
 
-		assertTrue(mavContainer.isRequestHandled());
+		assertThat(mavContainer.isRequestHandled()).isTrue();
 		verify(stringMessageConverter).write(eq(body), eq(accepted), isA(HttpOutputMessage.class));
 	}
 
@@ -413,7 +409,7 @@ public class RequestResponseBodyMethodProcessorMockTests {
 		then(resourceRegionMessageConverter).should(times(1)).write(
 				anyCollection(), eq(MediaType.APPLICATION_OCTET_STREAM),
 				argThat(outputMessage -> "bytes".equals(outputMessage.getHeaders().getFirst(HttpHeaders.ACCEPT_RANGES))));
-		assertEquals(206, servletResponse.getStatus());
+		assertThat(servletResponse.getStatus()).isEqualTo(206);
 	}
 
 	@Test
@@ -428,7 +424,7 @@ public class RequestResponseBodyMethodProcessorMockTests {
 
 		then(resourceRegionMessageConverter).should(never()).write(
 				anyCollection(), eq(MediaType.APPLICATION_OCTET_STREAM), any(HttpOutputMessage.class));
-		assertEquals(416, servletResponse.getStatus());
+		assertThat(servletResponse.getStatus()).isEqualTo(416);
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java

@@ -70,13 +70,9 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 import org.springframework.web.util.WebUtils;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Test fixture for a {@link RequestResponseBodyMethodProcessor} with
@@ -139,9 +135,9 @@ public class RequestResponseBodyMethodProcessorTests {
 		List<SimpleBean> result = (List<SimpleBean>) processor.resolveArgument(
 				paramGenericList, container, request, factory);
 
-		assertNotNull(result);
-		assertEquals("Jad", result.get(0).getName());
-		assertEquals("Robert", result.get(1).getName());
+		assertThat(result).isNotNull();
+		assertThat(result.get(0).getName()).isEqualTo("Jad");
+		assertThat(result.get(1).getName()).isEqualTo("Robert");
 	}
 
 	@Test
@@ -159,9 +155,9 @@ public class RequestResponseBodyMethodProcessorTests {
 		MultiValueMap<String, String> result = (MultiValueMap<String, String>) processor.resolveArgument(
 				paramMultiValueMap, container, request, factory);
 
-		assertNotNull(result);
-		assertEquals("apple", result.getFirst("fruit"));
-		assertEquals("kale", result.getFirst("vegetable"));
+		assertThat(result).isNotNull();
+		assertThat(result.getFirst("fruit")).isEqualTo("apple");
+		assertThat(result.getFirst("vegetable")).isEqualTo("kale");
 	}
 
 	@Test
@@ -177,8 +173,8 @@ public class RequestResponseBodyMethodProcessorTests {
 		SimpleBean result = (SimpleBean) processor.resolveArgument(
 				paramSimpleBean, container, request, factory);
 
-		assertNotNull(result);
-		assertEquals("Jad", result.getName());
+		assertThat(result).isNotNull();
+		assertThat(result.getName()).isEqualTo("Jad");
 	}
 
 	@Test
@@ -194,8 +190,8 @@ public class RequestResponseBodyMethodProcessorTests {
 		String result = (String) processor.resolveArgument(
 				paramString, container, request, factory);
 
-		assertNotNull(result);
-		assertEquals("foobarbaz", result);
+		assertThat(result).isNotNull();
+		assertThat(result).isEqualTo("foobarbaz");
 	}
 
 	@Test // SPR-9942
@@ -217,8 +213,8 @@ public class RequestResponseBodyMethodProcessorTests {
 		List<Object> advice = Collections.singletonList(new EmptyRequestBodyAdvice());
 		RequestResponseBodyMethodProcessor processor = new RequestResponseBodyMethodProcessor(converters, advice);
 		String arg = (String) processor.resolveArgument(paramString, container, request, factory);
-		assertNotNull(arg);
-		assertEquals("default value for empty body", arg);
+		assertThat(arg).isNotNull();
+		assertThat(arg).isEqualTo("default value for empty body");
 	}
 
 	@Test  // SPR-9964
@@ -237,8 +233,8 @@ public class RequestResponseBodyMethodProcessorTests {
 
 		SimpleBean result = (SimpleBean) processor.resolveArgument(methodParam, container, request, factory);
 
-		assertNotNull(result);
-		assertEquals("Jad", result.getName());
+		assertThat(result).isNotNull();
+		assertThat(result.getName()).isEqualTo("Jad");
 	}
 
 	@Test  // SPR-14470
@@ -259,9 +255,9 @@ public class RequestResponseBodyMethodProcessorTests {
 		List<SimpleBean> result = (List<SimpleBean>) processor.resolveArgument(
 				methodParam, container, request, factory);
 
-		assertNotNull(result);
-		assertEquals("Jad", result.get(0).getName());
-		assertEquals("Robert", result.get(1).getName());
+		assertThat(result).isNotNull();
+		assertThat(result.get(0).getName()).isEqualTo("Jad");
+		assertThat(result.get(1).getName()).isEqualTo("Robert");
 	}
 
 	@Test  // SPR-11225
@@ -282,8 +278,8 @@ public class RequestResponseBodyMethodProcessorTests {
 
 		SimpleBean result = (SimpleBean) processor.resolveArgument(methodParam, container, request, factory);
 
-		assertNotNull(result);
-		assertEquals("Jad", result.getName());
+		assertThat(result).isNotNull();
+		assertThat(result.getName()).isEqualTo("Jad");
 	}
 
 	@Test  // SPR-9160
@@ -297,7 +293,7 @@ public class RequestResponseBodyMethodProcessorTests {
 
 		processor.writeWithMessageConverters("Foo", returnTypeString, request);
 
-		assertEquals("application/json;charset=UTF-8", servletResponse.getHeader("Content-Type"));
+		assertThat(servletResponse.getHeader("Content-Type")).isEqualTo("application/json;charset=UTF-8");
 	}
 
 	@Test
@@ -309,8 +305,8 @@ public class RequestResponseBodyMethodProcessorTests {
 		RequestResponseBodyMethodProcessor processor = new RequestResponseBodyMethodProcessor(converters);
 		processor.handleReturnValue("Foo", returnTypeString, container, request);
 
-		assertEquals("text/plain;charset=ISO-8859-1", servletResponse.getHeader("Content-Type"));
-		assertEquals("Foo", servletResponse.getContentAsString());
+		assertThat(servletResponse.getHeader("Content-Type")).isEqualTo("text/plain;charset=ISO-8859-1");
+		assertThat(servletResponse.getContentAsString()).isEqualTo("Foo");
 	}
 
 	@Test  // SPR-13423
@@ -325,8 +321,8 @@ public class RequestResponseBodyMethodProcessorTests {
 		RequestResponseBodyMethodProcessor processor = new RequestResponseBodyMethodProcessor(converters);
 		processor.handleReturnValue(new StringBuilder("Foo"), returnType, container, request);
 
-		assertEquals("text/plain;charset=ISO-8859-1", servletResponse.getHeader("Content-Type"));
-		assertEquals("Foo", servletResponse.getContentAsString());
+		assertThat(servletResponse.getHeader("Content-Type")).isEqualTo("text/plain;charset=ISO-8859-1");
+		assertThat(servletResponse.getContentAsString()).isEqualTo("Foo");
 	}
 
 	@Test
@@ -340,7 +336,7 @@ public class RequestResponseBodyMethodProcessorTests {
 
 		processor.writeWithMessageConverters("Foo", returnTypeString, request);
 
-		assertEquals("text/plain;charset=UTF-8", servletResponse.getHeader("Content-Type"));
+		assertThat(servletResponse.getHeader("Content-Type")).isEqualTo("text/plain;charset=UTF-8");
 	}
 
 	// SPR-12894
@@ -359,7 +355,7 @@ public class RequestResponseBodyMethodProcessorTests {
 		ClassPathResource resource = new ClassPathResource("logo.jpg", getClass());
 		processor.writeWithMessageConverters(resource, returnType, this.request);
 
-		assertEquals("image/jpeg", this.servletResponse.getHeader("Content-Type"));
+		assertThat(this.servletResponse.getHeader("Content-Type")).isEqualTo("image/jpeg");
 	}
 
 	// SPR-13135
@@ -414,7 +410,7 @@ public class RequestResponseBodyMethodProcessorTests {
 
 		RequestResponseBodyMethodProcessor processor = new RequestResponseBodyMethodProcessor(converters);
 
-		assertTrue("Failed to recognize type-level @ResponseBody", processor.supportsReturnType(returnType));
+		assertThat(processor.supportsReturnType(returnType)).as("Failed to recognize type-level @ResponseBody").isTrue();
 	}
 
 	@Test
@@ -427,7 +423,7 @@ public class RequestResponseBodyMethodProcessorTests {
 
 		RequestResponseBodyMethodProcessor processor = new RequestResponseBodyMethodProcessor(converters);
 
-		assertTrue("Failed to recognize type-level @RestController", processor.supportsReturnType(returnType));
+		assertThat(processor.supportsReturnType(returnType)).as("Failed to recognize type-level @RestController").isTrue();
 	}
 
 	@Test
@@ -446,9 +442,9 @@ public class RequestResponseBodyMethodProcessorTests {
 		processor.handleReturnValue(returnValue, methodReturnType, this.container, this.request);
 
 		String content = this.servletResponse.getContentAsString();
-		assertFalse(content.contains("\"withView1\":\"with\""));
-		assertTrue(content.contains("\"withView2\":\"with\""));
-		assertFalse(content.contains("\"withoutView\":\"without\""));
+		assertThat(content.contains("\"withView1\":\"with\"")).isFalse();
+		assertThat(content.contains("\"withView2\":\"with\"")).isTrue();
+		assertThat(content.contains("\"withoutView\":\"without\"")).isFalse();
 	}
 
 	@Test
@@ -467,9 +463,9 @@ public class RequestResponseBodyMethodProcessorTests {
 		processor.handleReturnValue(returnValue, methodReturnType, this.container, this.request);
 
 		String content = this.servletResponse.getContentAsString();
-		assertFalse(content.contains("\"withView1\":\"with\""));
-		assertTrue(content.contains("\"withView2\":\"with\""));
-		assertFalse(content.contains("\"withoutView\":\"without\""));
+		assertThat(content.contains("\"withView1\":\"with\"")).isFalse();
+		assertThat(content.contains("\"withView2\":\"with\"")).isTrue();
+		assertThat(content.contains("\"withoutView\":\"without\"")).isFalse();
 	}
 
 	@Test  // SPR-12149
@@ -488,9 +484,9 @@ public class RequestResponseBodyMethodProcessorTests {
 		processor.handleReturnValue(returnValue, methodReturnType, this.container, this.request);
 
 		String content = this.servletResponse.getContentAsString();
-		assertFalse(content.contains("<withView1>with</withView1>"));
-		assertTrue(content.contains("<withView2>with</withView2>"));
-		assertFalse(content.contains("<withoutView>without</withoutView>"));
+		assertThat(content.contains("<withView1>with</withView1>")).isFalse();
+		assertThat(content.contains("<withView2>with</withView2>")).isTrue();
+		assertThat(content.contains("<withoutView>without</withoutView>")).isFalse();
 	}
 
 	@Test  // SPR-12149
@@ -509,9 +505,9 @@ public class RequestResponseBodyMethodProcessorTests {
 		processor.handleReturnValue(returnValue, methodReturnType, this.container, this.request);
 
 		String content = this.servletResponse.getContentAsString();
-		assertFalse(content.contains("<withView1>with</withView1>"));
-		assertTrue(content.contains("<withView2>with</withView2>"));
-		assertFalse(content.contains("<withoutView>without</withoutView>"));
+		assertThat(content.contains("<withView1>with</withView1>")).isFalse();
+		assertThat(content.contains("<withView2>with</withView2>")).isTrue();
+		assertThat(content.contains("<withoutView>without</withoutView>")).isFalse();
 	}
 
 	@Test  // SPR-12501
@@ -530,14 +526,13 @@ public class RequestResponseBodyMethodProcessorTests {
 		RequestResponseBodyMethodProcessor processor = new RequestResponseBodyMethodProcessor(
 				converters, null, Collections.singletonList(new JsonViewRequestBodyAdvice()));
 
-		@SuppressWarnings("unchecked")
 		JacksonViewBean result = (JacksonViewBean)
 				processor.resolveArgument(methodParameter, this.container, this.request, this.factory);
 
-		assertNotNull(result);
-		assertEquals("with", result.getWithView1());
-		assertNull(result.getWithView2());
-		assertNull(result.getWithoutView());
+		assertThat(result).isNotNull();
+		assertThat(result.getWithView1()).isEqualTo("with");
+		assertThat(result.getWithView2()).isNull();
+		assertThat(result.getWithoutView()).isNull();
 	}
 
 	@Test  // SPR-12501
@@ -560,11 +555,11 @@ public class RequestResponseBodyMethodProcessorTests {
 		HttpEntity<JacksonViewBean> result = (HttpEntity<JacksonViewBean>)
 				processor.resolveArgument( methodParameter, this.container, this.request, this.factory);
 
-		assertNotNull(result);
-		assertNotNull(result.getBody());
-		assertEquals("with", result.getBody().getWithView1());
-		assertNull(result.getBody().getWithView2());
-		assertNull(result.getBody().getWithoutView());
+		assertThat(result).isNotNull();
+		assertThat(result.getBody()).isNotNull();
+		assertThat(result.getBody().getWithView1()).isEqualTo("with");
+		assertThat(result.getBody().getWithView2()).isNull();
+		assertThat(result.getBody().getWithoutView()).isNull();
 	}
 
 	@Test  // SPR-12501
@@ -586,14 +581,13 @@ public class RequestResponseBodyMethodProcessorTests {
 		RequestResponseBodyMethodProcessor processor = new RequestResponseBodyMethodProcessor(
 				converters, null, Collections.singletonList(new JsonViewRequestBodyAdvice()));
 
-		@SuppressWarnings("unchecked")
 		JacksonViewBean result = (JacksonViewBean)
 				processor.resolveArgument(methodParameter, this.container, this.request, this.factory);
 
-		assertNotNull(result);
-		assertEquals("with", result.getWithView1());
-		assertNull(result.getWithView2());
-		assertNull(result.getWithoutView());
+		assertThat(result).isNotNull();
+		assertThat(result.getWithView1()).isEqualTo("with");
+		assertThat(result.getWithView2()).isNull();
+		assertThat(result.getWithoutView()).isNull();
 	}
 
 	@Test  // SPR-12501
@@ -619,11 +613,11 @@ public class RequestResponseBodyMethodProcessorTests {
 		HttpEntity<JacksonViewBean> result = (HttpEntity<JacksonViewBean>)
 				processor.resolveArgument(methodParameter, this.container, this.request, this.factory);
 
-		assertNotNull(result);
-		assertNotNull(result.getBody());
-		assertEquals("with", result.getBody().getWithView1());
-		assertNull(result.getBody().getWithView2());
-		assertNull(result.getBody().getWithoutView());
+		assertThat(result).isNotNull();
+		assertThat(result.getBody()).isNotNull();
+		assertThat(result.getBody().getWithView1()).isEqualTo("with");
+		assertThat(result.getBody().getWithView2()).isNull();
+		assertThat(result.getBody().getWithoutView()).isNull();
 	}
 
 	@Test  // SPR-12811
@@ -640,8 +634,8 @@ public class RequestResponseBodyMethodProcessorTests {
 		processor.handleReturnValue(returnValue, methodReturnType, this.container, this.request);
 
 		String content = this.servletResponse.getContentAsString();
-		assertTrue(content.contains("\"type\":\"foo\""));
-		assertTrue(content.contains("\"type\":\"bar\""));
+		assertThat(content.contains("\"type\":\"foo\"")).isTrue();
+		assertThat(content.contains("\"type\":\"bar\"")).isTrue();
 	}
 
 	@Test  // SPR-13318
@@ -658,8 +652,8 @@ public class RequestResponseBodyMethodProcessorTests {
 		processor.handleReturnValue(returnValue, methodReturnType, this.container, this.request);
 
 		String content = this.servletResponse.getContentAsString();
-		assertTrue(content.contains("\"id\":123"));
-		assertTrue(content.contains("\"name\":\"foo\""));
+		assertThat(content.contains("\"id\":123")).isTrue();
+		assertThat(content.contains("\"name\":\"foo\"")).isTrue();
 	}
 
 	@Test  // SPR-13318
@@ -676,10 +670,10 @@ public class RequestResponseBodyMethodProcessorTests {
 		processor.handleReturnValue(returnValue, methodReturnType, this.container, this.request);
 
 		String content = this.servletResponse.getContentAsString();
-		assertTrue(content.contains("\"id\":123"));
-		assertTrue(content.contains("\"name\":\"foo\""));
-		assertTrue(content.contains("\"id\":456"));
-		assertTrue(content.contains("\"name\":\"bar\""));
+		assertThat(content.contains("\"id\":123")).isTrue();
+		assertThat(content.contains("\"name\":\"foo\"")).isTrue();
+		assertThat(content.contains("\"id\":456")).isTrue();
+		assertThat(content.contains("\"name\":\"bar\"")).isTrue();
 	}
 
 	@Test  // SPR-13631
@@ -695,7 +689,7 @@ public class RequestResponseBodyMethodProcessorTests {
 		Object returnValue = new JacksonController().defaultCharset();
 		processor.handleReturnValue(returnValue, methodReturnType, this.container, this.request);
 
-		assertEquals("UTF-8", this.servletResponse.getCharacterEncoding());
+		assertThat(this.servletResponse.getCharacterEncoding()).isEqualTo("UTF-8");
 	}
 
 	@Test  // SPR-14520
@@ -714,7 +708,7 @@ public class RequestResponseBodyMethodProcessorTests {
 
 		String value = (String) processor.readWithMessageConverters(
 				this.request, methodParameter, methodParameter.getGenericParameterType());
-		assertEquals("foo", value);
+		assertThat(value).isEqualTo("foo");
 	}
 
 	private void assertContentDisposition(RequestResponseBodyMethodProcessor processor,
@@ -725,11 +719,10 @@ public class RequestResponseBodyMethodProcessorTests {
 
 		String header = servletResponse.getHeader("Content-Disposition");
 		if (expectContentDisposition) {
-			assertEquals("Expected 'Content-Disposition' header. Use case: '" + comment + "'",
-					"inline;filename=f.txt", header);
+			assertThat(header).as("Expected 'Content-Disposition' header. Use case: '" + comment + "'").isEqualTo("inline;filename=f.txt");
 		}
 		else {
-			assertNull("Did not expect 'Content-Disposition' header. Use case: '" + comment + "'", header);
+			assertThat(header).as("Did not expect 'Content-Disposition' header. Use case: '" + comment + "'").isNull();
 		}
 
 		this.servletRequest = new MockHttpServletRequest();

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandlerTests.java

@@ -44,12 +44,7 @@ import org.springframework.web.context.request.async.WebAsyncManager;
 import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -94,35 +89,35 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
 	@Test
 	public void supportsReturnTypes() throws Exception {
 
-		assertTrue(this.handler.supportsReturnType(
-				on(TestController.class).resolveReturnType(ResponseBodyEmitter.class)));
+		assertThat(this.handler.supportsReturnType(
+				on(TestController.class).resolveReturnType(ResponseBodyEmitter.class))).isTrue();
 
-		assertTrue(this.handler.supportsReturnType(
-				on(TestController.class).resolveReturnType(SseEmitter.class)));
+		assertThat(this.handler.supportsReturnType(
+				on(TestController.class).resolveReturnType(SseEmitter.class))).isTrue();
 
-		assertTrue(this.handler.supportsReturnType(
-				on(TestController.class).resolveReturnType(ResponseEntity.class, ResponseBodyEmitter.class)));
+		assertThat(this.handler.supportsReturnType(
+				on(TestController.class).resolveReturnType(ResponseEntity.class, ResponseBodyEmitter.class))).isTrue();
 
-		assertTrue(this.handler.supportsReturnType(
-				on(TestController.class).resolveReturnType(Flux.class, String.class)));
+		assertThat(this.handler.supportsReturnType(
+				on(TestController.class).resolveReturnType(Flux.class, String.class))).isTrue();
 
-		assertTrue(this.handler.supportsReturnType(
+		assertThat(this.handler.supportsReturnType(
 				on(TestController.class).resolveReturnType(forClassWithGenerics(ResponseEntity.class,
-								forClassWithGenerics(Flux.class, String.class)))));
+								forClassWithGenerics(Flux.class, String.class))))).isTrue();
 	}
 
 	@Test
 	public void doesNotSupportReturnTypes() throws Exception {
 
-		assertFalse(this.handler.supportsReturnType(
-				on(TestController.class).resolveReturnType(ResponseEntity.class, String.class)));
+		assertThat(this.handler.supportsReturnType(
+				on(TestController.class).resolveReturnType(ResponseEntity.class, String.class))).isFalse();
 
-		assertFalse(this.handler.supportsReturnType(
+		assertThat(this.handler.supportsReturnType(
 				on(TestController.class).resolveReturnType(forClassWithGenerics(ResponseEntity.class,
-						forClassWithGenerics(AtomicReference.class, String.class)))));
+						forClassWithGenerics(AtomicReference.class, String.class))))).isFalse();
 
-		assertFalse(this.handler.supportsReturnType(
-				on(TestController.class).resolveReturnType(ResponseEntity.class)));
+		assertThat(this.handler.supportsReturnType(
+				on(TestController.class).resolveReturnType(ResponseEntity.class))).isFalse();
 	}
 
 	@Test
@@ -131,8 +126,8 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
 		ResponseBodyEmitter emitter = new ResponseBodyEmitter();
 		this.handler.handleReturnValue(emitter, type, this.mavContainer, this.webRequest);
 
-		assertTrue(this.request.isAsyncStarted());
-		assertEquals("", this.response.getContentAsString());
+		assertThat(this.request.isAsyncStarted()).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo("");
 
 		SimpleBean bean = new SimpleBean();
 		bean.setId(1L);
@@ -149,15 +144,15 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
 		bean.setName("Jason");
 		emitter.send(bean);
 
-		assertEquals("{\"id\":1,\"name\":\"Joe\"}\n" +
+		assertThat(this.response.getContentAsString()).isEqualTo(("{\"id\":1,\"name\":\"Joe\"}\n" +
 						"{\"id\":2,\"name\":\"John\"}\n" +
-						"{\"id\":3,\"name\":\"Jason\"}", this.response.getContentAsString());
+						"{\"id\":3,\"name\":\"Jason\"}"));
 
 		MockAsyncContext asyncContext = (MockAsyncContext) this.request.getAsyncContext();
-		assertNull(asyncContext.getDispatchedPath());
+		assertThat(asyncContext.getDispatchedPath()).isNull();
 
 		emitter.complete();
-		assertNotNull(asyncContext.getDispatchedPath());
+		assertThat(asyncContext.getDispatchedPath()).isNotNull();
 	}
 
 	@Test
@@ -204,8 +199,8 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
 		SseEmitter emitter = new SseEmitter();
 		this.handler.handleReturnValue(emitter, type, this.mavContainer, this.webRequest);
 
-		assertTrue(this.request.isAsyncStarted());
-		assertEquals(200, this.response.getStatus());
+		assertThat(this.request.isAsyncStarted()).isTrue();
+		assertThat(this.response.getStatus()).isEqualTo(200);
 
 		SimpleBean bean1 = new SimpleBean();
 		bean1.setId(1L);
@@ -218,14 +213,14 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
 		emitter.send(SseEmitter.event().
 				comment("a test").name("update").id("1").reconnectTime(5000L).data(bean1).data(bean2));
 
-		assertEquals("text/event-stream;charset=UTF-8", this.response.getContentType());
-		assertEquals(":a test\n" +
+		assertThat(this.response.getContentType()).isEqualTo("text/event-stream;charset=UTF-8");
+		assertThat(this.response.getContentAsString()).isEqualTo((":a test\n" +
 						"event:update\n" +
 						"id:1\n" +
 						"retry:5000\n" +
 						"data:{\"id\":1,\"name\":\"Joe\"}\n" +
 						"data:{\"id\":2,\"name\":\"John\"}\n" +
-						"\n", this.response.getContentAsString());
+						"\n"));
 	}
 
 	@Test
@@ -237,16 +232,16 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
 		EmitterProcessor<String> processor = EmitterProcessor.create();
 		this.handler.handleReturnValue(processor, type, this.mavContainer, this.webRequest);
 
-		assertTrue(this.request.isAsyncStarted());
-		assertEquals(200, this.response.getStatus());
+		assertThat(this.request.isAsyncStarted()).isTrue();
+		assertThat(this.response.getStatus()).isEqualTo(200);
 
 		processor.onNext("foo");
 		processor.onNext("bar");
 		processor.onNext("baz");
 		processor.onComplete();
 
-		assertEquals("text/event-stream;charset=UTF-8", this.response.getContentType());
-		assertEquals("data:foo\n\ndata:bar\n\ndata:baz\n\n", this.response.getContentAsString());
+		assertThat(this.response.getContentType()).isEqualTo("text/event-stream;charset=UTF-8");
+		assertThat(this.response.getContentAsString()).isEqualTo("data:foo\n\ndata:bar\n\ndata:baz\n\n");
 	}
 
 	@Test // gh-21972
@@ -258,15 +253,15 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
 		EmitterProcessor<String> processor = EmitterProcessor.create();
 		this.handler.handleReturnValue(processor, type, this.mavContainer, this.webRequest);
 
-		assertTrue(this.request.isAsyncStarted());
+		assertThat(this.request.isAsyncStarted()).isTrue();
 
 		IllegalStateException ex = new IllegalStateException("wah wah");
 		processor.onError(ex);
 		processor.onComplete();
 
 		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(this.webRequest);
-		assertSame(ex, asyncManager.getConcurrentResult());
-		assertNull(this.response.getContentType());
+		assertThat(asyncManager.getConcurrentResult()).isSameAs(ex);
+		assertThat(this.response.getContentType()).isNull();
 	}
 
 	@Test
@@ -277,10 +272,10 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
 		this.handler.handleReturnValue(entity, type, this.mavContainer, this.webRequest);
 		emitter.complete();
 
-		assertTrue(this.request.isAsyncStarted());
-		assertEquals(200, this.response.getStatus());
-		assertEquals("text/event-stream;charset=UTF-8", this.response.getContentType());
-		assertEquals("bar", this.response.getHeader("foo"));
+		assertThat(this.request.isAsyncStarted()).isTrue();
+		assertThat(this.response.getStatus()).isEqualTo(200);
+		assertThat(this.response.getContentType()).isEqualTo("text/event-stream;charset=UTF-8");
+		assertThat(this.response.getHeader("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -289,9 +284,9 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
 		ResponseEntity<?> entity = ResponseEntity.noContent().header("foo", "bar").build();
 		this.handler.handleReturnValue(entity, type, this.mavContainer, this.webRequest);
 
-		assertFalse(this.request.isAsyncStarted());
-		assertEquals(204, this.response.getStatus());
-		assertEquals(Collections.singletonList("bar"), this.response.getHeaders("foo"));
+		assertThat(this.request.isAsyncStarted()).isFalse();
+		assertThat(this.response.getStatus()).isEqualTo(204);
+		assertThat(this.response.getHeaders("foo")).isEqualTo(Collections.singletonList("bar"));
 	}
 
 	@Test
@@ -303,16 +298,16 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
 		MethodParameter type = on(TestController.class).resolveReturnType(ResponseEntity.class, bodyType);
 		this.handler.handleReturnValue(entity, type, this.mavContainer, this.webRequest);
 
-		assertTrue(this.request.isAsyncStarted());
-		assertEquals(200, this.response.getStatus());
+		assertThat(this.request.isAsyncStarted()).isTrue();
+		assertThat(this.response.getStatus()).isEqualTo(200);
 
 		processor.onNext("foo");
 		processor.onNext("bar");
 		processor.onNext("baz");
 		processor.onComplete();
 
-		assertEquals("text/plain", this.response.getContentType());
-		assertEquals("foobarbaz", this.response.getContentAsString());
+		assertThat(this.response.getContentType()).isEqualTo("text/plain");
+		assertThat(this.response.getContentAsString()).isEqualTo("foobarbaz");
 	}
 
 	@Test // SPR-17076
@@ -324,10 +319,10 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
 		MethodParameter type = on(TestController.class).resolveReturnType(ResponseEntity.class, bodyType);
 		this.handler.handleReturnValue(entity, type, this.mavContainer, this.webRequest);
 
-		assertTrue(this.request.isAsyncStarted());
-		assertEquals(200, this.response.getStatus());
-		assertEquals("bar", this.response.getHeader("x-foo"));
-		assertFalse(this.response.isCommitted());
+		assertThat(this.request.isAsyncStarted()).isTrue();
+		assertThat(this.response.getStatus()).isEqualTo(200);
+		assertThat(this.response.getHeader("x-foo")).isEqualTo("bar");
+		assertThat(this.response.isCommitted()).isFalse();
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterTests.java

@@ -26,9 +26,9 @@ import org.mockito.MockitoAnnotations;
 
 import org.springframework.http.MediaType;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIOException;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.junit.Assert.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.willThrow;
 import static org.mockito.Mockito.mock;
@@ -169,7 +169,7 @@ public class ResponseBodyEmitterTests {
 		verify(this.handler).onTimeout(captor.capture());
 		verify(this.handler).onCompletion(any());
 
-		assertNotNull(captor.getValue());
+		assertThat(captor.getValue()).isNotNull();
 		captor.getValue().run();
 		verify(runnable).run();
 	}
@@ -185,7 +185,7 @@ public class ResponseBodyEmitterTests {
 		Runnable runnable = mock(Runnable.class);
 		this.emitter.onTimeout(runnable);
 
-		assertNotNull(captor.getValue());
+		assertThat(captor.getValue()).isNotNull();
 		captor.getValue().run();
 		verify(runnable).run();
 	}
@@ -200,7 +200,7 @@ public class ResponseBodyEmitterTests {
 		verify(this.handler).onTimeout(any());
 		verify(this.handler).onCompletion(captor.capture());
 
-		assertNotNull(captor.getValue());
+		assertThat(captor.getValue()).isNotNull();
 		captor.getValue().run();
 		verify(runnable).run();
 	}
@@ -216,7 +216,7 @@ public class ResponseBodyEmitterTests {
 		Runnable runnable = mock(Runnable.class);
 		this.emitter.onCompletion(runnable);
 
-		assertNotNull(captor.getValue());
+		assertThat(captor.getValue()).isNotNull();
 		captor.getValue().run();
 		verify(runnable).run();
 	}

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java

@@ -61,11 +61,7 @@ import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.NoHandlerFoundException;
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture for {@link ResponseEntityExceptionHandler}.
@@ -107,7 +103,7 @@ public class ResponseEntityExceptionHandlerTests {
 			Class<?>[] paramTypes = method.getParameterTypes();
 			if (method.getName().startsWith("handle") && (paramTypes.length == 4)) {
 				String name = paramTypes[0].getSimpleName();
-				assertTrue("@ExceptionHandler is missing " + name, exceptionTypes.contains(paramTypes[0]));
+				assertThat(exceptionTypes.contains(paramTypes[0])).as("@ExceptionHandler is missing " + name).isTrue();
 			}
 		}
 	}
@@ -118,7 +114,7 @@ public class ResponseEntityExceptionHandlerTests {
 		Exception ex = new HttpRequestMethodNotSupportedException("GET", supported);
 
 		ResponseEntity<Object> responseEntity = testException(ex);
-		assertEquals(EnumSet.of(HttpMethod.POST, HttpMethod.DELETE), responseEntity.getHeaders().getAllow());
+		assertThat(responseEntity.getHeaders().getAllow()).isEqualTo(EnumSet.of(HttpMethod.POST, HttpMethod.DELETE));
 	}
 
 	@Test
@@ -127,7 +123,7 @@ public class ResponseEntityExceptionHandlerTests {
 		Exception ex = new HttpMediaTypeNotSupportedException(MediaType.APPLICATION_JSON, acceptable);
 
 		ResponseEntity<Object> responseEntity = testException(ex);
-		assertEquals(acceptable, responseEntity.getHeaders().getAccept());
+		assertThat(responseEntity.getHeaders().getAccept()).isEqualTo(acceptable);
 	}
 
 	@Test
@@ -224,11 +220,11 @@ public class ResponseEntityExceptionHandlerTests {
 		resolver.afterPropertiesSet();
 
 		ServletRequestBindingException ex = new ServletRequestBindingException("message");
-		assertNotNull(resolver.resolveException(this.servletRequest, this.servletResponse, null, ex));
+		assertThat(resolver.resolveException(this.servletRequest, this.servletResponse, null, ex)).isNotNull();
 
-		assertEquals(400, this.servletResponse.getStatus());
-		assertEquals("error content", this.servletResponse.getContentAsString());
-		assertEquals("someHeaderValue", this.servletResponse.getHeader("someHeader"));
+		assertThat(this.servletResponse.getStatus()).isEqualTo(400);
+		assertThat(this.servletResponse.getContentAsString()).isEqualTo("error content");
+		assertThat(this.servletResponse.getHeader("someHeader")).isEqualTo("someHeaderValue");
 	}
 
 	@Test
@@ -242,7 +238,7 @@ public class ResponseEntityExceptionHandlerTests {
 		resolver.afterPropertiesSet();
 
 		IllegalStateException ex = new IllegalStateException(new ServletRequestBindingException("message"));
-		assertNull(resolver.resolveException(this.servletRequest, this.servletResponse, null, ex));
+		assertThat(resolver.resolveException(this.servletRequest, this.servletResponse, null, ex)).isNull();
 	}
 
 	@Test
@@ -256,9 +252,9 @@ public class ResponseEntityExceptionHandlerTests {
 		servlet.init(new MockServletConfig());
 		servlet.service(this.servletRequest, this.servletResponse);
 
-		assertEquals(400, this.servletResponse.getStatus());
-		assertEquals("error content", this.servletResponse.getContentAsString());
-		assertEquals("someHeaderValue", this.servletResponse.getHeader("someHeader"));
+		assertThat(this.servletResponse.getStatus()).isEqualTo(400);
+		assertThat(this.servletResponse.getContentAsString()).isEqualTo("error content");
+		assertThat(this.servletResponse.getHeader("someHeader")).isEqualTo("someHeaderValue");
 	}
 
 	@Test
@@ -274,8 +270,10 @@ public class ResponseEntityExceptionHandlerTests {
 			servlet.service(this.servletRequest, this.servletResponse);
 		}
 		catch (ServletException ex) {
-			assertTrue(ex.getCause() instanceof IllegalStateException);
-			assertTrue(ex.getCause().getCause() instanceof ServletRequestBindingException);
+			boolean condition1 = ex.getCause() instanceof IllegalStateException;
+			assertThat(condition1).isTrue();
+			boolean condition = ex.getCause().getCause() instanceof ServletRequestBindingException;
+			assertThat(condition).isTrue();
 		}
 	}
 
@@ -286,12 +284,12 @@ public class ResponseEntityExceptionHandlerTests {
 
 			// SPR-9653
 			if (HttpStatus.INTERNAL_SERVER_ERROR.equals(responseEntity.getStatusCode())) {
-				assertSame(ex, this.servletRequest.getAttribute("javax.servlet.error.exception"));
+				assertThat(this.servletRequest.getAttribute("javax.servlet.error.exception")).isSameAs(ex);
 			}
 
 			this.defaultExceptionResolver.resolveException(this.servletRequest, this.servletResponse, null, ex);
 
-			assertEquals(this.servletResponse.getStatus(), responseEntity.getStatusCode().value());
+			assertThat(responseEntity.getStatusCode().value()).isEqualTo(this.servletResponse.getStatus());
 
 			return responseEntity;
 		}

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java

@@ -29,7 +29,7 @@ import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.context.request.ServletWebRequest;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture with {@link ServletCookieValueMethodArgumentResolver}.
@@ -67,7 +67,7 @@ public class ServletCookieValueMethodArgumentResolverTests {
 		request.setCookies(expected);
 
 		Cookie result = (Cookie) resolver.resolveArgument(cookieParameter, null, webRequest, null);
-		assertEquals("Invalid result", expected, result);
+		assertThat(result).as("Invalid result").isEqualTo(expected);
 	}
 
 	@Test
@@ -76,7 +76,7 @@ public class ServletCookieValueMethodArgumentResolverTests {
 		request.setCookies(cookie);
 
 		String result = (String) resolver.resolveArgument(cookieStringParameter, null, webRequest, null);
-		assertEquals("Invalid result", cookie.getValue(), result);
+		assertThat(result).as("Invalid result").isEqualTo(cookie.getValue());
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java

@@ -52,10 +52,8 @@ import org.springframework.web.method.support.HandlerMethodReturnValueHandlerCom
 import org.springframework.web.method.support.ModelAndViewContainer;
 import org.springframework.web.servlet.view.RedirectView;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Test fixture with {@link ServletInvocableHandlerMethod}.
@@ -89,9 +87,8 @@ public class ServletInvocableHandlerMethodTests {
 		ServletInvocableHandlerMethod handlerMethod = getHandlerMethod(new Handler(), "responseStatus");
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertTrue("Null return value + @ResponseStatus should result in 'request handled'",
-				this.mavContainer.isRequestHandled());
-		assertEquals(HttpStatus.BAD_REQUEST.value(), this.response.getStatus());
+		assertThat(this.mavContainer.isRequestHandled()).as("Null return value + @ResponseStatus should result in 'request handled'").isTrue();
+		assertThat(this.response.getStatus()).isEqualTo(HttpStatus.BAD_REQUEST.value());
 	}
 
 	@Test
@@ -99,9 +96,8 @@ public class ServletInvocableHandlerMethodTests {
 		ServletInvocableHandlerMethod handlerMethod = getHandlerMethod(new Handler(), "composedResponseStatus");
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertTrue("Null return value + @ComposedResponseStatus should result in 'request handled'",
-				this.mavContainer.isRequestHandled());
-		assertEquals(HttpStatus.BAD_REQUEST.value(), this.response.getStatus());
+		assertThat(this.mavContainer.isRequestHandled()).as("Null return value + @ComposedResponseStatus should result in 'request handled'").isTrue();
+		assertThat(this.response.getStatus()).isEqualTo(HttpStatus.BAD_REQUEST.value());
 	}
 
 	@Test
@@ -109,8 +105,8 @@ public class ServletInvocableHandlerMethodTests {
 		ServletInvocableHandlerMethod handlerMethod = getHandlerMethod(new ResponseStatusHandler(), "handle");
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertTrue(this.mavContainer.isRequestHandled());
-		assertEquals(HttpStatus.BAD_REQUEST.value(), this.response.getStatus());
+		assertThat(this.mavContainer.isRequestHandled()).isTrue();
+		assertThat(this.response.getStatus()).isEqualTo(HttpStatus.BAD_REQUEST.value());
 	}
 
 	@Test
@@ -121,8 +117,7 @@ public class ServletInvocableHandlerMethodTests {
 				getHandlerMethod(new Handler(), "httpServletResponse", HttpServletResponse.class);
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertTrue("Null return value + HttpServletResponse arg should result in 'request handled'",
-				this.mavContainer.isRequestHandled());
+		assertThat(this.mavContainer.isRequestHandled()).as("Null return value + HttpServletResponse arg should result in 'request handled'").isTrue();
 	}
 
 	@Test
@@ -134,8 +129,7 @@ public class ServletInvocableHandlerMethodTests {
 		ServletInvocableHandlerMethod handlerMethod = getHandlerMethod(new Handler(), "notModified");
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertTrue("Null return value + 'not modified' request should result in 'request handled'",
-				this.mavContainer.isRequestHandled());
+		assertThat(this.mavContainer.isRequestHandled()).as("Null return value + 'not modified' request should result in 'request handled'").isTrue();
 	}
 
 	@Test  // SPR-9159
@@ -143,9 +137,9 @@ public class ServletInvocableHandlerMethodTests {
 		ServletInvocableHandlerMethod handlerMethod = getHandlerMethod(new Handler(), "responseStatusWithReason");
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertTrue("When a status reason w/ used, the request is handled", this.mavContainer.isRequestHandled());
-		assertEquals(HttpStatus.BAD_REQUEST.value(), this.response.getStatus());
-		assertEquals("400 Bad Request", this.response.getErrorMessage());
+		assertThat(this.mavContainer.isRequestHandled()).as("When a status reason w/ used, the request is handled").isTrue();
+		assertThat(this.response.getStatus()).isEqualTo(HttpStatus.BAD_REQUEST.value());
+		assertThat(this.response.getErrorMessage()).isEqualTo("400 Bad Request");
 	}
 
 	@Test
@@ -167,14 +161,14 @@ public class ServletInvocableHandlerMethodTests {
 		ServletInvocableHandlerMethod handlerMethod = getHandlerMethod(new Handler(), "dynamicReturnValue", String.class);
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertNotNull(this.mavContainer.getView());
-		assertEquals(RedirectView.class, this.mavContainer.getView().getClass());
+		assertThat(this.mavContainer.getView()).isNotNull();
+		assertThat(this.mavContainer.getView().getClass()).isEqualTo(RedirectView.class);
 
 		// Invoke with a request parameter (RedirectView return value)
 		this.request.setParameter("param", "value");
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertEquals("view", this.mavContainer.getViewName());
+		assertThat(this.mavContainer.getViewName()).isEqualTo("view");
 	}
 
 	@Test
@@ -216,8 +210,9 @@ public class ServletInvocableHandlerMethodTests {
 
 		handlerMethod = handlerMethod.wrapConcurrentResult(result);
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
-		assertEquals((result != null ? result.toString() : ""), this.response.getContentAsString());
-		assertEquals(expectedReturnType, handlerMethod.getReturnValueType(result).getParameterType());
+		Object expected = (result != null ? result.toString() : "");
+		assertThat(this.response.getContentAsString()).isEqualTo(expected);
+		assertThat(handlerMethod.getReturnValueType(result).getParameterType()).isEqualTo(expectedReturnType);
 	}
 
 	@Test
@@ -227,7 +222,7 @@ public class ServletInvocableHandlerMethodTests {
 		handlerMethod = handlerMethod.wrapConcurrentResult(new ResponseEntity<>("bar", HttpStatus.OK));
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertEquals("bar", this.response.getContentAsString());
+		assertThat(this.response.getContentAsString()).isEqualTo("bar");
 	}
 
 	@Test  // SPR-12287
@@ -237,8 +232,8 @@ public class ServletInvocableHandlerMethodTests {
 		handlerMethod = handlerMethod.wrapConcurrentResult(new ResponseEntity<>(HttpStatus.OK));
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertEquals(200, this.response.getStatus());
-		assertEquals("", this.response.getContentAsString());
+		assertThat(this.response.getStatus()).isEqualTo(200);
+		assertThat(this.response.getContentAsString()).isEqualTo("");
 	}
 
 	@Test
@@ -248,8 +243,8 @@ public class ServletInvocableHandlerMethodTests {
 		handlerMethod = handlerMethod.wrapConcurrentResult(null);
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertEquals(200, this.response.getStatus());
-		assertEquals("", this.response.getContentAsString());
+		assertThat(this.response.getStatus()).isEqualTo(200);
+		assertThat(this.response.getContentAsString()).isEqualTo("");
 	}
 
 	@Test
@@ -261,8 +256,8 @@ public class ServletInvocableHandlerMethodTests {
 		handlerMethod = handlerMethod.wrapConcurrentResult(null);
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertEquals(200, this.response.getStatus());
-		assertEquals("", this.response.getContentAsString());
+		assertThat(this.response.getStatus()).isEqualTo(200);
+		assertThat(this.response.getContentAsString()).isEqualTo("");
 	}
 
 	@Test
@@ -272,8 +267,8 @@ public class ServletInvocableHandlerMethodTests {
 		handlerMethod = handlerMethod.wrapConcurrentResult(null);
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertEquals(200, this.response.getStatus());
-		assertEquals("", this.response.getContentAsString());
+		assertThat(this.response.getStatus()).isEqualTo(200);
+		assertThat(this.response.getContentAsString()).isEqualTo("");
 	}
 
 	@Test
@@ -290,8 +285,8 @@ public class ServletInvocableHandlerMethodTests {
 		hm = hm.wrapConcurrentResult(result);
 		hm.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertEquals(200, this.response.getStatus());
-		assertEquals("[[\"foo1\",\"bar1\"],[\"foo2\",\"bar2\"]]", this.response.getContentAsString());
+		assertThat(this.response.getStatus()).isEqualTo(200);
+		assertThat(this.response.getContentAsString()).isEqualTo("[[\"foo1\",\"bar1\"],[\"foo2\",\"bar2\"]]");
 	}
 
 	@Test // SPR-15478
@@ -308,8 +303,8 @@ public class ServletInvocableHandlerMethodTests {
 		hm = hm.wrapConcurrentResult(result);
 		hm.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertEquals(200, this.response.getStatus());
-		assertEquals("[{\"value\":\"foo\"},{\"value\":\"bar\"}]", this.response.getContentAsString());
+		assertThat(this.response.getStatus()).isEqualTo(200);
+		assertThat(this.response.getContentAsString()).isEqualTo("[{\"value\":\"foo\"},{\"value\":\"bar\"}]");
 	}
 
 	@Test  // SPR-12287 (16/Oct/14 comments)
@@ -318,8 +313,8 @@ public class ServletInvocableHandlerMethodTests {
 		ServletInvocableHandlerMethod handlerMethod = getHandlerMethod(new ResponseEntityHandler(), "handleRawType");
 		handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer);
 
-		assertEquals(200, this.response.getStatus());
-		assertEquals("", this.response.getContentAsString());
+		assertThat(this.response.getStatus()).isEqualTo(200);
+		assertThat(this.response.getContentAsString()).isEqualTo("");
 	}
 
 	private ServletInvocableHandlerMethod getHandlerMethod(Object controller,

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessorTests.java

@@ -36,10 +36,7 @@ import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.method.support.ModelAndViewContainer;
 import org.springframework.web.servlet.HandlerMapping;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture for {@link ServletModelAttributeMethodProcessor} specific tests.
@@ -94,7 +91,7 @@ public class ServletModelAttributeMethodProcessorTests {
 		TestBean testBean = (TestBean) processor.resolveArgument(
 				testBeanModelAttr, mavContainer, webRequest, binderFactory);
 
-		assertEquals("Patty", testBean.getName());
+		assertThat(testBean.getName()).isEqualTo("Patty");
 	}
 
 	@Test
@@ -106,7 +103,7 @@ public class ServletModelAttributeMethodProcessorTests {
 		TestBeanWithoutStringConstructor testBean = (TestBeanWithoutStringConstructor) processor.resolveArgument(
 				testBeanWithoutStringConstructorModelAttr, mavContainer, webRequest, binderFactory);
 
-		assertNotNull(testBean);
+		assertThat(testBean).isNotNull();
 	}
 
 	@Test
@@ -120,7 +117,7 @@ public class ServletModelAttributeMethodProcessorTests {
 		Optional<TestBean> testBean = (Optional<TestBean>) processor.resolveArgument(
 				testBeanWithOptionalModelAttr, mavContainer, webRequest, binderFactory);
 
-		assertEquals("Patty", testBean.get().getName());
+		assertThat(testBean.get().getName()).isEqualTo("Patty");
 	}
 
 	@Test
@@ -131,7 +128,7 @@ public class ServletModelAttributeMethodProcessorTests {
 		TestBean testBean = (TestBean) processor.resolveArgument(
 				testBeanModelAttr, mavContainer, webRequest, binderFactory);
 
-		assertEquals("Patty", testBean.getName());
+		assertThat(testBean.getName()).isEqualTo("Patty");
 	}
 
 	@Test
@@ -141,7 +138,7 @@ public class ServletModelAttributeMethodProcessorTests {
 		TestBeanWithoutStringConstructor testBean = (TestBeanWithoutStringConstructor) processor.resolveArgument(
 				testBeanWithoutStringConstructorModelAttr, mavContainer, webRequest, binderFactory);
 
-		assertNotNull(testBean);
+		assertThat(testBean).isNotNull();
 	}
 
 	@Test
@@ -152,7 +149,7 @@ public class ServletModelAttributeMethodProcessorTests {
 		Optional<TestBean> testBean = (Optional<TestBean>) processor.resolveArgument(
 				testBeanWithOptionalModelAttr, mavContainer, webRequest, binderFactory);
 
-		assertEquals("Patty", testBean.get().getName());
+		assertThat(testBean.get().getName()).isEqualTo("Patty");
 	}
 
 	@Test
@@ -164,15 +161,15 @@ public class ServletModelAttributeMethodProcessorTests {
 		mavContainer.getModel().put("testBean2", null);
 		mavContainer.getModel().put("testBean3", null);
 
-		assertNull(processor.resolveArgument(
-				testBeanModelAttr, mavContainer, webRequest, binderFactory));
+		assertThat(processor.resolveArgument(
+				testBeanModelAttr, mavContainer, webRequest, binderFactory)).isNull();
 
-		assertNull(processor.resolveArgument(
-				testBeanWithoutStringConstructorModelAttr, mavContainer, webRequest, binderFactory));
+		assertThat(processor.resolveArgument(
+				testBeanWithoutStringConstructorModelAttr, mavContainer, webRequest, binderFactory)).isNull();
 
 		Optional<TestBean> testBean = (Optional<TestBean>) processor.resolveArgument(
 				testBeanWithOptionalModelAttr, mavContainer, webRequest, binderFactory);
-		assertFalse(testBean.isPresent());
+		assertThat(testBean.isPresent()).isFalse();
 	}
 
 	@Test
@@ -184,15 +181,15 @@ public class ServletModelAttributeMethodProcessorTests {
 		mavContainer.getModel().put("testBean2", Optional.empty());
 		mavContainer.getModel().put("testBean3", Optional.empty());
 
-		assertNull(processor.resolveArgument(
-				testBeanModelAttr, mavContainer, webRequest, binderFactory));
+		assertThat(processor.resolveArgument(
+				testBeanModelAttr, mavContainer, webRequest, binderFactory)).isNull();
 
-		assertNull(processor.resolveArgument(
-				testBeanWithoutStringConstructorModelAttr, mavContainer, webRequest, binderFactory));
+		assertThat(processor.resolveArgument(
+				testBeanWithoutStringConstructorModelAttr, mavContainer, webRequest, binderFactory)).isNull();
 
 		Optional<TestBean> testBean =(Optional<TestBean>) processor.resolveArgument(
 				testBeanWithOptionalModelAttr, mavContainer, webRequest, binderFactory);
-		assertFalse(testBean.isPresent());
+		assertThat(testBean.isPresent()).isFalse();
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java

@@ -43,11 +43,7 @@ import org.springframework.web.multipart.MultipartRequest;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.i18n.FixedLocaleResolver;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Arjen Poutsma
@@ -84,11 +80,11 @@ public class ServletRequestMethodArgumentResolverTests {
 	@Test
 	public void servletRequest() throws Exception {
 		MethodParameter servletRequestParameter = new MethodParameter(method, 0);
-		assertTrue("ServletRequest not supported", resolver.supportsParameter(servletRequestParameter));
+		assertThat(resolver.supportsParameter(servletRequestParameter)).as("ServletRequest not supported").isTrue();
 
 		Object result = resolver.resolveArgument(servletRequestParameter, mavContainer, webRequest, null);
-		assertSame("Invalid result", servletRequest, result);
-		assertFalse("The requestHandled flag shouldn't change", mavContainer.isRequestHandled());
+		assertThat(result).as("Invalid result").isSameAs(servletRequest);
+		assertThat(mavContainer.isRequestHandled()).as("The requestHandled flag shouldn't change").isFalse();
 	}
 
 	@Test
@@ -97,11 +93,11 @@ public class ServletRequestMethodArgumentResolverTests {
 		servletRequest.setSession(session);
 
 		MethodParameter sessionParameter = new MethodParameter(method, 2);
-		assertTrue("Session not supported", resolver.supportsParameter(sessionParameter));
+		assertThat(resolver.supportsParameter(sessionParameter)).as("Session not supported").isTrue();
 
 		Object result = resolver.resolveArgument(sessionParameter, mavContainer, webRequest, null);
-		assertSame("Invalid result", session, result);
-		assertFalse("The requestHandled flag shouldn't change", mavContainer.isRequestHandled());
+		assertThat(result).as("Invalid result").isSameAs(session);
+		assertThat(mavContainer.isRequestHandled()).as("The requestHandled flag shouldn't change").isFalse();
 	}
 
 	@Test
@@ -110,19 +106,19 @@ public class ServletRequestMethodArgumentResolverTests {
 		servletRequest.setUserPrincipal(principal);
 
 		MethodParameter principalParameter = new MethodParameter(method, 3);
-		assertTrue("Principal not supported", resolver.supportsParameter(principalParameter));
+		assertThat(resolver.supportsParameter(principalParameter)).as("Principal not supported").isTrue();
 
 		Object result = resolver.resolveArgument(principalParameter, null, webRequest, null);
-		assertSame("Invalid result", principal, result);
+		assertThat(result).as("Invalid result").isSameAs(principal);
 	}
 
 	@Test
 	public void principalAsNull() throws Exception {
 		MethodParameter principalParameter = new MethodParameter(method, 3);
-		assertTrue("Principal not supported", resolver.supportsParameter(principalParameter));
+		assertThat(resolver.supportsParameter(principalParameter)).as("Principal not supported").isTrue();
 
 		Object result = resolver.resolveArgument(principalParameter, null, webRequest, null);
-		assertNull("Invalid result", result);
+		assertThat(result).as("Invalid result").isNull();
 	}
 
 	@Test
@@ -131,10 +127,10 @@ public class ServletRequestMethodArgumentResolverTests {
 		servletRequest.addPreferredLocale(locale);
 
 		MethodParameter localeParameter = new MethodParameter(method, 4);
-		assertTrue("Locale not supported", resolver.supportsParameter(localeParameter));
+		assertThat(resolver.supportsParameter(localeParameter)).as("Locale not supported").isTrue();
 
 		Object result = resolver.resolveArgument(localeParameter, null, webRequest, null);
-		assertSame("Invalid result", locale, result);
+		assertThat(result).as("Invalid result").isSameAs(locale);
 	}
 
 	@Test
@@ -144,19 +140,19 @@ public class ServletRequestMethodArgumentResolverTests {
 				new FixedLocaleResolver(locale));
 
 		MethodParameter localeParameter = new MethodParameter(method, 4);
-		assertTrue("Locale not supported", resolver.supportsParameter(localeParameter));
+		assertThat(resolver.supportsParameter(localeParameter)).as("Locale not supported").isTrue();
 
 		Object result = resolver.resolveArgument(localeParameter, null, webRequest, null);
-		assertSame("Invalid result", locale, result);
+		assertThat(result).as("Invalid result").isSameAs(locale);
 	}
 
 	@Test
 	public void timeZone() throws Exception {
 		MethodParameter timeZoneParameter = new MethodParameter(method, 8);
-		assertTrue("TimeZone not supported", resolver.supportsParameter(timeZoneParameter));
+		assertThat(resolver.supportsParameter(timeZoneParameter)).as("TimeZone not supported").isTrue();
 
 		Object result = resolver.resolveArgument(timeZoneParameter, null, webRequest, null);
-		assertEquals("Invalid result", TimeZone.getDefault(), result);
+		assertThat(result).as("Invalid result").isEqualTo(TimeZone.getDefault());
 	}
 
 	@Test
@@ -166,19 +162,19 @@ public class ServletRequestMethodArgumentResolverTests {
 				new FixedLocaleResolver(Locale.US, timeZone));
 
 		MethodParameter timeZoneParameter = new MethodParameter(method, 8);
-		assertTrue("TimeZone not supported", resolver.supportsParameter(timeZoneParameter));
+		assertThat(resolver.supportsParameter(timeZoneParameter)).as("TimeZone not supported").isTrue();
 
 		Object result = resolver.resolveArgument(timeZoneParameter, null, webRequest, null);
-		assertEquals("Invalid result", timeZone, result);
+		assertThat(result).as("Invalid result").isEqualTo(timeZone);
 	}
 
 	@Test
 	public void zoneId() throws Exception {
 		MethodParameter zoneIdParameter = new MethodParameter(method, 9);
-		assertTrue("ZoneId not supported", resolver.supportsParameter(zoneIdParameter));
+		assertThat(resolver.supportsParameter(zoneIdParameter)).as("ZoneId not supported").isTrue();
 
 		Object result = resolver.resolveArgument(zoneIdParameter, null, webRequest, null);
-		assertEquals("Invalid result", ZoneId.systemDefault(), result);
+		assertThat(result).as("Invalid result").isEqualTo(ZoneId.systemDefault());
 	}
 
 	@Test
@@ -188,46 +184,46 @@ public class ServletRequestMethodArgumentResolverTests {
 				new FixedLocaleResolver(Locale.US, timeZone));
 		MethodParameter zoneIdParameter = new MethodParameter(method, 9);
 
-		assertTrue("ZoneId not supported", resolver.supportsParameter(zoneIdParameter));
+		assertThat(resolver.supportsParameter(zoneIdParameter)).as("ZoneId not supported").isTrue();
 
 		Object result = resolver.resolveArgument(zoneIdParameter, null, webRequest, null);
-		assertEquals("Invalid result", timeZone.toZoneId(), result);
+		assertThat(result).as("Invalid result").isEqualTo(timeZone.toZoneId());
 	}
 
 	@Test
 	public void inputStream() throws Exception {
 		MethodParameter inputStreamParameter = new MethodParameter(method, 5);
-		assertTrue("InputStream not supported", resolver.supportsParameter(inputStreamParameter));
+		assertThat(resolver.supportsParameter(inputStreamParameter)).as("InputStream not supported").isTrue();
 
 		Object result = resolver.resolveArgument(inputStreamParameter, null, webRequest, null);
-		assertSame("Invalid result", webRequest.getRequest().getInputStream(), result);
+		assertThat(result).as("Invalid result").isSameAs(webRequest.getRequest().getInputStream());
 	}
 
 	@Test
 	public void reader() throws Exception {
 		MethodParameter readerParameter = new MethodParameter(method, 6);
-		assertTrue("Reader not supported", resolver.supportsParameter(readerParameter));
+		assertThat(resolver.supportsParameter(readerParameter)).as("Reader not supported").isTrue();
 
 		Object result = resolver.resolveArgument(readerParameter, null, webRequest, null);
-		assertSame("Invalid result", webRequest.getRequest().getReader(), result);
+		assertThat(result).as("Invalid result").isSameAs(webRequest.getRequest().getReader());
 	}
 
 	@Test
 	public void webRequest() throws Exception {
 		MethodParameter webRequestParameter = new MethodParameter(method, 7);
-		assertTrue("WebRequest not supported", resolver.supportsParameter(webRequestParameter));
+		assertThat(resolver.supportsParameter(webRequestParameter)).as("WebRequest not supported").isTrue();
 
 		Object result = resolver.resolveArgument(webRequestParameter, null, webRequest, null);
-		assertSame("Invalid result", webRequest, result);
+		assertThat(result).as("Invalid result").isSameAs(webRequest);
 	}
 
 	@Test
 	public void httpMethod() throws Exception {
 		MethodParameter httpMethodParameter = new MethodParameter(method, 10);
-		assertTrue("HttpMethod not supported", resolver.supportsParameter(httpMethodParameter));
+		assertThat(resolver.supportsParameter(httpMethodParameter)).as("HttpMethod not supported").isTrue();
 
 		Object result = resolver.resolveArgument(httpMethodParameter, null, webRequest, null);
-		assertSame("Invalid result", HttpMethod.valueOf(webRequest.getRequest().getMethod()), result);
+		assertThat(result).as("Invalid result").isSameAs(HttpMethod.valueOf(webRequest.getRequest().getMethod()));
 	}
 
 	@Test
@@ -242,10 +238,10 @@ public class ServletRequestMethodArgumentResolverTests {
 		ServletWebRequest webRequest = new ServletWebRequest(servletRequest, new MockHttpServletResponse());
 
 		MethodParameter pushBuilderParameter = new MethodParameter(method, 11);
-		assertTrue("PushBuilder not supported", resolver.supportsParameter(pushBuilderParameter));
+		assertThat(resolver.supportsParameter(pushBuilderParameter)).as("PushBuilder not supported").isTrue();
 
 		Object result = resolver.resolveArgument(pushBuilderParameter, null, webRequest, null);
-		assertSame("Invalid result", pushBuilder, result);
+		assertThat(result).as("Invalid result").isSameAs(pushBuilder);
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java

@@ -30,8 +30,7 @@ import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test fixture with {@link ServletResponseMethodArgumentResolver}.
@@ -65,40 +64,40 @@ public class ServletResponseMethodArgumentResolverTests {
 	@Test
 	public void servletResponse() throws Exception {
 		MethodParameter servletResponseParameter = new MethodParameter(method, 0);
-		assertTrue("ServletResponse not supported", resolver.supportsParameter(servletResponseParameter));
+		assertThat(resolver.supportsParameter(servletResponseParameter)).as("ServletResponse not supported").isTrue();
 
 		Object result = resolver.resolveArgument(servletResponseParameter, mavContainer, webRequest, null);
-		assertSame("Invalid result", servletResponse, result);
-		assertTrue(mavContainer.isRequestHandled());
+		assertThat(result).as("Invalid result").isSameAs(servletResponse);
+		assertThat(mavContainer.isRequestHandled()).isTrue();
 	}
 
 	@Test  // SPR-8983
 	public void servletResponseNoMavContainer() throws Exception {
 		MethodParameter servletResponseParameter = new MethodParameter(method, 0);
-		assertTrue("ServletResponse not supported", resolver.supportsParameter(servletResponseParameter));
+		assertThat(resolver.supportsParameter(servletResponseParameter)).as("ServletResponse not supported").isTrue();
 
 		Object result = resolver.resolveArgument(servletResponseParameter, null, webRequest, null);
-		assertSame("Invalid result", servletResponse, result);
+		assertThat(result).as("Invalid result").isSameAs(servletResponse);
 	}
 
 	@Test
 	public void outputStream() throws Exception {
 		MethodParameter outputStreamParameter = new MethodParameter(method, 1);
-		assertTrue("OutputStream not supported", resolver.supportsParameter(outputStreamParameter));
+		assertThat(resolver.supportsParameter(outputStreamParameter)).as("OutputStream not supported").isTrue();
 
 		Object result = resolver.resolveArgument(outputStreamParameter, mavContainer, webRequest, null);
-		assertSame("Invalid result", servletResponse.getOutputStream(), result);
-		assertTrue(mavContainer.isRequestHandled());
+		assertThat(result).as("Invalid result").isSameAs(servletResponse.getOutputStream());
+		assertThat(mavContainer.isRequestHandled()).isTrue();
 	}
 
 	@Test
 	public void writer() throws Exception {
 		MethodParameter writerParameter = new MethodParameter(method, 2);
-		assertTrue("Writer not supported", resolver.supportsParameter(writerParameter));
+		assertThat(resolver.supportsParameter(writerParameter)).as("Writer not supported").isTrue();
 
 		Object result = resolver.resolveArgument(writerParameter, mavContainer, webRequest, null);
-		assertSame("Invalid result", servletResponse.getWriter(), result);
-		assertTrue(mavContainer.isRequestHandled());
+		assertThat(result).as("Invalid result").isSameAs(servletResponse.getWriter());
+		assertThat(mavContainer.isRequestHandled()).isTrue();
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitterTests.java

@@ -25,8 +25,7 @@ import org.junit.Test;
 
 import org.springframework.http.MediaType;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.web.servlet.mvc.method.annotation.SseEmitter.event;
 
 
@@ -122,7 +121,7 @@ public class SseEmitterTests {
 
 
 		public void assertSentObjectCount(int size) {
-			assertEquals(size, this.objects.size());
+			assertThat(this.objects.size()).isEqualTo(size);
 		}
 
 		public void assertObject(int index, Object object) {
@@ -130,9 +129,9 @@ public class SseEmitterTests {
 		}
 
 		public void assertObject(int index, Object object, MediaType mediaType) {
-			assertTrue(index <= this.objects.size());
-			assertEquals(object, this.objects.get(index));
-			assertEquals(mediaType, this.mediaTypes.get(index));
+			assertThat(index <= this.objects.size()).isTrue();
+			assertThat(this.objects.get(index)).isEqualTo(object);
+			assertThat(this.mediaTypes.get(index)).isEqualTo(mediaType);
 		}
 
 		@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/StreamingResponseBodyReturnValueHandlerTests.java

@@ -37,9 +37,7 @@ import org.springframework.web.context.request.async.StandardServletAsyncWebRequ
 import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 
 /**
@@ -78,10 +76,10 @@ public class StreamingResponseBodyReturnValueHandlerTests {
 
 	@Test
 	public void supportsReturnType() throws Exception {
-		assertTrue(this.handler.supportsReturnType(returnType(TestController.class, "handle")));
-		assertTrue(this.handler.supportsReturnType(returnType(TestController.class, "handleResponseEntity")));
-		assertFalse(this.handler.supportsReturnType(returnType(TestController.class, "handleResponseEntityString")));
-		assertFalse(this.handler.supportsReturnType(returnType(TestController.class, "handleResponseEntityParameterized")));
+		assertThat(this.handler.supportsReturnType(returnType(TestController.class, "handle"))).isTrue();
+		assertThat(this.handler.supportsReturnType(returnType(TestController.class, "handleResponseEntity"))).isTrue();
+		assertThat(this.handler.supportsReturnType(returnType(TestController.class, "handleResponseEntityString"))).isFalse();
+		assertThat(this.handler.supportsReturnType(returnType(TestController.class, "handleResponseEntityParameterized"))).isFalse();
 	}
 
 	@Test
@@ -95,9 +93,9 @@ public class StreamingResponseBodyReturnValueHandlerTests {
 		};
 		this.handler.handleReturnValue(streamingBody, returnType, this.mavContainer, this.webRequest);
 
-		assertTrue(this.request.isAsyncStarted());
-		assertTrue(latch.await(5, TimeUnit.SECONDS));
-		assertEquals("foo", this.response.getContentAsString());
+		assertThat(this.request.isAsyncStarted()).isTrue();
+		assertThat(latch.await(5, TimeUnit.SECONDS)).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo("foo");
 	}
 
 
@@ -113,12 +111,12 @@ public class StreamingResponseBodyReturnValueHandlerTests {
 				});
 		this.handler.handleReturnValue(emitter, returnType, this.mavContainer, this.webRequest);
 
-		assertTrue(this.request.isAsyncStarted());
-		assertEquals(200, this.response.getStatus());
-		assertEquals("bar", this.response.getHeader("foo"));
+		assertThat(this.request.isAsyncStarted()).isTrue();
+		assertThat(this.response.getStatus()).isEqualTo(200);
+		assertThat(this.response.getHeader("foo")).isEqualTo("bar");
 
-		assertTrue(latch.await(5, TimeUnit.SECONDS));
-		assertEquals("foo", this.response.getContentAsString());
+		assertThat(latch.await(5, TimeUnit.SECONDS)).isTrue();
+		assertThat(this.response.getContentAsString()).isEqualTo("foo");
 
 	}
 
@@ -128,8 +126,8 @@ public class StreamingResponseBodyReturnValueHandlerTests {
 		ResponseEntity<?> emitter = ResponseEntity.noContent().build();
 		this.handler.handleReturnValue(emitter, returnType, this.mavContainer, this.webRequest);
 
-		assertFalse(this.request.isAsyncStarted());
-		assertEquals(204, this.response.getStatus());
+		assertThat(this.request.isAsyncStarted()).isFalse();
+		assertThat(this.response.getStatus()).isEqualTo(204);
 	}
 
 	@Test
@@ -138,7 +136,7 @@ public class StreamingResponseBodyReturnValueHandlerTests {
 		MethodParameter returnType = returnType(TestController.class, "handleResponseEntity");
 		this.handler.handleReturnValue(emitter, returnType, this.mavContainer, this.webRequest);
 
-		assertEquals(Collections.singletonList("bar"), this.response.getHeaders("foo"));
+		assertThat(this.response.getHeaders("foo")).isEqualTo(Collections.singletonList("bar"));
 	}
 
 	private MethodParameter returnType(Class<?> clazz, String methodName) throws NoSuchMethodException {