Migrate tests to AssertJ

Mostly thanks to IDEA's plugin: https://plugins.jetbrains.com/plugin/10345-assertions2assertj
There is still a lot of work to do when complex and composite matchers are used.

* Add `awaitility` dependency and deprecate `EventuallyMatcher` in favor
of `awaitility`
* Remove Hamcrest from dependencies and disable JUnit & Hamcrest
static imports to encourage to use only AssertJ
* Migrate JUnit assumptions in rules to AssertJ's assumptions
* Deprecate some custom matchers in favor of existing in Hamcrest
after upgrading the last to version `2.1`
* Replace `ExpectedException` rules with `assertThatThrownBy()`
* Mention `MessagePredicate` in the `testing.adoc`

spring-integration-jms/src/test/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListenerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 
 package org.springframework.integration.jms;
 
-import static org.hamcrest.Matchers.startsWith;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doNothing;
@@ -91,8 +89,8 @@ public class ChannelPublishingJmsMessageListenerTests {
 		javax.jms.Message jmsMessage = session.createTextMessage("test");
 		listener.onMessage(jmsMessage, mock(Session.class));
 		ErrorMessage received = (ErrorMessage) errorChannel.receive(0);
-		assertNotNull(received);
-		assertThat(received.getPayload().getMessage(), startsWith("Inbound conversion failed"));
+		assertThat(received).isNotNull();
+		assertThat(received.getPayload().getMessage()).startsWith("Inbound conversion failed");
 		listener.stop();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,7 @@
 
 package org.springframework.integration.jms;
 
-import static org.hamcrest.Matchers.instanceOf;
-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.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Date;
 import java.util.Map;
@@ -59,8 +54,8 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		javax.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
-		assertNotNull(jmsMessage.getJMSReplyTo());
-		assertSame(replyTo, jmsMessage.getJMSReplyTo());
+		assertThat(jmsMessage.getJMSReplyTo()).isNotNull();
+		assertThat(jmsMessage.getJMSReplyTo()).isSameAs(replyTo);
 	}
 
 	@Test
@@ -70,7 +65,7 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		javax.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
-		assertNull(jmsMessage.getJMSReplyTo());
+		assertThat(jmsMessage.getJMSReplyTo()).isNull();
 	}
 
 	@Test
@@ -81,8 +76,8 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		javax.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
-		assertNotNull(jmsMessage.getJMSCorrelationID());
-		assertEquals(jmsCorrelationId, jmsMessage.getJMSCorrelationID());
+		assertThat(jmsMessage.getJMSCorrelationID()).isNotNull();
+		assertThat(jmsMessage.getJMSCorrelationID()).isEqualTo(jmsCorrelationId);
 	}
 
 	@Test
@@ -92,7 +87,7 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		javax.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
-		assertEquals("123", jmsMessage.getJMSCorrelationID());
+		assertThat(jmsMessage.getJMSCorrelationID()).isEqualTo("123");
 	}
 
 	@Test
@@ -102,7 +97,7 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		javax.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
-		assertNull(jmsMessage.getJMSCorrelationID());
+		assertThat(jmsMessage.getJMSCorrelationID()).isNull();
 	}
 
 	@Test
@@ -113,8 +108,8 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		javax.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
-		assertNotNull(jmsMessage.getJMSType());
-		assertEquals(jmsType, jmsMessage.getJMSType());
+		assertThat(jmsMessage.getJMSType()).isNotNull();
+		assertThat(jmsMessage.getJMSType()).isEqualTo(jmsType);
 	}
 
 	@Test
@@ -124,7 +119,7 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		javax.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
-		assertNull(jmsMessage.getJMSType());
+		assertThat(jmsMessage.getJMSType()).isNull();
 	}
 
 	@Test
@@ -136,8 +131,8 @@ public class DefaultJmsHeaderMapperTests {
 		javax.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		Object value = jmsMessage.getObjectProperty("content_type");
-		assertNotNull(value);
-		assertEquals("foo", value);
+		assertThat(value).isNotNull();
+		assertThat(value).isEqualTo("foo");
 	}
 
 	@Test
@@ -149,9 +144,9 @@ public class DefaultJmsHeaderMapperTests {
 		javax.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		Object value = jmsMessage.getObjectProperty("foo");
-		assertNotNull(value);
-		assertEquals(Integer.class, value.getClass());
-		assertEquals(123, ((Integer) value).intValue());
+		assertThat(value).isNotNull();
+		assertThat(value.getClass()).isEqualTo(Integer.class);
+		assertThat(((Integer) value).intValue()).isEqualTo(123);
 	}
 
 	@Test
@@ -164,9 +159,9 @@ public class DefaultJmsHeaderMapperTests {
 		javax.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		Object value = jmsMessage.getObjectProperty("custom_foo");
-		assertNotNull(value);
-		assertEquals(Integer.class, value.getClass());
-		assertEquals(123, ((Integer) value).intValue());
+		assertThat(value).isNotNull();
+		assertThat(value.getClass()).isEqualTo(Integer.class);
+		assertThat(((Integer) value).intValue()).isEqualTo(123);
 	}
 
 	@Test
@@ -181,7 +176,7 @@ public class DefaultJmsHeaderMapperTests {
 		javax.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		Object value = jmsMessage.getObjectProperty("destination");
-		assertNull(value);
+		assertThat(value).isNull();
 	}
 
 	@Test
@@ -194,8 +189,8 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
 		Object attrib = headers.get(JmsHeaders.REPLY_TO);
-		assertNotNull(attrib);
-		assertSame(replyTo, attrib);
+		assertThat(attrib).isNotNull();
+		assertThat(attrib).isSameAs(replyTo);
 	}
 
 	@Test
@@ -206,8 +201,8 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
 		Object attrib = headers.get(JmsHeaders.MESSAGE_ID);
-		assertNotNull(attrib);
-		assertSame(messageId, attrib);
+		assertThat(attrib).isNotNull();
+		assertThat(attrib).isSameAs(messageId);
 	}
 
 	@Test
@@ -218,8 +213,8 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
 		Object attrib = headers.get(JmsHeaders.CORRELATION_ID);
-		assertNotNull(attrib);
-		assertSame(correlationId, attrib);
+		assertThat(attrib).isNotNull();
+		assertThat(attrib).isSameAs(correlationId);
 	}
 
 	@Test
@@ -230,8 +225,8 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
 		Object attrib = headers.get(JmsHeaders.TYPE);
-		assertNotNull(attrib);
-		assertSame(type, attrib);
+		assertThat(attrib).isNotNull();
+		assertThat(attrib).isSameAs(type);
 	}
 
 	@Test
@@ -242,8 +237,8 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
 		Object attrib = headers.get(JmsHeaders.TIMESTAMP);
-		assertNotNull(attrib);
-		assertEquals(timestamp, attrib);
+		assertThat(attrib).isNotNull();
+		assertThat(attrib).isEqualTo(timestamp);
 	}
 
 	@Test
@@ -253,8 +248,8 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
 		Object attrib = headers.get(IntegrationMessageHeaderAccessor.PRIORITY);
-		assertNotNull(attrib);
-		assertEquals(5, attrib);
+		assertThat(attrib).isNotNull();
+		assertThat(attrib).isEqualTo(5);
 	}
 
 	@Test
@@ -265,7 +260,7 @@ public class DefaultJmsHeaderMapperTests {
 		mapper.setMapInboundPriority(false);
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
 		Object attrib = headers.get(IntegrationMessageHeaderAccessor.PRIORITY);
-		assertNull(attrib);
+		assertThat(attrib).isNull();
 	}
 
 	@Test
@@ -275,8 +270,8 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
 		Object attrib = headers.get(MessageHeaders.CONTENT_TYPE);
-		assertNotNull(attrib);
-		assertEquals("foo", attrib);
+		assertThat(attrib).isNotNull();
+		assertThat(attrib).isEqualTo("foo");
 	}
 
 	@Test
@@ -286,9 +281,9 @@ public class DefaultJmsHeaderMapperTests {
 		DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
 		Object attrib = headers.get("foo");
-		assertNotNull(attrib);
-		assertEquals(Integer.class, attrib.getClass());
-		assertEquals(123, ((Integer) attrib).intValue());
+		assertThat(attrib).isNotNull();
+		assertThat(attrib.getClass()).isEqualTo(Integer.class);
+		assertThat(((Integer) attrib).intValue()).isEqualTo(123);
 	}
 
 	@Test
@@ -299,9 +294,9 @@ public class DefaultJmsHeaderMapperTests {
 		mapper.setInboundPrefix("custom_");
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
 		Object header = headers.get("custom_foo");
-		assertNotNull(header);
-		assertEquals(Integer.class, header.getClass());
-		assertEquals(123, ((Integer) header).intValue());
+		assertThat(header).isNotNull();
+		assertThat(header.getClass()).isEqualTo(Integer.class);
+		assertThat(((Integer) header).intValue()).isEqualTo(123);
 	}
 
 	@Test
@@ -324,11 +319,11 @@ public class DefaultJmsHeaderMapperTests {
 		};
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		Object foo = jmsMessage.getObjectProperty("foo");
-		assertNotNull(foo);
+		assertThat(foo).isNotNull();
 		Object bar = jmsMessage.getObjectProperty("bar");
-		assertNotNull(bar);
+		assertThat(bar).isNotNull();
 		Object bad = jmsMessage.getObjectProperty("bad");
-		assertNull(bad);
+		assertThat(bad).isNull();
 	}
 
 	@Test
@@ -351,11 +346,11 @@ public class DefaultJmsHeaderMapperTests {
 		};
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		Object foo = jmsMessage.getObjectProperty("foo");
-		assertNotNull(foo);
+		assertThat(foo).isNotNull();
 		Object bar = jmsMessage.getObjectProperty("bar");
-		assertNotNull(bar);
+		assertThat(bar).isNotNull();
 		Object bad = jmsMessage.getObjectProperty("bad");
-		assertNull(bad);
+		assertThat(bad).isNull();
 	}
 
 	@Test
@@ -373,9 +368,9 @@ public class DefaultJmsHeaderMapperTests {
 			}
 		};
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
-		assertNull(jmsMessage.getJMSReplyTo());
-		assertNotNull(jmsMessage.getStringProperty("foo"));
-		assertEquals("bar", jmsMessage.getStringProperty("foo"));
+		assertThat(jmsMessage.getJMSReplyTo()).isNull();
+		assertThat(jmsMessage.getStringProperty("foo")).isNotNull();
+		assertThat(jmsMessage.getStringProperty("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -393,9 +388,9 @@ public class DefaultJmsHeaderMapperTests {
 			}
 		};
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
-		assertNull(jmsMessage.getJMSType());
-		assertNotNull(jmsMessage.getStringProperty("foo"));
-		assertEquals("bar", jmsMessage.getStringProperty("foo"));
+		assertThat(jmsMessage.getJMSType()).isNull();
+		assertThat(jmsMessage.getStringProperty("foo")).isNotNull();
+		assertThat(jmsMessage.getStringProperty("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -413,9 +408,9 @@ public class DefaultJmsHeaderMapperTests {
 			}
 		};
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
-		assertNull(jmsMessage.getJMSCorrelationID());
-		assertNotNull(jmsMessage.getStringProperty("foo"));
-		assertEquals("bar", jmsMessage.getStringProperty("foo"));
+		assertThat(jmsMessage.getJMSCorrelationID()).isNull();
+		assertThat(jmsMessage.getStringProperty("foo")).isNotNull();
+		assertThat(jmsMessage.getStringProperty("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -433,9 +428,9 @@ public class DefaultJmsHeaderMapperTests {
 			}
 		};
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
-		assertNull(jmsMessage.getJMSCorrelationID());
-		assertNotNull(jmsMessage.getStringProperty("foo"));
-		assertEquals("bar", jmsMessage.getStringProperty("foo"));
+		assertThat(jmsMessage.getJMSCorrelationID()).isNull();
+		assertThat(jmsMessage.getStringProperty("foo")).isNotNull();
+		assertThat(jmsMessage.getStringProperty("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -450,9 +445,9 @@ public class DefaultJmsHeaderMapperTests {
 		};
 		jmsMessage.setStringProperty("foo", "bar");
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
-		assertNull(headers.get(JmsHeaders.MESSAGE_ID));
-		assertNotNull(headers.get("foo"));
-		assertEquals("bar", headers.get("foo"));
+		assertThat(headers.get(JmsHeaders.MESSAGE_ID)).isNull();
+		assertThat(headers.get("foo")).isNotNull();
+		assertThat(headers.get("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -467,9 +462,9 @@ public class DefaultJmsHeaderMapperTests {
 		};
 		jmsMessage.setStringProperty("foo", "bar");
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
-		assertNull(headers.get(JmsHeaders.CORRELATION_ID));
-		assertNotNull(headers.get("foo"));
-		assertEquals("bar", headers.get("foo"));
+		assertThat(headers.get(JmsHeaders.CORRELATION_ID)).isNull();
+		assertThat(headers.get("foo")).isNotNull();
+		assertThat(headers.get("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -484,9 +479,9 @@ public class DefaultJmsHeaderMapperTests {
 		};
 		jmsMessage.setStringProperty("foo", "bar");
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
-		assertNull(headers.get(JmsHeaders.TYPE));
-		assertNotNull(headers.get("foo"));
-		assertEquals("bar", headers.get("foo"));
+		assertThat(headers.get(JmsHeaders.TYPE)).isNull();
+		assertThat(headers.get("foo")).isNotNull();
+		assertThat(headers.get("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -501,9 +496,9 @@ public class DefaultJmsHeaderMapperTests {
 		};
 		jmsMessage.setStringProperty("foo", "bar");
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
-		assertNull(headers.get(JmsHeaders.REPLY_TO));
-		assertNotNull(headers.get("foo"));
-		assertEquals("bar", headers.get("foo"));
+		assertThat(headers.get(JmsHeaders.REPLY_TO)).isNull();
+		assertThat(headers.get("foo")).isNotNull();
+		assertThat(headers.get("foo")).isEqualTo("bar");
 	}
 
 	@Test
@@ -518,9 +513,9 @@ public class DefaultJmsHeaderMapperTests {
 		};
 		jmsMessage.setStringProperty("foo", "bar");
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
-		assertNull(headers.get(JmsHeaders.REDELIVERED));
-		assertNotNull(headers.get("foo"));
-		assertEquals("bar", headers.get("foo"));
+		assertThat(headers.get(JmsHeaders.REDELIVERED)).isNull();
+		assertThat(headers.get("foo")).isNotNull();
+		assertThat(headers.get("foo")).isEqualTo("bar");
 	}
 
 
@@ -545,7 +540,7 @@ public class DefaultJmsHeaderMapperTests {
 		mapper.fromHeaders(new MessageHeaders(headers), reply);
 
 		Object result = converter.fromMessage(reply);
-		assertThat(result, instanceOf(String.class));
+		assertThat(result).isInstanceOf(String.class);
 	}
 
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.jms;
 
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import javax.jms.ConnectionFactory;
 
@@ -51,7 +51,7 @@ public class JmsInboundChannelAdapterTests extends ActiveMQMultiContextTests {
 	public void testTransactionalReceive() {
 		JmsTemplate template = new JmsTemplate(connectionFactory);
 		template.convertAndSend("incatQ", "bar");
-		assertNotNull(out.receive(20000));
+		assertThat(out.receive(20000)).isNotNull();
 		/*
 		 *  INT-3288 - previously acknowledge="transacted"
 		 *  Caused by: javax.jms.JMSException: acknowledgeMode SESSION_TRANSACTED cannot be used for an non-transacted Session

spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.integration.jms;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import javax.jms.ConnectionFactory;
 
@@ -55,12 +54,12 @@ public class JmsOutboundChannelAdapterTests extends ActiveMQMultiContextTests {
 		JmsTemplate template = new JmsTemplate(connectionFactory);
 		template.convertAndSend("outcatQ1", "Hello, world!");
 		template.setReceiveTimeout(20000);
-		assertNotNull(template.receive("outcatQ2"));
+		assertThat(template.receive("outcatQ2")).isNotNull();
 
 		this.aborter.abort = true;
 		template.convertAndSend("outcatQ1", "Hello, world!");
 		template.setReceiveTimeout(1000);
-		assertNull(template.receive("outcatQ2"));
+		assertThat(template.receive("outcatQ2")).isNull();
 		endpoint.stop();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 
 package org.springframework.integration.jms;
 
-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.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.isNull;
@@ -86,9 +84,9 @@ public class JmsOutboundGatewayTests extends ActiveMQMultiContextTests {
 		gateway.setReplyContainerProperties(new ReplyContainerProperties());
 		gateway.setBeanFactory(mock(BeanFactory.class));
 		gateway.afterPropertiesSet();
-		assertEquals("JMS_OutboundGateway@" + ObjectUtils.getIdentityHexString(gateway) +
-						".replyListener",
-				TestUtils.getPropertyValue(gateway, "replyContainer.beanName"));
+		assertThat(TestUtils.getPropertyValue(gateway, "replyContainer.beanName"))
+				.isEqualTo("JMS_OutboundGateway@" + ObjectUtils.getIdentityHexString(gateway) +
+						".replyListener");
 	}
 
 	@SuppressWarnings("serial")
@@ -154,8 +152,8 @@ public class JmsOutboundGatewayTests extends ActiveMQMultiContextTests {
 			while (n++ < 100 && count.get() < 5) {
 				Thread.sleep(100);
 			}
-			assertTrue(count.get() > 4);
-			assertEquals(0, errors.size());
+			assertThat(count.get() > 4).isTrue();
+			assertThat(errors.size()).isEqualTo(0);
 		}
 		finally {
 			gateway.stop();
@@ -189,7 +187,7 @@ public class JmsOutboundGatewayTests extends ActiveMQMultiContextTests {
 		template.setReceiveTimeout(10000);
 		template.afterPropertiesSet();
 		final Message request = template.receive(requestQ);
-		assertNotNull(request);
+		assertThat(request).isNotNull();
 		connectionFactory1.resetConnection();
 		MessageCreator reply = session -> {
 			TextMessage reply1 = session.createTextMessage("bar");
@@ -198,8 +196,8 @@ public class JmsOutboundGatewayTests extends ActiveMQMultiContextTests {
 		};
 		template.send(replyQ, reply);
 		org.springframework.messaging.Message<?> received = queueChannel.receive(20000);
-		assertNotNull(received);
-		assertEquals("bar", received.getPayload());
+		assertThat(received).isNotNull();
+		assertThat(received.getPayload()).isEqualTo("bar");
 		gateway.stop();
 		connectionFactory1.destroy();
 		connectionFactory2.destroy();
@@ -233,7 +231,7 @@ public class JmsOutboundGatewayTests extends ActiveMQMultiContextTests {
 		template.setReceiveTimeout(10000);
 		template.afterPropertiesSet();
 		final Message request = template.receive(requestQ);
-		assertNotNull(request);
+		assertThat(request).isNotNull();
 		connectionFactory1.resetConnection();
 		MessageCreator reply = session -> {
 			TextMessage reply1 = session.createTextMessage("bar");
@@ -244,8 +242,8 @@ public class JmsOutboundGatewayTests extends ActiveMQMultiContextTests {
 		template.send(replyQ, reply);
 		logger.debug("Sent reply to: " + replyQ);
 		org.springframework.messaging.Message<?> received = queueChannel.receive(20000);
-		assertNotNull(received);
-		assertEquals("bar", received.getPayload());
+		assertThat(received).isNotNull();
+		assertThat(received.getPayload()).isEqualTo("bar");
 		gateway.stop();
 		connectionFactory1.destroy();
 		connectionFactory2.destroy();

spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 
 package org.springframework.integration.jms;
 
-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;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -61,16 +59,16 @@ public class JmsOutboundInsideChainTests extends ActiveMQMultiContextTests {
 		Message<String> shippedMessage = MessageBuilder.withPayload(testString).build();
 		this.outboundChainChannel.send(shippedMessage);
 		Message<?> receivedMessage = this.receiveChannel.receive(2000);
-		assertEquals(testString, receivedMessage.getPayload());
+		assertThat(receivedMessage.getPayload()).isEqualTo(testString);
 	}
 
 	@Test
 	public void testJmsOutboundGatewayRequiresReply() {
 		this.outboundGatewayChainChannel.send(MessageBuilder.withPayload("test").build());
-		assertNotNull(this.repliesChannel.receive(2000));
+		assertThat(this.repliesChannel.receive(2000)).isNotNull();
 
 		this.outboundGatewayChainChannel.send(MessageBuilder.withPayload("test").build());
-		assertNull(this.repliesChannel.receive(2000));
+		assertThat(this.repliesChannel.receive(2000)).isNull();
 	}
 
 }

spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayConnectionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.integration.jms;
 
-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;
 import static org.mockito.Mockito.when;
 
@@ -91,16 +90,16 @@ public class OutboundGatewayConnectionTests {
 				latch2.countDown();
 			}
 		});
-		assertTrue(latch1.await(10, TimeUnit.SECONDS));
+		assertThat(latch1.await(10, TimeUnit.SECONDS)).isTrue();
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(amqConnectionFactory);
 		template.setReceiveTimeout(5000);
 		javax.jms.Message request = template.receive(requestQueue1);
-		assertNotNull(request);
+		assertThat(request).isNotNull();
 		final javax.jms.Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), (MessageCreator) session -> jmsReply);
-		assertTrue(latch2.await(10, TimeUnit.SECONDS));
-		assertNotNull(reply.get());
+		assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue();
+		assertThat(reply.get()).isNotNull();
 
 		broker.stop();
 		broker = new BrokerService();
@@ -118,16 +117,16 @@ public class OutboundGatewayConnectionTests {
 				latch4.countDown();
 			}
 		});
-		assertTrue(latch3.await(10, TimeUnit.SECONDS));
+		assertThat(latch3.await(10, TimeUnit.SECONDS)).isTrue();
 		template = new JmsTemplate();
 		template.setConnectionFactory(amqConnectionFactory);
 		template.setReceiveTimeout(5000);
 		request = template.receive(requestQueue1);
-		assertNotNull(request);
+		assertThat(request).isNotNull();
 		final javax.jms.Message jmsReply2 = request;
 		template.send(request.getJMSReplyTo(), (MessageCreator) session -> jmsReply2);
-		assertTrue(latch4.await(10, TimeUnit.SECONDS));
-		assertNotNull(reply.get());
+		assertThat(latch4.await(10, TimeUnit.SECONDS)).isTrue();
+		assertThat(reply.get()).isNotNull();
 
 		gateway.stop();
 		broker.stop();

spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayFunctionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 
 package org.springframework.integration.jms;
 
-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;
 import static org.mockito.Mockito.when;
 
@@ -113,16 +111,16 @@ public class OutboundGatewayFunctionTests extends ActiveMQMultiContextTests {
 				latch2.countDown();
 			}
 		});
-		assertTrue(latch1.await(10, TimeUnit.SECONDS));
+		assertThat(latch1.await(10, TimeUnit.SECONDS)).isTrue();
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(connectionFactory);
 		template.setReceiveTimeout(10000);
 		javax.jms.Message request = template.receive(requestQueue1);
-		assertNotNull(request);
+		assertThat(request).isNotNull();
 		final javax.jms.Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), (MessageCreator) session -> jmsReply);
-		assertTrue(latch2.await(10, TimeUnit.SECONDS));
-		assertNotNull(reply.get());
+		assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue();
+		assertThat(reply.get()).isNotNull();
 
 		gateway.stop();
 		scheduler.destroy();
@@ -158,19 +156,19 @@ public class OutboundGatewayFunctionTests extends ActiveMQMultiContextTests {
 				latch2.countDown();
 			}
 		});
-		assertTrue(latch1.await(10, TimeUnit.SECONDS));
+		assertThat(latch1.await(10, TimeUnit.SECONDS)).isTrue();
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(getConnectionFactory());
 		template.setReceiveTimeout(10000);
 		javax.jms.Message request = template.receive(requestQueue2);
-		assertNotNull(request);
+		assertThat(request).isNotNull();
 		final javax.jms.Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), (MessageCreator) session -> {
 			jmsReply.setJMSCorrelationID(jmsReply.getJMSMessageID());
 			return jmsReply;
 		});
-		assertTrue(latch2.await(20, TimeUnit.SECONDS));
-		assertNotNull(reply.get());
+		assertThat(latch2.await(20, TimeUnit.SECONDS)).isTrue();
+		assertThat(reply.get()).isNotNull();
 
 		gateway.stop();
 		scheduler.destroy();
@@ -207,16 +205,16 @@ public class OutboundGatewayFunctionTests extends ActiveMQMultiContextTests {
 				latch2.countDown();
 			}
 		});
-		assertTrue(latch1.await(10, TimeUnit.SECONDS));
+		assertThat(latch1.await(10, TimeUnit.SECONDS)).isTrue();
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(getConnectionFactory());
 		template.setReceiveTimeout(10000);
 		javax.jms.Message request = template.receive(requestQueue3);
-		assertNotNull(request);
+		assertThat(request).isNotNull();
 		final javax.jms.Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), session -> jmsReply);
-		assertTrue(latch2.await(10, TimeUnit.SECONDS));
-		assertNotNull(reply.get());
+		assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue();
+		assertThat(reply.get()).isNotNull();
 
 		gateway.stop();
 		scheduler.destroy();
@@ -252,19 +250,19 @@ public class OutboundGatewayFunctionTests extends ActiveMQMultiContextTests {
 				latch2.countDown();
 			}
 		});
-		assertTrue(latch1.await(10, TimeUnit.SECONDS));
+		assertThat(latch1.await(10, TimeUnit.SECONDS)).isTrue();
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(getConnectionFactory());
 		template.setReceiveTimeout(10000);
 		javax.jms.Message request = template.receive(requestQueue4);
-		assertNotNull(request);
+		assertThat(request).isNotNull();
 		final javax.jms.Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), session -> {
 			jmsReply.setJMSCorrelationID(jmsReply.getJMSMessageID());
 			return jmsReply;
 		});
-		assertTrue(latch2.await(10, TimeUnit.SECONDS));
-		assertNotNull(reply.get());
+		assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue();
+		assertThat(reply.get()).isNotNull();
 
 		gateway.stop();
 		scheduler.destroy();
@@ -301,16 +299,16 @@ public class OutboundGatewayFunctionTests extends ActiveMQMultiContextTests {
 				latch2.countDown();
 			}
 		});
-		assertTrue(latch1.await(10, TimeUnit.SECONDS));
+		assertThat(latch1.await(10, TimeUnit.SECONDS)).isTrue();
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(getConnectionFactory());
 		template.setReceiveTimeout(10000);
 		javax.jms.Message request = template.receive(requestQueue5);
-		assertNotNull(request);
+		assertThat(request).isNotNull();
 		final javax.jms.Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), session -> jmsReply);
-		assertTrue(latch2.await(10, TimeUnit.SECONDS));
-		assertNotNull(reply.get());
+		assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue();
+		assertThat(reply.get()).isNotNull();
 
 		gateway.stop();
 		scheduler.destroy();
@@ -345,19 +343,19 @@ public class OutboundGatewayFunctionTests extends ActiveMQMultiContextTests {
 				latch2.countDown();
 			}
 		});
-		assertTrue(latch1.await(10, TimeUnit.SECONDS));
+		assertThat(latch1.await(10, TimeUnit.SECONDS)).isTrue();
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(getConnectionFactory());
 		template.setReceiveTimeout(10000);
 		javax.jms.Message request = template.receive(requestQueue6);
-		assertNotNull(request);
+		assertThat(request).isNotNull();
 		final javax.jms.Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), session -> {
 			jmsReply.setJMSCorrelationID(jmsReply.getJMSMessageID());
 			return jmsReply;
 		});
-		assertTrue(latch2.await(10, TimeUnit.SECONDS));
-		assertNotNull(reply.get());
+		assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue();
+		assertThat(reply.get()).isNotNull();
 
 		gateway.stop();
 		scheduler.destroy();
@@ -393,19 +391,19 @@ public class OutboundGatewayFunctionTests extends ActiveMQMultiContextTests {
 			receiveAndSend(template);
 		});
 
-		assertNotNull(gateway.handleRequestMessage(new GenericMessage<>("foo")));
+		assertThat(gateway.handleRequestMessage(new GenericMessage<>("foo"))).isNotNull();
 		DefaultMessageListenerContainer container = TestUtils.getPropertyValue(gateway, "replyContainer",
 				DefaultMessageListenerContainer.class);
 		int n = 0;
 		while (n++ < 100 && container.isRunning()) {
 			Thread.sleep(100);
 		}
-		assertFalse(container.isRunning());
-		assertNotNull(gateway.handleRequestMessage(new GenericMessage<>("foo")));
-		assertTrue(container.isRunning());
+		assertThat(container.isRunning()).isFalse();
+		assertThat(gateway.handleRequestMessage(new GenericMessage<>("foo"))).isNotNull();
+		assertThat(container.isRunning()).isTrue();
 
 		gateway.stop();
-		assertFalse(container.isRunning());
+		assertThat(container.isRunning()).isFalse();
 		scheduler.destroy();
 		exec.shutdownNow();
 	}

spring-integration-jms/src/test/java/org/springframework/integration/jms/PollableJmsChannelTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,7 @@
 
 package org.springframework.integration.jms;
 
-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;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -86,15 +83,15 @@ public class PollableJmsChannelTests extends ActiveMQMultiContextTests {
 		factoryBean.afterPropertiesSet();
 		PollableJmsChannel channel = (PollableJmsChannel) factoryBean.getObject();
 		boolean sent1 = channel.send(new GenericMessage<String>("foo"));
-		assertTrue(sent1);
+		assertThat(sent1).isTrue();
 		boolean sent2 = channel.send(new GenericMessage<String>("bar"));
-		assertTrue(sent2);
+		assertThat(sent2).isTrue();
 		Message<?> result1 = channel.receive(10000);
-		assertNotNull(result1);
-		assertEquals("foo", result1.getPayload());
+		assertThat(result1).isNotNull();
+		assertThat(result1.getPayload()).isEqualTo("foo");
 		Message<?> result2 = channel.receive(10000);
-		assertNotNull(result2);
-		assertEquals("bar", result2.getPayload());
+		assertThat(result2).isNotNull();
+		assertThat(result2.getPayload()).isEqualTo("bar");
 	}
 
 	@Test
@@ -109,15 +106,15 @@ public class PollableJmsChannelTests extends ActiveMQMultiContextTests {
 		factoryBean.afterPropertiesSet();
 		PollableJmsChannel channel = (PollableJmsChannel) factoryBean.getObject();
 		boolean sent1 = channel.send(new GenericMessage<String>("foo"));
-		assertTrue(sent1);
+		assertThat(sent1).isTrue();
 		boolean sent2 = channel.send(new GenericMessage<String>("bar"));
-		assertTrue(sent2);
+		assertThat(sent2).isTrue();
 		Message<?> result1 = channel.receive(10000);
-		assertNotNull(result1);
-		assertEquals("foo", result1.getPayload());
+		assertThat(result1).isNotNull();
+		assertThat(result1.getPayload()).isEqualTo("foo");
 		Message<?> result2 = channel.receive(10000);
-		assertNotNull(result2);
-		assertEquals("bar", result2.getPayload());
+		assertThat(result2).isNotNull();
+		assertThat(result2.getPayload()).isEqualTo("bar");
 	}
 
 	@Test
@@ -136,9 +133,9 @@ public class PollableJmsChannelTests extends ActiveMQMultiContextTests {
 		factoryBean.afterPropertiesSet();
 		PollableJmsChannel channel = (PollableJmsChannel) factoryBean.getObject();
 		boolean sent1 = channel.send(new GenericMessage<String>("foo"));
-		assertTrue(sent1);
+		assertThat(sent1).isTrue();
 		Message<?> result1 = channel.receive(10000);
-		assertNull(result1);
+		assertThat(result1).isNull();
 		verify(interceptor, times(1)).preReceive(Mockito.any(MessageChannel.class));
 		verify(interceptor, times(0)).postReceive(Mockito.any(Message.class), Mockito.any(MessageChannel.class));
 	}
@@ -159,9 +156,9 @@ public class PollableJmsChannelTests extends ActiveMQMultiContextTests {
 		factoryBean.afterPropertiesSet();
 		PollableJmsChannel channel = (PollableJmsChannel) factoryBean.getObject();
 		boolean sent1 = channel.send(new GenericMessage<String>("foo"));
-		assertTrue(sent1);
+		assertThat(sent1).isTrue();
 		Message<?> result1 = channel.receive(10000);
-		assertNotNull(result1);
+		assertThat(result1).isNotNull();
 		verify(interceptor, times(1)).preReceive(Mockito.any(MessageChannel.class));
 		verify(interceptor, times(1)).postReceive(Mockito.any(Message.class), Mockito.any(MessageChannel.class));
 	}
@@ -185,7 +182,7 @@ public class PollableJmsChannelTests extends ActiveMQMultiContextTests {
 		PollableJmsChannel channel = (PollableJmsChannel) factoryBean.getObject();
 		final JmsTemplate receiver = new JmsTemplate(this.connectionFactory);
 		boolean sent1 = channel.send(new GenericMessage<String>("foo"));
-		assertTrue(sent1);
+		assertThat(sent1).isTrue();
 		final AtomicReference<javax.jms.Message> message = new AtomicReference<javax.jms.Message>();
 		final CountDownLatch latch1 = new CountDownLatch(1);
 		ExecutorService exec = Executors.newSingleThreadExecutor();
@@ -193,24 +190,24 @@ public class PollableJmsChannelTests extends ActiveMQMultiContextTests {
 			message.set(receiver.receive(queue));
 			latch1.countDown();
 		});
-		assertTrue(latch1.await(10, TimeUnit.SECONDS));
-		assertNotNull(message.get());
-		assertEquals(5, message.get().getJMSPriority());
-		assertTrue(message.get().getJMSExpiration() <= System.currentTimeMillis() + ttl);
-		assertTrue(message.get().toString().contains("persistent = false"));
+		assertThat(latch1.await(10, TimeUnit.SECONDS)).isTrue();
+		assertThat(message.get()).isNotNull();
+		assertThat(message.get().getJMSPriority()).isEqualTo(5);
+		assertThat(message.get().getJMSExpiration() <= System.currentTimeMillis() + ttl).isTrue();
+		assertThat(message.get().toString().contains("persistent = false")).isTrue();
 		message.set(null);
 		final CountDownLatch latch2 = new CountDownLatch(1);
 		boolean sent2 = channel.send(MessageBuilder.withPayload("foo").setPriority(6).build());
-		assertTrue(sent2);
+		assertThat(sent2).isTrue();
 		exec.execute(() -> {
 			message.set(receiver.receive(queue));
 			latch2.countDown();
 		});
-		assertTrue(latch2.await(10, TimeUnit.SECONDS));
-		assertNotNull(message.get());
-		assertEquals(6, message.get().getJMSPriority());
-		assertTrue(message.get().getJMSExpiration() <= System.currentTimeMillis() + ttl);
-		assertTrue(message.get().toString().contains("persistent = false"));
+		assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue();
+		assertThat(message.get()).isNotNull();
+		assertThat(message.get().getJMSPriority()).isEqualTo(6);
+		assertThat(message.get().getJMSExpiration() <= System.currentTimeMillis() + ttl).isTrue();
+		assertThat(message.get().toString().contains("persistent = false")).isTrue();
 		exec.shutdownNow();
 	}
 
@@ -230,9 +227,9 @@ public class PollableJmsChannelTests extends ActiveMQMultiContextTests {
 		factoryBean.afterPropertiesSet();
 		PollableJmsChannel channel = (PollableJmsChannel) factoryBean.getObject();
 		boolean sent1 = channel.send(new GenericMessage<String>("foo"));
-		assertTrue(sent1);
+		assertThat(sent1).isTrue();
 		Message<?> result1 = channel.receive(100);
-		assertNull(result1);
+		assertThat(result1).isNull();
 
 		JmsTemplate jmsTemplate = new JmsTemplate(this.connectionFactory);
 		jmsTemplate.setDefaultDestinationName("pollableJmsChannelSelectorTestQueue");
@@ -243,8 +240,8 @@ public class PollableJmsChannelTests extends ActiveMQMultiContextTests {
 		});
 
 		Message<?> result2 = channel.receive(10000);
-		assertNotNull(result2);
-		assertEquals("bar", result2.getPayload());
+		assertThat(result2).isNotNull();
+		assertThat(result2.getPayload()).isEqualTo("bar");
 	}
 
 	public static class SampleInterceptor implements ChannelInterceptor {

spring-integration-jms/src/test/java/org/springframework/integration/jms/SplitterAggregatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.integration.jms;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -71,9 +70,9 @@ public class SplitterAggregatorTests extends ActiveMQMultiContextTests {
 		List<Integer> payload = Arrays.asList(1, 2, 3, 4, 5, 6);
 		this.splitChannel.send(new GenericMessage<List<Integer>>(payload));
 		Message<?> message = this.resultChannel.receive(10000);
-		assertNotNull(message);
+		assertThat(message).isNotNull();
 		Collections.sort(((List<Integer>) message.getPayload()));
-		assertEquals(payload, message.getPayload());
+		assertThat(message.getPayload()).isEqualTo(payload);
 	}
 
 	@Configuration

spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,8 @@
 
 package org.springframework.integration.jms;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-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;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doAnswer;
@@ -120,12 +115,12 @@ public class SubscribableJmsChannelTests extends ActiveMQMultiContextTests {
 		channel.send(new GenericMessage<String>("foo"));
 		channel.send(new GenericMessage<String>("bar"));
 		latch.await(TIMEOUT, TimeUnit.MILLISECONDS);
-		assertEquals(1, receivedList1.size());
-		assertNotNull(receivedList1.get(0));
-		assertEquals("foo", receivedList1.get(0).getPayload());
-		assertEquals(1, receivedList2.size());
-		assertNotNull(receivedList2.get(0));
-		assertEquals("bar", receivedList2.get(0).getPayload());
+		assertThat(receivedList1.size()).isEqualTo(1);
+		assertThat(receivedList1.get(0)).isNotNull();
+		assertThat(receivedList1.get(0).getPayload()).isEqualTo("foo");
+		assertThat(receivedList2.size()).isEqualTo(1);
+		assertThat(receivedList2.get(0)).isNotNull();
+		assertThat(receivedList2.get(0).getPayload()).isEqualTo("bar");
 		channel.stop();
 	}
 
@@ -158,12 +153,12 @@ public class SubscribableJmsChannelTests extends ActiveMQMultiContextTests {
 		channel.send(new GenericMessage<String>("foo"));
 		channel.send(new GenericMessage<String>("bar"));
 		latch.await(TIMEOUT, TimeUnit.MILLISECONDS);
-		assertEquals(2, receivedList1.size());
-		assertEquals("foo", receivedList1.get(0).getPayload());
-		assertEquals("bar", receivedList1.get(1).getPayload());
-		assertEquals(2, receivedList2.size());
-		assertEquals("foo", receivedList2.get(0).getPayload());
-		assertEquals("bar", receivedList2.get(1).getPayload());
+		assertThat(receivedList1.size()).isEqualTo(2);
+		assertThat(receivedList1.get(0).getPayload()).isEqualTo("foo");
+		assertThat(receivedList1.get(1).getPayload()).isEqualTo("bar");
+		assertThat(receivedList2.size()).isEqualTo(2);
+		assertThat(receivedList2.get(0).getPayload()).isEqualTo("foo");
+		assertThat(receivedList2.get(1).getPayload()).isEqualTo("bar");
 		channel.stop();
 	}
 
@@ -195,15 +190,16 @@ public class SubscribableJmsChannelTests extends ActiveMQMultiContextTests {
 		channel.send(new GenericMessage<String>("foo"));
 		channel.send(new GenericMessage<String>("bar"));
 
-		assertTrue("Countdown latch should have counted down to 0 but was "
-				+ latch.getCount(), latch.await(TIMEOUT, TimeUnit.MILLISECONDS));
+		assertThat(latch.await(TIMEOUT, TimeUnit.MILLISECONDS))
+				.as("Countdown latch should have counted down to 0 but was "
+						+ latch.getCount()).isTrue();
 
-		assertEquals(1, receivedList1.size());
-		assertNotNull(receivedList1.get(0));
-		assertEquals("foo", receivedList1.get(0).getPayload());
-		assertEquals(1, receivedList2.size());
-		assertNotNull(receivedList2.get(0));
-		assertEquals("bar", receivedList2.get(0).getPayload());
+		assertThat(receivedList1.size()).isEqualTo(1);
+		assertThat(receivedList1.get(0)).isNotNull();
+		assertThat(receivedList1.get(0).getPayload()).isEqualTo("foo");
+		assertThat(receivedList2.size()).isEqualTo(1);
+		assertThat(receivedList2.get(0)).isNotNull();
+		assertThat(receivedList2.get(0).getPayload()).isEqualTo("bar");
 		channel.stop();
 	}
 
@@ -238,12 +234,12 @@ public class SubscribableJmsChannelTests extends ActiveMQMultiContextTests {
 		channel.send(new GenericMessage<String>("foo"));
 		channel.send(new GenericMessage<String>("bar"));
 		latch.await(TIMEOUT, TimeUnit.MILLISECONDS);
-		assertEquals(2, receivedList1.size());
-		assertEquals("foo", receivedList1.get(0).getPayload());
-		assertEquals("bar", receivedList1.get(1).getPayload());
-		assertEquals(2, receivedList2.size());
-		assertEquals("foo", receivedList2.get(0).getPayload());
-		assertEquals("bar", receivedList2.get(1).getPayload());
+		assertThat(receivedList1.size()).isEqualTo(2);
+		assertThat(receivedList1.get(0).getPayload()).isEqualTo("foo");
+		assertThat(receivedList1.get(1).getPayload()).isEqualTo("bar");
+		assertThat(receivedList2.size()).isEqualTo(2);
+		assertThat(receivedList2.get(0).getPayload()).isEqualTo("foo");
+		assertThat(receivedList2.get(1).getPayload()).isEqualTo("bar");
 		channel.stop();
 	}
 
@@ -257,11 +253,11 @@ public class SubscribableJmsChannelTests extends ActiveMQMultiContextTests {
 		StaticApplicationContext context = new StaticApplicationContext();
 		context.registerBeanDefinition("channel", builder.getBeanDefinition());
 		SubscribableJmsChannel channel = context.getBean("channel", SubscribableJmsChannel.class);
-		assertFalse(channel.isRunning());
+		assertThat(channel.isRunning()).isFalse();
 		context.refresh();
-		assertTrue(channel.isRunning());
+		assertThat(channel.isRunning()).isTrue();
 		context.stop();
-		assertFalse(channel.isRunning());
+		assertThat(channel.isRunning()).isFalse();
 		context.close();
 	}
 
@@ -285,8 +281,8 @@ public class SubscribableJmsChannelTests extends ActiveMQMultiContextTests {
 			fail("Exception expected");
 		}
 		catch (MessageDeliveryException e) {
-			assertThat(e.getMessage(),
-					containsString("Dispatcher has no subscribers for jms-channel 'noSubscribersChannel'."));
+			assertThat(e.getMessage())
+					.contains("Dispatcher has no subscribers for jms-channel 'noSubscribersChannel'.");
 		}
 	}
 
@@ -332,18 +328,18 @@ public class SubscribableJmsChannelTests extends ActiveMQMultiContextTests {
 	}
 
 	private void verifyLogReceived(final List<String> logList) {
-		assertTrue("Failed to get expected exception", logList.size() > 0);
+		assertThat(logList.size() > 0).as("Failed to get expected exception").isTrue();
 		boolean expectedExceptionFound = false;
 		while (logList.size() > 0) {
 			String message = logList.remove(0);
-			assertNotNull("Failed to get expected exception", message);
+			assertThat(message).as("Failed to get expected exception").isNotNull();
 			if (message.startsWith("Dispatcher has no subscribers")) {
 				expectedExceptionFound = true;
-				assertEquals("Dispatcher has no subscribers for jms-channel 'noSubscribersChannel'.", message);
+				assertThat(message).isEqualTo("Dispatcher has no subscribers for jms-channel 'noSubscribersChannel'.");
 				break;
 			}
 		}
-		assertTrue("Failed to get expected exception", expectedExceptionFound);
+		assertThat(expectedExceptionFound).as("Failed to get expected exception").isTrue();
 	}
 
 	/**

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/DefaultConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-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;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -54,31 +52,31 @@ public class DefaultConfigurationTests {
 	@Test
 	public void verifyErrorChannel() {
 		Object errorChannel = context.getBean("errorChannel");
-		assertNotNull(errorChannel);
-		assertEquals(PublishSubscribeChannel.class, errorChannel.getClass());
+		assertThat(errorChannel).isNotNull();
+		assertThat(errorChannel.getClass()).isEqualTo(PublishSubscribeChannel.class);
 	}
 
 	@Test
 	public void verifyNullChannel() {
 		Object nullChannel = context.getBean("nullChannel");
-		assertNotNull(nullChannel);
-		assertEquals(NullChannel.class, nullChannel.getClass());
+		assertThat(nullChannel).isNotNull();
+		assertThat(nullChannel.getClass()).isEqualTo(NullChannel.class);
 	}
 
 	@Test
 	public void verifyTaskScheduler() {
 		Object taskScheduler = context.getBean(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME);
-		assertEquals(ThreadPoolTaskScheduler.class, taskScheduler.getClass());
+		assertThat(taskScheduler.getClass()).isEqualTo(ThreadPoolTaskScheduler.class);
 		ErrorHandler errorHandler = TestUtils.getPropertyValue(taskScheduler, "errorHandler", ErrorHandler.class);
-		assertEquals(MessagePublishingErrorHandler.class, errorHandler.getClass());
+		assertThat(errorHandler.getClass()).isEqualTo(MessagePublishingErrorHandler.class);
 		MessageChannel defaultErrorChannel = TestUtils.getPropertyValue(errorHandler,
 				"messagingTemplate.defaultDestination", MessageChannel.class);
-		assertNull(defaultErrorChannel);
+		assertThat(defaultErrorChannel).isNull();
 		errorHandler.handleError(new Throwable());
 		defaultErrorChannel = TestUtils.getPropertyValue(errorHandler, "messagingTemplate.defaultDestination",
 				MessageChannel.class);
-		assertNotNull(defaultErrorChannel);
-		assertEquals(context.getBean(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME), defaultErrorChannel);
+		assertThat(defaultErrorChannel).isNotNull();
+		assertThat(defaultErrorChannel).isEqualTo(context.getBean(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME));
 	}
 
 }

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
@@ -52,7 +51,7 @@ public class ExceptionHandlingSiConsumerTests {
 			return message;
 		});
 		Message message = jmsTemplate.receive(reply);
-		assertNotNull(message);
+		assertThat(message).isNotNull();
 		applicationContext.close();
 	}
 
@@ -71,8 +70,8 @@ public class ExceptionHandlingSiConsumerTests {
 			return message;
 		});
 		Message message = jmsTemplate.receive(reply);
-		assertNotNull(message);
-		assertEquals("echoWithException", ((TextMessage) message).getText());
+		assertThat(message).isNotNull();
+		assertThat(((TextMessage) message).getText()).isEqualTo("echoWithException");
 		applicationContext.close();
 	}
 
@@ -82,7 +81,7 @@ public class ExceptionHandlingSiConsumerTests {
 		final ConfigurableApplicationContext applicationContext = new ClassPathXmlApplicationContext("Exception-nonSiProducer-siConsumer.xml", ExceptionHandlingSiConsumerTests.class);
 		SampleGateway gateway = applicationContext.getBean("sampleGateway", SampleGateway.class);
 		String reply = gateway.echo("echoWithExceptionChannel");
-		assertEquals("echoWithException", reply);
+		assertThat(reply).isEqualTo("echoWithException");
 		applicationContext.close();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,8 @@
 
 package org.springframework.integration.jms.config;
 
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertThat;
-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;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -89,7 +87,7 @@ public class ExtractRequestReplyPayloadTests {
 		this.outboundChannel.send(new GenericMessage<String>("Hello " + this.testName.getMethodName()));
 
 		Message<?> replyMessage = this.replyChannel.receive(10000);
-		assertTrue(replyMessage.getPayload() instanceof String);
+		assertThat(replyMessage.getPayload() instanceof String).isTrue();
 		this.jmsInputChannel.unsubscribe(handler);
 	}
 
@@ -103,7 +101,7 @@ public class ExtractRequestReplyPayloadTests {
 
 		final AtomicBoolean failOnce = new AtomicBoolean();
 		MessageHandler handler = message -> {
-			assertTrue(message.getPayload() instanceof String);
+			assertThat(message.getPayload() instanceof String).isTrue();
 			if (failOnce.compareAndSet(false, true)) {
 				throw new RuntimeException("test tx");
 			}
@@ -115,7 +113,7 @@ public class ExtractRequestReplyPayloadTests {
 		this.outboundChannel.send(new GenericMessage<String>("Hello " + this.testName.getMethodName()));
 
 		Message<?> replyMessage = this.replyChannel.receive(10000);
-		assertTrue(replyMessage.getPayload() instanceof String);
+		assertThat(replyMessage.getPayload() instanceof String).isTrue();
 		this.jmsInputChannel.unsubscribe(handler);
 	}
 
@@ -132,7 +130,7 @@ public class ExtractRequestReplyPayloadTests {
 		this.outboundChannel.send(new GenericMessage<String>("Hello " + this.testName.getMethodName()));
 
 		Message<?> replyMessage = this.replyChannel.receive(10000);
-		assertThat(replyMessage.getPayload(), instanceOf(javax.jms.TextMessage.class));
+		assertThat(replyMessage.getPayload()).isInstanceOf(javax.jms.TextMessage.class);
 		this.jmsInputChannel.unsubscribe(handler);
 	}
 
@@ -148,7 +146,7 @@ public class ExtractRequestReplyPayloadTests {
 		this.jmsInputChannel.subscribe(handler);
 		this.outboundChannel.send(new GenericMessage<String>("Hello " + this.testName.getMethodName()));
 		Message<?> replyMessage = this.replyChannel.receive(10000);
-		assertThat(replyMessage.getPayload(), instanceOf(String.class));
+		assertThat(replyMessage.getPayload()).isInstanceOf(String.class);
 		this.jmsInputChannel.unsubscribe(handler);
 	}
 
@@ -164,7 +162,7 @@ public class ExtractRequestReplyPayloadTests {
 		this.jmsInputChannel.subscribe(handler);
 		this.outboundChannel.send(new GenericMessage<String>("Hello " + this.testName.getMethodName()));
 		Message<?> replyMessage = this.replyChannel.receive(10000);
-		assertThat(replyMessage.getPayload(), instanceOf(String.class));
+		assertThat(replyMessage.getPayload()).isInstanceOf(String.class);
 		this.jmsInputChannel.unsubscribe(handler);
 	}
 
@@ -180,7 +178,7 @@ public class ExtractRequestReplyPayloadTests {
 		this.jmsInputChannel.subscribe(handler);
 		this.outboundChannel.send(new GenericMessage<String>("Hello " + this.testName.getMethodName()));
 		Message<?> replyMessage = this.replyChannel.receive(10000);
-		assertTrue(replyMessage.getPayload() instanceof String);
+		assertThat(replyMessage.getPayload() instanceof String).isTrue();
 		this.jmsInputChannel.unsubscribe(handler);
 	}
 
@@ -196,7 +194,7 @@ public class ExtractRequestReplyPayloadTests {
 		this.jmsInputChannel.subscribe(handler);
 		this.outboundChannel.send(new GenericMessage<String>("Hello " + this.testName.getMethodName()));
 		Message<?> replyMessage = this.replyChannel.receive(10000);
-		assertTrue(replyMessage.getPayload() instanceof javax.jms.Message);
+		assertThat(replyMessage.getPayload() instanceof javax.jms.Message).isTrue();
 		this.jmsInputChannel.unsubscribe(handler);
 	}
 
@@ -212,7 +210,7 @@ public class ExtractRequestReplyPayloadTests {
 		this.jmsInputChannel.subscribe(handler);
 		this.outboundChannel.send(new GenericMessage<String>("Hello " + this.testName.getMethodName()));
 		Message<?> replyMessage = this.replyChannel.receive(10000);
-		assertThat(replyMessage.getPayload(), instanceOf(String.class));
+		assertThat(replyMessage.getPayload()).isInstanceOf(String.class);
 		this.jmsInputChannel.unsubscribe(handler);
 	}
 
@@ -228,13 +226,13 @@ public class ExtractRequestReplyPayloadTests {
 		this.jmsInputChannel.subscribe(handler);
 		this.outboundChannel.send(new GenericMessage<String>("Hello " + this.testName.getMethodName()));
 		Message<?> replyMessage = this.replyChannel.receive(10000);
-		assertThat(replyMessage.getPayload(), instanceOf(javax.jms.Message.class));
+		assertThat(replyMessage.getPayload()).isInstanceOf(javax.jms.Message.class);
 		this.jmsInputChannel.unsubscribe(handler);
 	}
 
 	private MessageHandler echoInboundStringHandler() {
 		return message -> {
-			assertTrue(message.getPayload() instanceof String);
+			assertThat(message.getPayload() instanceof String).isTrue();
 			MessagingTemplate template = new MessagingTemplate();
 			template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
 			template.send(message);
@@ -243,7 +241,7 @@ public class ExtractRequestReplyPayloadTests {
 
 	private MessageHandler unwrapObjectMessageAndEchoHandler() {
 		return message -> {
-			assertThat(message.getPayload(), instanceOf(javax.jms.ObjectMessage.class));
+			assertThat(message.getPayload()).isInstanceOf(javax.jms.ObjectMessage.class);
 			MessagingTemplate template = new MessagingTemplate();
 			template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
 			Message<?> origMessage = null;
@@ -259,7 +257,7 @@ public class ExtractRequestReplyPayloadTests {
 
 	private MessageHandler unwrapTextMessageAndEchoHandler() {
 		return message -> {
-			assertThat(message.getPayload(), instanceOf(javax.jms.TextMessage.class));
+			assertThat(message.getPayload()).isInstanceOf(javax.jms.TextMessage.class);
 			MessagingTemplate template = new MessagingTemplate();
 			template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
 			String payload = null;

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-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 java.util.List;
 
@@ -46,9 +44,9 @@ public class GlobalChannelInterceptorTests {
 				"GlobalChannelInterceptorTests-context.xml",  GlobalChannelInterceptorTests.class);
 		ChannelInterceptorAware jmsChannel = context.getBean("jmsChannel", AbstractMessageChannel.class);
 		List<ChannelInterceptor> interceptors = jmsChannel.getChannelInterceptors();
-		assertNotNull(interceptors);
-		assertEquals(1, interceptors.size());
-		assertTrue(interceptors.get(0) instanceof SampleInterceptor);
+		assertThat(interceptors).isNotNull();
+		assertThat(interceptors.size()).isEqualTo(1);
+		assertThat(interceptors.get(0) instanceof SampleInterceptor).isTrue();
 		context.close();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-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;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -50,11 +48,11 @@ public class InboundOneWayErrorTests {
 		jmsTemplate.send(queue, (MessageCreator) session -> session.createTextMessage("test-A"));
 		TestErrorHandler errorHandler = context.getBean("testErrorHandler", TestErrorHandler.class);
 		errorHandler.latch.await(3000, TimeUnit.MILLISECONDS);
-		assertNotNull(errorHandler.lastError);
-		assertNotNull(errorHandler.lastError.getCause());
-		assertEquals("failed to process: test-A", errorHandler.lastError.getCause().getMessage());
+		assertThat(errorHandler.lastError).isNotNull();
+		assertThat(errorHandler.lastError.getCause()).isNotNull();
+		assertThat(errorHandler.lastError.getCause().getMessage()).isEqualTo("failed to process: test-A");
 		PollableChannel testErrorChannel = context.getBean("testErrorChannel", PollableChannel.class);
-		assertNull(testErrorChannel.receive(0));
+		assertThat(testErrorChannel.receive(0)).isNull();
 		context.close();
 	}
 
@@ -66,14 +64,14 @@ public class InboundOneWayErrorTests {
 		jmsTemplate.send(queue, (MessageCreator) session -> session.createTextMessage("test-B"));
 		PollableChannel errorChannel = context.getBean("testErrorChannel", PollableChannel.class);
 		Message<?> errorMessage = errorChannel.receive(3000);
-		assertNotNull(errorMessage);
-		assertEquals(MessageHandlingException.class, errorMessage.getPayload().getClass());
+		assertThat(errorMessage).isNotNull();
+		assertThat(errorMessage.getPayload().getClass()).isEqualTo(MessageHandlingException.class);
 		MessageHandlingException exception = (MessageHandlingException) errorMessage.getPayload();
-		assertNotNull(exception.getCause());
-		assertEquals(TestException.class, exception.getCause().getClass());
-		assertEquals("failed to process: test-B", exception.getCause().getMessage());
+		assertThat(exception.getCause()).isNotNull();
+		assertThat(exception.getCause().getClass()).isEqualTo(TestException.class);
+		assertThat(exception.getCause().getMessage()).isEqualTo("failed to process: test-B");
 		TestErrorHandler errorHandler = context.getBean("testErrorHandler", TestErrorHandler.class);
-		assertNull(errorHandler.lastError);
+		assertThat(errorHandler.lastError).isNull();
 		context.close();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -57,7 +57,7 @@ public class JmsChannelHistoryTests {
 			@SuppressWarnings("unchecked")
 			Message<String> msg = invocation.getArgument(0);
 			MessageHistory history = MessageHistory.read(msg);
-			assertTrue(history.get(0).contains("jmsChannel"));
+			assertThat(history.get(0).contains("jmsChannel")).isTrue();
 			return null;
 		}).when(template).convertAndSend(Mockito.any(Message.class));
 		channel.send(message);
@@ -75,7 +75,7 @@ public class JmsChannelHistoryTests {
 		channel.send(new GenericMessage<String>("hello"));
 		Message<?> resultMessage = resultChannel.receive(10000);
 		MessageHistory history = MessageHistory.read(resultMessage);
-		assertTrue(history.get(0).contains("jmsChannel"));
+		assertThat(history.get(0).contains("jmsChannel")).isTrue();
 		ac.close();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
 
@@ -123,153 +121,162 @@ public class JmsChannelParserTests {
 
 	@Test
 	public void queueReferenceChannel() {
-		assertEquals(SubscribableJmsChannel.class, queueReferenceChannel.getClass());
+		assertThat(queueReferenceChannel.getClass()).isEqualTo(SubscribableJmsChannel.class);
 		SubscribableJmsChannel channel = (SubscribableJmsChannel) queueReferenceChannel;
 		DirectFieldAccessor accessor = new DirectFieldAccessor(channel);
 		JmsTemplate jmsTemplate = (JmsTemplate) accessor.getPropertyValue("jmsTemplate");
 		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer) accessor.getPropertyValue("container");
-		assertEquals(queue, jmsTemplate.getDefaultDestination());
-		assertEquals(queue, container.getDestination());
-		assertEquals(true, TestUtils.getPropertyValue(jmsTemplate, "explicitQosEnabled"));
-		assertEquals(DeliveryMode.PERSISTENT, TestUtils.getPropertyValue(jmsTemplate, "deliveryMode"));
-		assertEquals(123L, TestUtils.getPropertyValue(jmsTemplate, "timeToLive"));
-		assertEquals(12, TestUtils.getPropertyValue(jmsTemplate, "priority"));
-		assertEquals(Integer.MAX_VALUE, TestUtils.getPropertyValue(
-				TestUtils.getPropertyValue(channel, "dispatcher"), "maxSubscribers", Integer.class).intValue());
+		assertThat(jmsTemplate.getDefaultDestination()).isEqualTo(queue);
+		assertThat(container.getDestination()).isEqualTo(queue);
+		assertThat(TestUtils.getPropertyValue(jmsTemplate, "explicitQosEnabled")).isEqualTo(true);
+		assertThat(TestUtils.getPropertyValue(jmsTemplate, "deliveryMode")).isEqualTo(DeliveryMode.PERSISTENT);
+		assertThat(TestUtils.getPropertyValue(jmsTemplate, "timeToLive")).isEqualTo(123L);
+		assertThat(TestUtils.getPropertyValue(jmsTemplate, "priority")).isEqualTo(12);
+		assertThat(TestUtils.getPropertyValue(
+				TestUtils.getPropertyValue(channel, "dispatcher"), "maxSubscribers", Integer.class).intValue())
+				.isEqualTo(Integer.MAX_VALUE);
 	}
 
 	@Test
 	public void queueNameChannel() {
-		assertEquals(SubscribableJmsChannel.class, queueNameChannel.getClass());
+		assertThat(queueNameChannel.getClass()).isEqualTo(SubscribableJmsChannel.class);
 		SubscribableJmsChannel channel = (SubscribableJmsChannel) queueNameChannel;
 		DirectFieldAccessor accessor = new DirectFieldAccessor(channel);
 		JmsTemplate jmsTemplate = (JmsTemplate) accessor.getPropertyValue("jmsTemplate");
-		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer) accessor.getPropertyValue("container");
-		assertEquals("test.queue", jmsTemplate.getDefaultDestinationName());
-		assertEquals("test.queue", container.getDestinationName());
-		assertEquals(1, TestUtils.getPropertyValue(
-				TestUtils.getPropertyValue(channel, "dispatcher"), "maxSubscribers", Integer.class).intValue());
+		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer) accessor.getPropertyValue(
+				"container");
+		assertThat(jmsTemplate.getDefaultDestinationName()).isEqualTo("test.queue");
+		assertThat(container.getDestinationName()).isEqualTo("test.queue");
+		assertThat(TestUtils.getPropertyValue(
+				TestUtils.getPropertyValue(channel, "dispatcher"), "maxSubscribers", Integer.class).intValue())
+				.isEqualTo(1);
 	}
 
 	@Test
 	public void queueNameWithResolverChannel() {
-		assertEquals(SubscribableJmsChannel.class, queueNameWithResolverChannel.getClass());
+		assertThat(queueNameWithResolverChannel.getClass()).isEqualTo(SubscribableJmsChannel.class);
 		SubscribableJmsChannel channel = (SubscribableJmsChannel) queueNameWithResolverChannel;
 		DirectFieldAccessor accessor = new DirectFieldAccessor(channel);
 		JmsTemplate jmsTemplate = (JmsTemplate) accessor.getPropertyValue("jmsTemplate");
-		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer) accessor.getPropertyValue("container");
-		assertEquals("foo", jmsTemplate.getDefaultDestinationName());
-		assertEquals("foo", container.getDestinationName());
+		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer) accessor.getPropertyValue(
+				"container");
+		assertThat(jmsTemplate.getDefaultDestinationName()).isEqualTo("foo");
+		assertThat(container.getDestinationName()).isEqualTo("foo");
 	}
 
 	@Test
 	public void topicReferenceChannel() {
-		assertEquals(SubscribableJmsChannel.class, topicReferenceChannel.getClass());
+		assertThat(topicReferenceChannel.getClass()).isEqualTo(SubscribableJmsChannel.class);
 		SubscribableJmsChannel channel = (SubscribableJmsChannel) topicReferenceChannel;
 		DirectFieldAccessor accessor = new DirectFieldAccessor(channel);
 		JmsTemplate jmsTemplate = (JmsTemplate) accessor.getPropertyValue("jmsTemplate");
-		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer) accessor.getPropertyValue("container");
-		assertEquals(topic, jmsTemplate.getDefaultDestination());
-		assertEquals(topic, container.getDestination());
-		assertSame(this.messageBuilderFactory,
-				TestUtils.getPropertyValue(channel, "container.messageListener.messageBuilderFactory"));
+		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer) accessor.getPropertyValue(
+				"container");
+		assertThat(jmsTemplate.getDefaultDestination()).isEqualTo(topic);
+		assertThat(container.getDestination()).isEqualTo(topic);
+		assertThat(TestUtils.getPropertyValue(channel, "container.messageListener.messageBuilderFactory"))
+				.isSameAs(this.messageBuilderFactory);
 	}
 
 
 	@Test
 	public void topicNameChannel() {
-		assertEquals(SubscribableJmsChannel.class, topicNameChannel.getClass());
+		assertThat(topicNameChannel.getClass()).isEqualTo(SubscribableJmsChannel.class);
 		SubscribableJmsChannel channel = (SubscribableJmsChannel) topicNameChannel;
 		DirectFieldAccessor accessor = new DirectFieldAccessor(channel);
 		JmsTemplate jmsTemplate = (JmsTemplate) accessor.getPropertyValue("jmsTemplate");
-		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer) accessor.getPropertyValue("container");
-		assertEquals("test.topic", jmsTemplate.getDefaultDestinationName());
-		assertEquals("test.topic", container.getDestinationName());
-		assertTrue(container.isSubscriptionShared());
-		assertTrue(container.isSubscriptionDurable());
-		assertEquals("subName", container.getSubscriptionName());
+		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer) accessor.getPropertyValue(
+				"container");
+		assertThat(jmsTemplate.getDefaultDestinationName()).isEqualTo("test.topic");
+		assertThat(container.getDestinationName()).isEqualTo("test.topic");
+		assertThat(container.isSubscriptionShared()).isTrue();
+		assertThat(container.isSubscriptionDurable()).isTrue();
+		assertThat(container.getSubscriptionName()).isEqualTo("subName");
 	}
 
 	@Test
 	public void topicNameWithResolverChannel() {
-		assertEquals(SubscribableJmsChannel.class, topicNameWithResolverChannel.getClass());
+		assertThat(topicNameWithResolverChannel.getClass()).isEqualTo(SubscribableJmsChannel.class);
 		SubscribableJmsChannel channel = (SubscribableJmsChannel) topicNameWithResolverChannel;
 		DirectFieldAccessor accessor = new DirectFieldAccessor(channel);
 		JmsTemplate jmsTemplate = (JmsTemplate) accessor.getPropertyValue("jmsTemplate");
-		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer) accessor.getPropertyValue("container");
-		assertEquals("foo", jmsTemplate.getDefaultDestinationName());
-		assertEquals("foo", container.getDestinationName());
+		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer) accessor.getPropertyValue(
+				"container");
+		assertThat(jmsTemplate.getDefaultDestinationName()).isEqualTo("foo");
+		assertThat(container.getDestinationName()).isEqualTo("foo");
 	}
 
 	@Test
 	public void channelWithConcurrencySettings() {
-		assertEquals(SubscribableJmsChannel.class, channelWithConcurrencySettings.getClass());
+		assertThat(channelWithConcurrencySettings.getClass()).isEqualTo(SubscribableJmsChannel.class);
 		SubscribableJmsChannel channel = (SubscribableJmsChannel) channelWithConcurrencySettings;
 		DirectFieldAccessor accessor = new DirectFieldAccessor(channel);
-		DefaultMessageListenerContainer container = (DefaultMessageListenerContainer) accessor.getPropertyValue("container");
-		assertEquals(11, container.getConcurrentConsumers());
-		assertEquals(55, container.getMaxConcurrentConsumers());
+		DefaultMessageListenerContainer container = (DefaultMessageListenerContainer) accessor.getPropertyValue(
+				"container");
+		assertThat(container.getConcurrentConsumers()).isEqualTo(11);
+		assertThat(container.getMaxConcurrentConsumers()).isEqualTo(55);
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
 	public void queueChannelWithInterceptors() {
-		assertEquals(SubscribableJmsChannel.class, queueChannelWithInterceptors.getClass());
+		assertThat(queueChannelWithInterceptors.getClass()).isEqualTo(SubscribableJmsChannel.class);
 		SubscribableJmsChannel channel = (SubscribableJmsChannel) queueChannelWithInterceptors;
 		DirectFieldAccessor accessor = new DirectFieldAccessor(channel);
 		List<ChannelInterceptor> interceptors = (List<ChannelInterceptor>) new DirectFieldAccessor(
 				accessor.getPropertyValue("interceptors")).getPropertyValue("interceptors");
-		assertEquals(1, interceptors.size());
-		assertEquals(TestInterceptor.class, interceptors.get(0).getClass());
+		assertThat(interceptors.size()).isEqualTo(1);
+		assertThat(interceptors.get(0).getClass()).isEqualTo(TestInterceptor.class);
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
 	public void topicChannelWithInterceptors() {
-		assertEquals(SubscribableJmsChannel.class, topicChannelWithInterceptors.getClass());
+		assertThat(topicChannelWithInterceptors.getClass()).isEqualTo(SubscribableJmsChannel.class);
 		SubscribableJmsChannel channel = (SubscribableJmsChannel) topicChannelWithInterceptors;
 		DirectFieldAccessor accessor = new DirectFieldAccessor(channel);
 		List<ChannelInterceptor> interceptors = (List<ChannelInterceptor>) new DirectFieldAccessor(
 				accessor.getPropertyValue("interceptors")).getPropertyValue("interceptors");
-		assertEquals(2, interceptors.size());
-		assertEquals(TestInterceptor.class, interceptors.get(0).getClass());
-		assertEquals(TestInterceptor.class, interceptors.get(1).getClass());
+		assertThat(interceptors.size()).isEqualTo(2);
+		assertThat(interceptors.get(0).getClass()).isEqualTo(TestInterceptor.class);
+		assertThat(interceptors.get(1).getClass()).isEqualTo(TestInterceptor.class);
 	}
 
 	@Test
 	public void queueReferencePollableChannel() {
-		assertEquals(PollableJmsChannel.class, pollableQueueReferenceChannel.getClass());
+		assertThat(pollableQueueReferenceChannel.getClass()).isEqualTo(PollableJmsChannel.class);
 		PollableJmsChannel channel = (PollableJmsChannel) pollableQueueReferenceChannel;
 		DirectFieldAccessor accessor = new DirectFieldAccessor(channel);
 		JmsTemplate jmsTemplate = (JmsTemplate) accessor.getPropertyValue("jmsTemplate");
-		assertEquals(queue, jmsTemplate.getDefaultDestination());
+		assertThat(jmsTemplate.getDefaultDestination()).isEqualTo(queue);
 	}
 
 	@Test
 	public void queueNamePollableChannel() {
-		assertEquals(PollableJmsChannel.class, pollableQueueNameChannel.getClass());
+		assertThat(pollableQueueNameChannel.getClass()).isEqualTo(PollableJmsChannel.class);
 		PollableJmsChannel channel = (PollableJmsChannel) pollableQueueNameChannel;
 		DirectFieldAccessor accessor = new DirectFieldAccessor(channel);
 		JmsTemplate jmsTemplate = (JmsTemplate) accessor.getPropertyValue("jmsTemplate");
-		assertEquals("foo", jmsTemplate.getDefaultDestinationName());
+		assertThat(jmsTemplate.getDefaultDestinationName()).isEqualTo("foo");
 	}
 
 	@Test
 	public void selectorPollableChannel() {
-		assertEquals(PollableJmsChannel.class, pollableWithSelectorChannel.getClass());
+		assertThat(pollableWithSelectorChannel.getClass()).isEqualTo(PollableJmsChannel.class);
 		PollableJmsChannel channel = (PollableJmsChannel) pollableWithSelectorChannel;
 		DirectFieldAccessor accessor = new DirectFieldAccessor(channel);
 		JmsTemplate jmsTemplate = (JmsTemplate) accessor.getPropertyValue("jmsTemplate");
-		assertEquals(queue, jmsTemplate.getDefaultDestination());
-		assertEquals("foo='bar'", accessor.getPropertyValue("messageSelector"));
+		assertThat(jmsTemplate.getDefaultDestination()).isEqualTo(queue);
+		assertThat(accessor.getPropertyValue("messageSelector")).isEqualTo("foo='bar'");
 	}
 
 	@Test
 	public void withPlaceholders() {
-		DefaultMessageListenerContainer container = TestUtils.getPropertyValue(withPlaceholders, "container", DefaultMessageListenerContainer.class);
-		assertEquals("queue://test.queue", container.getDestination().toString());
-		assertEquals(5, container.getConcurrentConsumers());
-		assertEquals(25, container.getMaxConcurrentConsumers());
+		DefaultMessageListenerContainer container = TestUtils.getPropertyValue(withPlaceholders, "container",
+				DefaultMessageListenerContainer.class);
+		assertThat(container.getDestination().toString()).isEqualTo("queue://test.queue");
+		assertThat(container.getConcurrentConsumers()).isEqualTo(5);
+		assertThat(container.getMaxConcurrentConsumers()).isEqualTo(25);
 	}
 
 	@Test
@@ -277,7 +284,7 @@ public class JmsChannelParserTests {
 		DefaultMessageListenerContainer container = TestUtils.getPropertyValue(
 				withDefaultContainer, "container",
 				DefaultMessageListenerContainer.class);
-		assertEquals("default.container.queue", container.getDestinationName());
+		assertThat(container.getDestinationName()).isEqualTo("default.container.queue");
 	}
 
 	@Test
@@ -285,7 +292,7 @@ public class JmsChannelParserTests {
 		DefaultMessageListenerContainer container = TestUtils.getPropertyValue(
 				withExplicitDefaultContainer, "container",
 				DefaultMessageListenerContainer.class);
-		assertEquals("explicit.default.container.queue", container.getDestinationName());
+		assertThat(container.getDestinationName()).isEqualTo("explicit.default.container.queue");
 	}
 
 	@Test
@@ -293,7 +300,7 @@ public class JmsChannelParserTests {
 		SimpleMessageListenerContainer container = TestUtils.getPropertyValue(
 				withSimpleContainer, "container",
 				SimpleMessageListenerContainer.class);
-		assertEquals("simple.container.queue", container.getDestinationName());
+		assertThat(container.getDestinationName()).isEqualTo("simple.container.queue");
 	}
 
 	@Test
@@ -301,7 +308,7 @@ public class JmsChannelParserTests {
 		CustomTestMessageListenerContainer container = TestUtils.getPropertyValue(
 				withContainerClass, "container",
 				CustomTestMessageListenerContainer.class);
-		assertEquals("custom.container.queue", container.getDestinationName());
+		assertThat(container.getDestinationName()).isEqualTo("custom.container.queue");
 	}
 
 	@Test
@@ -309,7 +316,7 @@ public class JmsChannelParserTests {
 		CustomTestMessageListenerContainer container = TestUtils.getPropertyValue(
 				withContainerClassSpEL, "container",
 				CustomTestMessageListenerContainer.class);
-		assertEquals("custom.container.queue", container.getDestinationName());
+		assertThat(container.getDestinationName()).isEqualTo("custom.container.queue");
 	}
 
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import javax.jms.TextMessage;
 
@@ -70,14 +69,14 @@ public class JmsDynamicDestinationTests {
 		channelAdapterChannel.send(message2);
 		Message<?> result1 = channelAdapterResults1.receive(5000);
 		Message<?> result2 = channelAdapterResults2.receive(5000);
-		assertNotNull(result1);
-		assertNotNull(result2);
+		assertThat(result1).isNotNull();
+		assertThat(result2).isNotNull();
 		TextMessage jmsResult1 = (TextMessage) result1.getPayload();
 		TextMessage jmsResult2 = (TextMessage) result2.getPayload();
-		assertEquals("test-1", jmsResult1.getText());
-		assertEquals("queue://queue.test.dynamic.adapter.1", jmsResult1.getJMSDestination().toString());
-		assertEquals("test-2", jmsResult2.getText());
-		assertEquals("queue://queue.test.dynamic.adapter.2", jmsResult2.getJMSDestination().toString());
+		assertThat(jmsResult1.getText()).isEqualTo("test-1");
+		assertThat(jmsResult1.getJMSDestination().toString()).isEqualTo("queue://queue.test.dynamic.adapter.1");
+		assertThat(jmsResult2.getText()).isEqualTo("test-2");
+		assertThat(jmsResult2.getJMSDestination().toString()).isEqualTo("queue://queue.test.dynamic.adapter.2");
 	}
 
 	@Test
@@ -87,10 +86,10 @@ public class JmsDynamicDestinationTests {
 		MessagingTemplate template = new MessagingTemplate();
 		Message<?> result1 = template.sendAndReceive(gatewayChannel, message1);
 		Message<?> result2 = template.sendAndReceive(gatewayChannel, message2);
-		assertNotNull(result1);
-		assertNotNull(result2);
-		assertEquals("test-1!", result1.getPayload());
-		assertEquals("test-2!!", result2.getPayload());
+		assertThat(result1).isNotNull();
+		assertThat(result2).isNotNull();
+		assertThat(result1.getPayload()).isEqualTo("test-1!");
+		assertThat(result2.getPayload()).isEqualTo("test-2!!");
 	}
 
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsHeaderEnricherTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import javax.jms.Destination;
 
@@ -62,33 +62,33 @@ public class JmsHeaderEnricherTests {
 	public void verifyReplyToValue() throws Exception {
 		this.valueTestInput.send(new GenericMessage<>("test"));
 		Message<?> result = output.receive(10_000);
-		assertEquals(this.testDestination, result.getHeaders().get(JmsHeaders.REPLY_TO));
+		assertThat(result.getHeaders().get(JmsHeaders.REPLY_TO)).isEqualTo(this.testDestination);
 		StubTextMessage jmsMessage = new StubTextMessage();
 		DefaultJmsHeaderMapper headerMapper = new DefaultJmsHeaderMapper();
 		headerMapper.fromHeaders(result.getHeaders(), jmsMessage);
-		assertEquals(this.testDestination, jmsMessage.getJMSReplyTo());
+		assertThat(jmsMessage.getJMSReplyTo()).isEqualTo(this.testDestination);
 	}
 
 	@Test
 	public void verifyCorrelationIdValue() throws Exception {
 		this.valueTestInput.send(new GenericMessage<>("test"));
 		Message<?> result = output.receive(10_000);
-		assertEquals("ABC", result.getHeaders().get(JmsHeaders.CORRELATION_ID));
+		assertThat(result.getHeaders().get(JmsHeaders.CORRELATION_ID)).isEqualTo("ABC");
 		StubTextMessage jmsMessage = new StubTextMessage();
 		DefaultJmsHeaderMapper headerMapper = new DefaultJmsHeaderMapper();
 		headerMapper.fromHeaders(result.getHeaders(), jmsMessage);
-		assertEquals("ABC", jmsMessage.getJMSCorrelationID());
+		assertThat(jmsMessage.getJMSCorrelationID()).isEqualTo("ABC");
 	}
 
 	@Test // see INT-1122 and INT-1123
 	public void verifyCorrelationIdExpression() throws Exception {
 		this.expressionTestInput.send(new GenericMessage<>("test"));
 		Message<?> result = output.receive(0);
-		assertEquals(123, result.getHeaders().get(JmsHeaders.CORRELATION_ID));
+		assertThat(result.getHeaders().get(JmsHeaders.CORRELATION_ID)).isEqualTo(123);
 		StubTextMessage jmsMessage = new StubTextMessage();
 		DefaultJmsHeaderMapper headerMapper = new DefaultJmsHeaderMapper();
 		headerMapper.fromHeaders(result.getHeaders(), jmsMessage);
-		assertEquals("123", jmsMessage.getJMSCorrelationID());
+		assertThat(jmsMessage.getJMSCorrelationID()).isEqualTo("123");
 	}
 
 }

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-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 java.util.Properties;
 
@@ -53,12 +50,12 @@ public class JmsInboundChannelAdapterParserTests {
 			PollableChannel output = (PollableChannel) context.getBean("output");
 			Message<?> message = output.receive(timeoutOnReceive);
 			MessageHistory history = MessageHistory.read(message);
-			assertNotNull(history);
+			assertThat(history).isNotNull();
 			Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "inboundAdapter", 0);
-			assertNotNull(componentHistoryRecord);
-			assertEquals("jms:inbound-channel-adapter", componentHistoryRecord.get("type"));
-			assertNotNull("message should not be null", message);
-			assertEquals("polling-test", message.getPayload());
+			assertThat(componentHistoryRecord).isNotNull();
+			assertThat(componentHistoryRecord.get("type")).isEqualTo("jms:inbound-channel-adapter");
+			assertThat(message).as("message should not be null").isNotNull();
+			assertThat(message.getPayload()).isEqualTo("polling-test");
 		}
 	}
 
@@ -70,7 +67,7 @@ public class JmsInboundChannelAdapterParserTests {
 			JmsTemplate jmsTemplate =
 					TestUtils.getPropertyValue(context.getBean("inboundAdapterWithoutJmsTemplate"),
 							"source.jmsTemplate", JmsTemplate.class);
-			assertTrue(jmsTemplate.isSessionTransacted());
+			assertThat(jmsTemplate.isSessionTransacted()).isTrue();
 		}
 	}
 
@@ -81,10 +78,10 @@ public class JmsInboundChannelAdapterParserTests {
 
 			PollableChannel output = (PollableChannel) context.getBean("output");
 			Message<?> message = output.receive(timeoutOnReceive);
-			assertNotNull("message should not be null", message);
-			assertEquals("polling-test", message.getPayload());
-			assertFalse(TestUtils.getPropertyValue(context.getBean("adapter"), "source.jmsTemplate", JmsTemplate.class)
-					.isSessionTransacted());
+			assertThat(message).as("message should not be null").isNotNull();
+			assertThat(message.getPayload()).isEqualTo("polling-test");
+			assertThat(TestUtils.getPropertyValue(context.getBean("adapter"), "source.jmsTemplate", JmsTemplate.class)
+					.isSessionTransacted()).isFalse();
 		}
 	}
 
@@ -95,13 +92,13 @@ public class JmsInboundChannelAdapterParserTests {
 
 			PollableChannel output = (PollableChannel) context.getBean("output");
 			Message<?> message = output.receive(this.timeoutOnReceive);
-			assertNotNull("message should not be null", message);
-			assertEquals("polling-test", message.getPayload());
+			assertThat(message).as("message should not be null").isNotNull();
+			assertThat(message.getPayload()).isEqualTo("polling-test");
 			JmsDestinationPollingSource jmsDestinationPollingSource = context
 					.getBean(JmsDestinationPollingSource.class);
 			JmsTemplate jmsTemplate =
 					TestUtils.getPropertyValue(jmsDestinationPollingSource, "jmsTemplate", JmsTemplate.class);
-			assertEquals(1000, jmsTemplate.getReceiveTimeout());
+			assertThat(jmsTemplate.getReceiveTimeout()).isEqualTo(1000);
 		}
 	}
 
@@ -117,7 +114,7 @@ public class JmsInboundChannelAdapterParserTests {
 		}
 		catch (BeanCreationException e) {
 			Throwable rootCause = e.getRootCause();
-			assertEquals(NoSuchBeanDefinitionException.class, rootCause.getClass());
+			assertThat(rootCause.getClass()).isEqualTo(NoSuchBeanDefinitionException.class);
 			throw e;
 		}
 	}
@@ -129,8 +126,8 @@ public class JmsInboundChannelAdapterParserTests {
 
 			PollableChannel output = (PollableChannel) context.getBean("output");
 			Message<?> message = output.receive(timeoutOnReceive);
-			assertNotNull("message should not be null", message);
-			assertEquals("polling-test", message.getPayload());
+			assertThat(message).as("message should not be null").isNotNull();
+			assertThat(message.getPayload()).isEqualTo("polling-test");
 		}
 	}
 
@@ -146,8 +143,8 @@ public class JmsInboundChannelAdapterParserTests {
 
 			PollableChannel output = (PollableChannel) context.getBean("output");
 			Message<?> message = output.receive(timeoutOnReceive);
-			assertNotNull("message should not be null", message);
-			assertEquals("polling-test", message.getPayload());
+			assertThat(message).as("message should not be null").isNotNull();
+			assertThat(message.getPayload()).isEqualTo("polling-test");
 		}
 	}
 
@@ -158,10 +155,10 @@ public class JmsInboundChannelAdapterParserTests {
 
 			PollableChannel output = (PollableChannel) context.getBean("output");
 			Message<?> message = output.receive(timeoutOnReceive);
-			assertNotNull("message should not be null", message);
-			assertEquals("polling-test", message.getPayload());
-			assertEquals("foo", message.getHeaders().get("testProperty"));
-			assertEquals(123, message.getHeaders().get("testAttribute"));
+			assertThat(message).as("message should not be null").isNotNull();
+			assertThat(message.getPayload()).isEqualTo("polling-test");
+			assertThat(message.getHeaders().get("testProperty")).isEqualTo("foo");
+			assertThat(message.getHeaders().get("testAttribute")).isEqualTo(123);
 		}
 	}
 
@@ -172,8 +169,8 @@ public class JmsInboundChannelAdapterParserTests {
 
 			PollableChannel output = (PollableChannel) context.getBean("output1");
 			Message<?> message = output.receive(timeoutOnReceive);
-			assertNotNull("message should not be null", message);
-			assertEquals("test [with selector: TestProperty = 'foo']", message.getPayload());
+			assertThat(message).as("message should not be null").isNotNull();
+			assertThat(message.getPayload()).isEqualTo("test [with selector: TestProperty = 'foo']");
 		}
 	}
 
@@ -184,7 +181,7 @@ public class JmsInboundChannelAdapterParserTests {
 
 			JmsTemplate jmsTemplate =
 					TestUtils.getPropertyValue(context.getBean("adapter"), "source.jmsTemplate", JmsTemplate.class);
-			assertEquals(99, jmsTemplate.getReceiveTimeout());
+			assertThat(jmsTemplate.getReceiveTimeout()).isEqualTo(99);
 		}
 	}
 
@@ -195,8 +192,8 @@ public class JmsInboundChannelAdapterParserTests {
 
 			PollableChannel output = (PollableChannel) context.getBean("output1");
 			Message<?> message = output.receive(timeoutOnReceive);
-			assertNotNull("message should not be null", message);
-			assertEquals("converted-test", message.getPayload());
+			assertThat(message).as("message should not be null").isNotNull();
+			assertThat(message.getPayload()).isEqualTo("converted-test");
 		}
 	}
 
@@ -207,8 +204,8 @@ public class JmsInboundChannelAdapterParserTests {
 
 			PollableChannel output = (PollableChannel) context.getBean("output2");
 			Message<?> message = output.receive(timeoutOnReceive);
-			assertNotNull("message should not be null", message);
-			assertEquals("converted-test", message.getPayload());
+			assertThat(message).as("message should not be null").isNotNull();
+			assertThat(message.getPayload()).isEqualTo("converted-test");
 		}
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-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 java.util.Properties;
 
@@ -61,16 +56,16 @@ public class JmsInboundGatewayParserTests {
 				"jmsGatewayWithConnectionFactoryAndDestination.xml", this.getClass());
 		PollableChannel channel = (PollableChannel) context.getBean("requestChannel");
 		JmsMessageDrivenEndpoint gateway = (JmsMessageDrivenEndpoint) context.getBean("jmsGateway");
-		assertEquals(JmsMessageDrivenEndpoint.class, gateway.getClass());
+		assertThat(gateway.getClass()).isEqualTo(JmsMessageDrivenEndpoint.class);
 		context.start();
 		Message<?> message = channel.receive(10000);
 		MessageHistory history = MessageHistory.read(message);
-		assertNotNull(history);
+		assertThat(history).isNotNull();
 		Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "jmsGateway", 0);
-		assertNotNull(componentHistoryRecord);
-		assertEquals("jms:inbound-gateway", componentHistoryRecord.get("type"));
-		assertNotNull("message should not be null", message);
-		assertEquals("message-driven-test", message.getPayload());
+		assertThat(componentHistoryRecord).isNotNull();
+		assertThat(componentHistoryRecord.get("type")).isEqualTo("jms:inbound-gateway");
+		assertThat(message).as("message should not be null").isNotNull();
+		assertThat(message.getPayload()).isEqualTo("message-driven-test");
 		context.close();
 	}
 
@@ -80,11 +75,11 @@ public class JmsInboundGatewayParserTests {
 				"jmsGatewayWithConnectionFactoryAndDestinationName.xml", this.getClass());
 		PollableChannel channel = (PollableChannel) context.getBean("requestChannel");
 		JmsMessageDrivenEndpoint gateway = (JmsMessageDrivenEndpoint) context.getBean("jmsGateway");
-		assertEquals(JmsMessageDrivenEndpoint.class, gateway.getClass());
+		assertThat(gateway.getClass()).isEqualTo(JmsMessageDrivenEndpoint.class);
 		context.start();
 		Message<?> message = channel.receive(10000);
-		assertNotNull("message should not be null", message);
-		assertEquals("message-driven-test", message.getPayload());
+		assertThat(message).as("message should not be null").isNotNull();
+		assertThat(message.getPayload()).isEqualTo("message-driven-test");
 		context.close();
 	}
 
@@ -94,11 +89,11 @@ public class JmsInboundGatewayParserTests {
 				"jmsGatewayWithMessageConverter.xml", this.getClass());
 		PollableChannel channel = (PollableChannel) context.getBean("requestChannel");
 		JmsMessageDrivenEndpoint gateway = (JmsMessageDrivenEndpoint) context.getBean("jmsGateway");
-		assertEquals(JmsMessageDrivenEndpoint.class, gateway.getClass());
+		assertThat(gateway.getClass()).isEqualTo(JmsMessageDrivenEndpoint.class);
 		context.start();
 		Message<?> message = channel.receive(10000);
-		assertNotNull("message should not be null", message);
-		assertEquals("converted-test-message", message.getPayload());
+		assertThat(message).as("message should not be null").isNotNull();
+		assertThat(message.getPayload()).isEqualTo("converted-test-message");
 		context.close();
 	}
 
@@ -110,27 +105,27 @@ public class JmsInboundGatewayParserTests {
 		JmsMessageDrivenEndpoint gateway = (JmsMessageDrivenEndpoint) context.getBean("defaultGateway");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
 		accessor = new DirectFieldAccessor(accessor.getPropertyValue("listener"));
-		assertEquals(Boolean.TRUE, accessor.getPropertyValue("extractReplyPayload"));
+		assertThat(accessor.getPropertyValue("extractReplyPayload")).isEqualTo(Boolean.TRUE);
 
 		gateway = (JmsMessageDrivenEndpoint) context.getBean("extractReplyPayloadTrue");
 		accessor = new DirectFieldAccessor(gateway);
 		accessor = new DirectFieldAccessor(accessor.getPropertyValue("listener"));
-		assertEquals(Boolean.TRUE, accessor.getPropertyValue("extractReplyPayload"));
+		assertThat(accessor.getPropertyValue("extractReplyPayload")).isEqualTo(Boolean.TRUE);
 
 		gateway = (JmsMessageDrivenEndpoint) context.getBean("extractReplyPayloadFalse");
 		accessor = new DirectFieldAccessor(gateway);
 		accessor = new DirectFieldAccessor(accessor.getPropertyValue("listener"));
-		assertEquals(Boolean.FALSE, accessor.getPropertyValue("extractReplyPayload"));
+		assertThat(accessor.getPropertyValue("extractReplyPayload")).isEqualTo(Boolean.FALSE);
 
 		gateway = (JmsMessageDrivenEndpoint) context.getBean("extractRequestPayloadTrue");
 		accessor = new DirectFieldAccessor(gateway);
 		accessor = new DirectFieldAccessor(accessor.getPropertyValue("listener"));
-		assertEquals(Boolean.TRUE, accessor.getPropertyValue("extractRequestPayload"));
+		assertThat(accessor.getPropertyValue("extractRequestPayload")).isEqualTo(Boolean.TRUE);
 
 		gateway = (JmsMessageDrivenEndpoint) context.getBean("extractRequestPayloadFalse");
 		accessor = new DirectFieldAccessor(gateway);
 		accessor = new DirectFieldAccessor(accessor.getPropertyValue("listener"));
-		assertEquals(Boolean.FALSE, accessor.getPropertyValue("extractRequestPayload"));
+		assertThat(accessor.getPropertyValue("extractRequestPayload")).isEqualTo(Boolean.FALSE);
 		context.close();
 	}
 
@@ -140,8 +135,8 @@ public class JmsInboundGatewayParserTests {
 			new ClassPathXmlApplicationContext("jmsGatewayWithConnectionFactoryOnly.xml", this.getClass()).close();
 		}
 		catch (BeanDefinitionStoreException e) {
-			assertTrue(e.getMessage().contains("request-destination"));
-			assertTrue(e.getMessage().contains("request-destination-name"));
+			assertThat(e.getMessage().contains("request-destination")).isTrue();
+			assertThat(e.getMessage().contains("request-destination-name")).isTrue();
 			throw e;
 		}
 	}
@@ -152,7 +147,7 @@ public class JmsInboundGatewayParserTests {
 			new ClassPathXmlApplicationContext("jmsGatewayWithEmptyConnectionFactory.xml", this.getClass()).close();
 		}
 		catch (BeanDefinitionStoreException e) {
-			assertTrue(e.getMessage().contains("connection-factory"));
+			assertThat(e.getMessage().contains("connection-factory")).isTrue();
 			throw e;
 		}
 	}
@@ -163,11 +158,11 @@ public class JmsInboundGatewayParserTests {
 				"jmsGatewayWithDefaultConnectionFactory.xml", this.getClass());
 		PollableChannel channel = (PollableChannel) context.getBean("requestChannel");
 		JmsMessageDrivenEndpoint gateway = (JmsMessageDrivenEndpoint) context.getBean("jmsGateway");
-		assertEquals(JmsMessageDrivenEndpoint.class, gateway.getClass());
+		assertThat(gateway.getClass()).isEqualTo(JmsMessageDrivenEndpoint.class);
 		context.start();
 		Message<?> message = channel.receive(10000);
-		assertNotNull("message should not be null", message);
-		assertEquals("message-driven-test", message.getPayload());
+		assertThat(message).as("message should not be null").isNotNull();
+		assertThat(message.getPayload()).isEqualTo("message-driven-test");
 		context.close();
 	}
 
@@ -178,15 +173,16 @@ public class JmsInboundGatewayParserTests {
 		JmsMessageDrivenEndpoint gateway = (JmsMessageDrivenEndpoint) context.getBean("gatewayWithoutTransactionManager");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
 		accessor = new DirectFieldAccessor(accessor.getPropertyValue("listenerContainer"));
-		assertNull(accessor.getPropertyValue("transactionManager"));
+		assertThat(accessor.getPropertyValue("transactionManager")).isNull();
 
 		gateway = (JmsMessageDrivenEndpoint) context.getBean("gatewayWithTransactionManager");
 		accessor = new DirectFieldAccessor(gateway);
 		accessor = new DirectFieldAccessor(accessor.getPropertyValue("listenerContainer"));
 		Object txManager = accessor.getPropertyValue("transactionManager");
-		assertEquals(JmsTransactionManager.class, txManager.getClass());
-		assertEquals(context.getBean("txManager"), txManager);
-		assertEquals(context.getBean("testConnectionFactory"), ((JmsTransactionManager) txManager).getConnectionFactory());
+		assertThat(txManager.getClass()).isEqualTo(JmsTransactionManager.class);
+		assertThat(txManager).isEqualTo(context.getBean("txManager"));
+		assertThat(((JmsTransactionManager) txManager).getConnectionFactory())
+				.isEqualTo(context.getBean("testConnectionFactory"));
 		context.close();
 	}
 
@@ -198,22 +194,22 @@ public class JmsInboundGatewayParserTests {
 		JmsMessageDrivenEndpoint gateway = (JmsMessageDrivenEndpoint) context.getBean("gatewayWithConcurrentConsumers");
 		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer)
 				new DirectFieldAccessor(gateway).getPropertyValue("listenerContainer");
-		assertEquals(3, new DirectFieldAccessor(container).getPropertyValue("concurrentConsumers"));
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("concurrentConsumers")).isEqualTo(3);
 
 		gateway = (JmsMessageDrivenEndpoint) context.getBean("gatewayWithMaxConcurrentConsumers");
 		container = (AbstractMessageListenerContainer)
 				new DirectFieldAccessor(gateway).getPropertyValue("listenerContainer");
-		assertEquals(22, new DirectFieldAccessor(container).getPropertyValue("maxConcurrentConsumers"));
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("maxConcurrentConsumers")).isEqualTo(22);
 
 		gateway = (JmsMessageDrivenEndpoint) context.getBean("gatewayWithMaxMessagesPerTask");
 		container = (AbstractMessageListenerContainer)
 				new DirectFieldAccessor(gateway).getPropertyValue("listenerContainer");
-		assertEquals(99, new DirectFieldAccessor(container).getPropertyValue("maxMessagesPerTask"));
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("maxMessagesPerTask")).isEqualTo(99);
 
 		gateway = (JmsMessageDrivenEndpoint) context.getBean("gatewayWithReceiveTimeout");
 		container = (AbstractMessageListenerContainer)
 				new DirectFieldAccessor(gateway).getPropertyValue("listenerContainer");
-		assertEquals(1111L, new DirectFieldAccessor(container).getPropertyValue("receiveTimeout"));
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("receiveTimeout")).isEqualTo(1111L);
 
 		gateway = (JmsMessageDrivenEndpoint) context.getBean("gatewayWithRecoveryInterval");
 		container = (AbstractMessageListenerContainer)
@@ -225,23 +221,23 @@ public class JmsInboundGatewayParserTests {
 		catch (NotReadablePropertyException e) {
 			recoveryInterval = TestUtils.getPropertyValue(container, "backOff.interval");
 		}
-		assertEquals(2222L, recoveryInterval);
+		assertThat(recoveryInterval).isEqualTo(2222L);
 
 		gateway = (JmsMessageDrivenEndpoint) context.getBean("gatewayWithIdleTaskExecutionLimit");
 		container = (AbstractMessageListenerContainer)
 				new DirectFieldAccessor(gateway).getPropertyValue("listenerContainer");
-		assertEquals(7, new DirectFieldAccessor(container).getPropertyValue("idleTaskExecutionLimit"));
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("idleTaskExecutionLimit")).isEqualTo(7);
 
 		gateway = (JmsMessageDrivenEndpoint) context.getBean("gatewayWithIdleConsumerLimit");
 		container = (AbstractMessageListenerContainer)
 				new DirectFieldAccessor(gateway).getPropertyValue("listenerContainer");
-		assertEquals(33, new DirectFieldAccessor(container).getPropertyValue("idleConsumerLimit"));
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("idleConsumerLimit")).isEqualTo(33);
 
 		gateway = (JmsMessageDrivenEndpoint) context.getBean("gatewayWithMessageSelector");
 		container = (AbstractMessageListenerContainer)
 				new DirectFieldAccessor(gateway).getPropertyValue("listenerContainer");
 		String messageSelector = (String) new DirectFieldAccessor(container).getPropertyValue("messageSelector");
-		assertEquals("TestProperty = 'foo'", messageSelector);
+		assertThat(messageSelector).isEqualTo("TestProperty = 'foo'");
 
 		context.close();
 	}
@@ -254,20 +250,20 @@ public class JmsInboundGatewayParserTests {
 				context.getBean("gatewayWithContainerReference", JmsMessageDrivenEndpoint.class);
 		AbstractMessageListenerContainer messageListenerContainer = context.getBean("messageListenerContainer",
 				AbstractMessageListenerContainer.class);
-		assertFalse(gateway.isRunning());
-		assertFalse(messageListenerContainer.isRunning());
+		assertThat(gateway.isRunning()).isFalse();
+		assertThat(messageListenerContainer.isRunning()).isFalse();
 		SmartLifecycleRoleController roleController = context.getBean(SmartLifecycleRoleController.class);
 		@SuppressWarnings("unchecked")
 		MultiValueMap<String, SmartLifecycle> lifecycles =
 				TestUtils.getPropertyValue(roleController, "lifecycles", MultiValueMap.class);
-		assertTrue(lifecycles.containsKey("foo"));
-		assertSame(gateway, lifecycles.getFirst("foo"));
+		assertThat(lifecycles.containsKey("foo")).isTrue();
+		assertThat(lifecycles.getFirst("foo")).isSameAs(gateway);
 		gateway.start();
 		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer)
 				new DirectFieldAccessor(gateway).getPropertyValue("listenerContainer");
-		assertEquals(messageListenerContainer, container);
-		assertTrue(gateway.isRunning());
-		assertTrue(messageListenerContainer.isRunning());
+		assertThat(container).isEqualTo(messageListenerContainer);
+		assertThat(gateway.isRunning()).isTrue();
+		assertThat(messageListenerContainer.isRunning()).isTrue();
 		gateway.stop();
 		context.close();
 	}
@@ -279,10 +275,10 @@ public class JmsInboundGatewayParserTests {
 		JmsMessageDrivenEndpoint gateway = context.getBean("gatewayWithReplyQos", JmsMessageDrivenEndpoint.class);
 		DirectFieldAccessor accessor = new DirectFieldAccessor(
 				new DirectFieldAccessor(gateway).getPropertyValue("listener"));
-		assertEquals(12345L, accessor.getPropertyValue("replyTimeToLive"));
-		assertEquals(7, accessor.getPropertyValue("replyPriority"));
-		assertEquals(DeliveryMode.NON_PERSISTENT, accessor.getPropertyValue("replyDeliveryMode"));
-		assertEquals(true, accessor.getPropertyValue("explicitQosEnabledForReplies"));
+		assertThat(accessor.getPropertyValue("replyTimeToLive")).isEqualTo(12345L);
+		assertThat(accessor.getPropertyValue("replyPriority")).isEqualTo(7);
+		assertThat(accessor.getPropertyValue("replyDeliveryMode")).isEqualTo(DeliveryMode.NON_PERSISTENT);
+		assertThat(accessor.getPropertyValue("explicitQosEnabledForReplies")).isEqualTo(true);
 		context.close();
 	}
 
@@ -293,7 +289,7 @@ public class JmsInboundGatewayParserTests {
 		JmsMessageDrivenEndpoint gateway = context.getBean("gateway", JmsMessageDrivenEndpoint.class);
 		DirectFieldAccessor accessor = new DirectFieldAccessor(
 				new DirectFieldAccessor(gateway).getPropertyValue("listener"));
-		assertEquals(false, accessor.getPropertyValue("explicitQosEnabledForReplies"));
+		assertThat(accessor.getPropertyValue("explicitQosEnabledForReplies")).isEqualTo(false);
 		context.close();
 	}
 
@@ -304,7 +300,7 @@ public class JmsInboundGatewayParserTests {
 		JmsMessageDrivenEndpoint endpoint = context.getBean("gateway", JmsMessageDrivenEndpoint.class);
 		JmsDestinationAccessor container =
 				(JmsDestinationAccessor) new DirectFieldAccessor(endpoint).getPropertyValue("listenerContainer");
-		assertEquals(Boolean.TRUE, container.isPubSubDomain());
+		assertThat(container.isPubSubDomain()).isEqualTo(Boolean.TRUE);
 		context.close();
 	}
 
@@ -316,11 +312,11 @@ public class JmsInboundGatewayParserTests {
 		DefaultMessageListenerContainer container =
 				(DefaultMessageListenerContainer) new DirectFieldAccessor(endpoint)
 						.getPropertyValue("listenerContainer");
-		assertEquals(Boolean.TRUE, container.isPubSubDomain());
-		assertEquals(Boolean.TRUE, container.isSubscriptionDurable());
-		assertEquals("testDurableSubscriptionName", container.getDurableSubscriptionName());
-		assertEquals("testClientId", container.getClientId());
-		assertTrue(container.isSubscriptionShared());
+		assertThat(container.isPubSubDomain()).isEqualTo(Boolean.TRUE);
+		assertThat(container.isSubscriptionDurable()).isEqualTo(Boolean.TRUE);
+		assertThat(container.getDurableSubscriptionName()).isEqualTo("testDurableSubscriptionName");
+		assertThat(container.getClientId()).isEqualTo("testClientId");
+		assertThat(container.isSubscriptionShared()).isTrue();
 		context.close();
 	}
 
@@ -333,9 +329,9 @@ public class JmsInboundGatewayParserTests {
 
 		JmsMessageDrivenEndpoint gateway = (JmsMessageDrivenEndpoint) context.getBean("gateway");
 		Object replyChannel = TestUtils.getPropertyValue(gateway, "listener.gatewayDelegate.replyChannel");
-		assertEquals(context.getBean("replies"), replyChannel);
+		assertThat(replyChannel).isEqualTo(context.getBean("replies"));
 
-		assertNotNull(template.receive("testReplyDestination"));
+		assertThat(template.receive("testReplyDestination")).isNotNull();
 
 		context.close();
 	}

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-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 java.util.Properties;
 
@@ -55,13 +50,13 @@ public class JmsMessageDrivenChannelAdapterParserTests {
 		PollableChannel output = (PollableChannel) context.getBean("output2");
 		Message<?> message = output.receive(timeoutOnReceive);
 		MessageHistory history = MessageHistory.read(message);
-		assertNotNull(history);
+		assertThat(history).isNotNull();
 		Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "messageDrivenAdapter", 0);
-		assertNotNull(componentHistoryRecord);
+		assertThat(componentHistoryRecord).isNotNull();
 		JmsMessageDrivenEndpoint endpoint =  context.getBean("messageDrivenAdapter", JmsMessageDrivenEndpoint.class);
-		assertEquals("jms:message-driven-channel-adapter", componentHistoryRecord.get("type"));
-		assertNotNull("message should not be null", message);
-		assertEquals("test [with selector: TestProperty = 'foo']", message.getPayload());
+		assertThat(componentHistoryRecord.get("type")).isEqualTo("jms:message-driven-channel-adapter");
+		assertThat(message).as("message should not be null").isNotNull();
+		assertThat(message.getPayload()).isEqualTo("test [with selector: TestProperty = 'foo']");
 		endpoint.stop();
 		context.close();
 	}
@@ -72,9 +67,9 @@ public class JmsMessageDrivenChannelAdapterParserTests {
 				"jmsInboundWithPubSubDomain.xml", this.getClass());
 		JmsMessageDrivenEndpoint endpoint = context.getBean("messageDrivenAdapter", JmsMessageDrivenEndpoint.class);
 		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer) new DirectFieldAccessor(endpoint).getPropertyValue("listenerContainer");
-		assertEquals(Boolean.TRUE, container.isPubSubDomain());
-		assertFalse(container.isSubscriptionDurable()); // INT-3680
-		assertNull(container.getDurableSubscriptionName());
+		assertThat(container.isPubSubDomain()).isEqualTo(Boolean.TRUE);
+		assertThat(container.isSubscriptionDurable()).isFalse(); // INT-3680
+		assertThat(container.getDurableSubscriptionName()).isNull();
 		endpoint.stop();
 		context.close();
 	}
@@ -85,11 +80,11 @@ public class JmsMessageDrivenChannelAdapterParserTests {
 				"jmsInboundWithDurableSubscription.xml", this.getClass());
 		JmsMessageDrivenEndpoint endpoint = context.getBean("messageDrivenAdapter", JmsMessageDrivenEndpoint.class);
 		DefaultMessageListenerContainer container = (DefaultMessageListenerContainer) new DirectFieldAccessor(endpoint).getPropertyValue("listenerContainer");
-		assertEquals(Boolean.TRUE, container.isPubSubDomain());
-		assertEquals(Boolean.TRUE, container.isSubscriptionDurable());
-		assertEquals("testDurableSubscriptionName", container.getDurableSubscriptionName());
-		assertEquals("testClientId", container.getClientId());
-		assertTrue(container.isSubscriptionShared());
+		assertThat(container.isPubSubDomain()).isEqualTo(Boolean.TRUE);
+		assertThat(container.isSubscriptionDurable()).isEqualTo(Boolean.TRUE);
+		assertThat(container.getDurableSubscriptionName()).isEqualTo("testDurableSubscriptionName");
+		assertThat(container.getClientId()).isEqualTo("testClientId");
+		assertThat(container.isSubscriptionShared()).isTrue();
 		endpoint.stop();
 		context.close();
 	}
@@ -101,7 +96,7 @@ public class JmsMessageDrivenChannelAdapterParserTests {
 		JmsMessageDrivenEndpoint endpoint = context.getBean("messageDrivenAdapter.adapter", JmsMessageDrivenEndpoint.class);
 		DefaultMessageListenerContainer container = TestUtils.getPropertyValue(endpoint, "listenerContainer",
 				DefaultMessageListenerContainer.class);
-		assertSame(context.getBean("exec"), TestUtils.getPropertyValue(container, "taskExecutor"));
+		assertThat(TestUtils.getPropertyValue(container, "taskExecutor")).isSameAs(context.getBean("exec"));
 		endpoint.stop();
 		context.close();
 	}
@@ -114,7 +109,7 @@ public class JmsMessageDrivenChannelAdapterParserTests {
 		adapter.start();
 		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer)
 				new DirectFieldAccessor(adapter).getPropertyValue("listenerContainer");
-		assertEquals(1111L, new DirectFieldAccessor(container).getPropertyValue("receiveTimeout"));
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("receiveTimeout")).isEqualTo(1111L);
 		adapter.stop();
 		context.close();
 	}
@@ -134,7 +129,7 @@ public class JmsMessageDrivenChannelAdapterParserTests {
 		catch (NotReadablePropertyException e) {
 			recoveryInterval = TestUtils.getPropertyValue(container, "backOff.interval");
 		}
-		assertEquals(2222L, recoveryInterval);
+		assertThat(recoveryInterval).isEqualTo(2222L);
 		adapter.stop();
 		context.close();
 	}
@@ -147,7 +142,7 @@ public class JmsMessageDrivenChannelAdapterParserTests {
 		adapter.start();
 		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer)
 				new DirectFieldAccessor(adapter).getPropertyValue("listenerContainer");
-		assertEquals(7, new DirectFieldAccessor(container).getPropertyValue("idleTaskExecutionLimit"));
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("idleTaskExecutionLimit")).isEqualTo(7);
 		adapter.stop();
 		context.close();
 	}
@@ -160,8 +155,8 @@ public class JmsMessageDrivenChannelAdapterParserTests {
 		adapter.start();
 		AbstractMessageListenerContainer container = (AbstractMessageListenerContainer)
 				new DirectFieldAccessor(adapter).getPropertyValue("listenerContainer");
-		assertEquals(33, new DirectFieldAccessor(container).getPropertyValue("idleConsumerLimit"));
-		assertEquals(3, new DirectFieldAccessor(container).getPropertyValue("cacheLevel"));
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("idleConsumerLimit")).isEqualTo(33);
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("cacheLevel")).isEqualTo(3);
 		adapter.stop();
 		context.close();
 	}
@@ -172,34 +167,35 @@ public class JmsMessageDrivenChannelAdapterParserTests {
 				"jmsInboundWithContainerClass.xml", this.getClass());
 		JmsMessageDrivenEndpoint adapter = context.getBean("adapterWithIdleConsumerLimit.adapter", JmsMessageDrivenEndpoint.class);
 		MessageChannel channel = context.getBean("adapterWithIdleConsumerLimit", MessageChannel.class);
-		assertSame(channel, TestUtils.getPropertyValue(adapter, "listener.gatewayDelegate.requestChannel"));
+		assertThat(TestUtils.getPropertyValue(adapter, "listener.gatewayDelegate.requestChannel")).isSameAs(channel);
 		adapter.start();
 		FooContainer container = TestUtils.getPropertyValue(adapter, "listenerContainer", FooContainer.class);
-		assertSame(container, context.getBean("adapterWithIdleConsumerLimit.container"));
-		assertEquals(33, new DirectFieldAccessor(container).getPropertyValue("idleConsumerLimit"));
-		assertEquals(3, new DirectFieldAccessor(container).getPropertyValue("cacheLevel"));
-		assertSame(context.getBean("adapterWithIdleConsumerLimit.listener"),
-				TestUtils.getPropertyValue(container, "messageListener"));
+		assertThat(context.getBean("adapterWithIdleConsumerLimit.container")).isSameAs(container);
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("idleConsumerLimit")).isEqualTo(33);
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("cacheLevel")).isEqualTo(3);
+		assertThat(TestUtils.getPropertyValue(container, "messageListener"))
+				.isSameAs(context.getBean("adapterWithIdleConsumerLimit.listener"));
 		adapter.stop();
 
 		adapter = context.getBean("adapterWithIdleConsumerLimit2.adapter", JmsMessageDrivenEndpoint.class);
 		channel = context.getBean("adapterWithIdleConsumerLimit2", MessageChannel.class);
-		assertSame(channel, TestUtils.getPropertyValue(adapter, "listener.gatewayDelegate.requestChannel"));
+		assertThat(TestUtils.getPropertyValue(adapter, "listener.gatewayDelegate.requestChannel")).isSameAs(channel);
 		adapter.start();
 		container = TestUtils.getPropertyValue(adapter, "listenerContainer", FooContainer.class);
-		assertSame(container, context.getBean("adapterWithIdleConsumerLimit2.container"));
-		assertEquals(33, new DirectFieldAccessor(container).getPropertyValue("idleConsumerLimit"));
-		assertEquals(3, new DirectFieldAccessor(container).getPropertyValue("cacheLevel"));
+		assertThat(context.getBean("adapterWithIdleConsumerLimit2.container")).isSameAs(container);
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("idleConsumerLimit")).isEqualTo(33);
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("cacheLevel")).isEqualTo(3);
 		adapter.stop();
 
 		adapter = context.getBean("org.springframework.integration.jms.JmsMessageDrivenEndpoint#0", JmsMessageDrivenEndpoint.class);
 		channel = context.getBean("in", MessageChannel.class);
-		assertSame(channel, TestUtils.getPropertyValue(adapter, "listener.gatewayDelegate.requestChannel"));
+		assertThat(TestUtils.getPropertyValue(adapter, "listener.gatewayDelegate.requestChannel")).isSameAs(channel);
 		adapter.start();
 		container = TestUtils.getPropertyValue(adapter, "listenerContainer", FooContainer.class);
-		assertSame(container, context.getBean("org.springframework.integration.jms.JmsMessageDrivenEndpoint#0.container"));
-		assertEquals(33, new DirectFieldAccessor(container).getPropertyValue("idleConsumerLimit"));
-		assertEquals(3, new DirectFieldAccessor(container).getPropertyValue("cacheLevel"));
+		assertThat(context.getBean("org.springframework.integration.jms.JmsMessageDrivenEndpoint#0.container"))
+				.isSameAs(container);
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("idleConsumerLimit")).isEqualTo(33);
+		assertThat(new DirectFieldAccessor(container).getPropertyValue("cacheLevel")).isEqualTo(3);
 		adapter.stop();
 		context.close();
 	}

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -58,11 +58,11 @@ public class JmsMessageHistoryTests {
 				.get(MessageHistory.HEADER_NAME, MessageHistory.class)
 				.iterator();
 		Properties event1 = historyIterator.next();
-		assertEquals("jms:inbound-channel-adapter", event1.getProperty(MessageHistory.TYPE_PROPERTY));
-		assertEquals("sampleJmsInboundAdapter", event1.getProperty(MessageHistory.NAME_PROPERTY));
+		assertThat(event1.getProperty(MessageHistory.TYPE_PROPERTY)).isEqualTo("jms:inbound-channel-adapter");
+		assertThat(event1.getProperty(MessageHistory.NAME_PROPERTY)).isEqualTo("sampleJmsInboundAdapter");
 		Properties event2 = historyIterator.next();
-		assertEquals("channel", event2.getProperty(MessageHistory.TYPE_PROPERTY));
-		assertEquals("jmsInputChannel", event2.getProperty(MessageHistory.NAME_PROPERTY));
+		assertThat(event2.getProperty(MessageHistory.TYPE_PROPERTY)).isEqualTo("channel");
+		assertThat(event2.getProperty(MessageHistory.NAME_PROPERTY)).isEqualTo("jmsInputChannel");
 		applicationContext.close();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-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 javax.jms.DeliveryMode;
 
@@ -54,8 +51,9 @@ public class JmsOutboundChannelAdapterParserTests {
 		EventDrivenConsumer endpoint = (EventDrivenConsumer) context.getBean("adapter");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(
 				new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
-		assertNotNull(accessor.getPropertyValue("jmsTemplate"));
-		assertTrue(TestUtils.getPropertyValue(endpoint, "handler.jmsTemplate.sessionTransacted", Boolean.class));
+		assertThat(accessor.getPropertyValue("jmsTemplate")).isNotNull();
+		assertThat(TestUtils.getPropertyValue(endpoint, "handler.jmsTemplate.sessionTransacted", Boolean.class))
+				.isTrue();
 		context.close();
 	}
 
@@ -66,7 +64,7 @@ public class JmsOutboundChannelAdapterParserTests {
 		EventDrivenConsumer endpoint = (EventDrivenConsumer) context.getBean("advised");
 		MessageHandler handler = TestUtils.getPropertyValue(endpoint, "handler", MessageHandler.class);
 		handler.handleMessage(new GenericMessage<String>("foo"));
-		assertEquals(1, adviceCalled);
+		assertThat(adviceCalled).isEqualTo(1);
 		context.close();
 	}
 
@@ -77,8 +75,9 @@ public class JmsOutboundChannelAdapterParserTests {
 		EventDrivenConsumer endpoint = (EventDrivenConsumer) context.getBean("adapter");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(
 				new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
-		assertNotNull(accessor.getPropertyValue("jmsTemplate"));
-		assertFalse(TestUtils.getPropertyValue(endpoint, "handler.jmsTemplate.sessionTransacted", Boolean.class));
+		assertThat(accessor.getPropertyValue("jmsTemplate")).isNotNull();
+		assertThat(TestUtils.getPropertyValue(endpoint, "handler.jmsTemplate.sessionTransacted", Boolean.class))
+				.isFalse();
 		context.close();
 	}
 
@@ -89,7 +88,7 @@ public class JmsOutboundChannelAdapterParserTests {
 		EventDrivenConsumer endpoint = (EventDrivenConsumer) context.getBean("adapter");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(
 				new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
-		assertNotNull(accessor.getPropertyValue("jmsTemplate"));
+		assertThat(accessor.getPropertyValue("jmsTemplate")).isNotNull();
 		context.close();
 	}
 
@@ -101,7 +100,7 @@ public class JmsOutboundChannelAdapterParserTests {
 		DirectFieldAccessor accessor = new DirectFieldAccessor(
 				new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
 		Object order = accessor.getPropertyValue("order");
-		assertEquals(123, order);
+		assertThat(order).isEqualTo(123);
 		context.close();
 	}
 
@@ -113,8 +112,8 @@ public class JmsOutboundChannelAdapterParserTests {
 		DirectFieldAccessor accessor = new DirectFieldAccessor(
 				new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
 		JmsHeaderMapper headerMapper = (JmsHeaderMapper) accessor.getPropertyValue("headerMapper");
-		assertNotNull(headerMapper);
-		assertEquals(TestJmsHeaderMapper.class, headerMapper.getClass());
+		assertThat(headerMapper).isNotNull();
+		assertThat(headerMapper.getClass()).isEqualTo(TestJmsHeaderMapper.class);
 		context.close();
 	}
 
@@ -125,8 +124,8 @@ public class JmsOutboundChannelAdapterParserTests {
 		EventDrivenConsumer endpoint = (EventDrivenConsumer) context.getBean("adapter");
 		DirectFieldAccessor handlerAccessor = new DirectFieldAccessor(new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
 		JmsTemplate jmsTemplate = (JmsTemplate) handlerAccessor.getPropertyValue("jmsTemplate");
-		assertNotNull(jmsTemplate);
-		assertEquals(context.getBean("template"), jmsTemplate);
+		assertThat(jmsTemplate).isNotNull();
+		assertThat(jmsTemplate).isEqualTo(context.getBean("template"));
 		context.close();
 	}
 
@@ -138,13 +137,15 @@ public class JmsOutboundChannelAdapterParserTests {
 		Object handler = new DirectFieldAccessor(endpoint).getPropertyValue("handler");
 		DirectFieldAccessor handlerAccessor = new DirectFieldAccessor(handler);
 		JmsTemplate jmsTemplate = (JmsTemplate) handlerAccessor.getPropertyValue("jmsTemplate");
-		assertNotNull(jmsTemplate);
-		assertEquals(context.getBean("template"), jmsTemplate);
-		assertTrue(jmsTemplate.isExplicitQosEnabled());
-		assertEquals(7, jmsTemplate.getPriority());
-		assertEquals(12345, jmsTemplate.getTimeToLive());
-		assertEquals("1", TestUtils.getPropertyValue(handler, "deliveryModeExpression.expression", String.class));
-		assertEquals("100", TestUtils.getPropertyValue(handler, "timeToLiveExpression.expression", String.class));
+		assertThat(jmsTemplate).isNotNull();
+		assertThat(jmsTemplate).isEqualTo(context.getBean("template"));
+		assertThat(jmsTemplate.isExplicitQosEnabled()).isTrue();
+		assertThat(jmsTemplate.getPriority()).isEqualTo(7);
+		assertThat(jmsTemplate.getTimeToLive()).isEqualTo(12345);
+		assertThat(TestUtils.getPropertyValue(handler, "deliveryModeExpression.expression", String.class))
+				.isEqualTo("1");
+		assertThat(TestUtils.getPropertyValue(handler, "timeToLiveExpression.expression", String.class))
+				.isEqualTo("100");
 		context.close();
 	}
 
@@ -157,8 +158,8 @@ public class JmsOutboundChannelAdapterParserTests {
 				new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
 		JmsTemplate jmsTemlate = (JmsTemplate) handlerAccessor.getPropertyValue("jmsTemplate");
 		MessageConverter messageConverter = jmsTemlate.getMessageConverter();
-		assertNotNull(messageConverter);
-		assertEquals(TestMessageConverter.class, messageConverter.getClass());
+		assertThat(messageConverter).isNotNull();
+		assertThat(messageConverter.getClass()).isEqualTo(TestMessageConverter.class);
 		context.close();
 	}
 
@@ -168,7 +169,7 @@ public class JmsOutboundChannelAdapterParserTests {
 			new ClassPathXmlApplicationContext("jmsOutboundWithEmptyConnectionFactory.xml", this.getClass()).close();
 		}
 		catch (BeanDefinitionStoreException e) {
-			assertTrue(e.getMessage().contains("connection-factory"));
+			assertThat(e.getMessage().contains("connection-factory")).isTrue();
 			throw e;
 		}
 	}
@@ -181,10 +182,10 @@ public class JmsOutboundChannelAdapterParserTests {
 		DirectFieldAccessor accessor = new DirectFieldAccessor(
 				new DirectFieldAccessor(new DirectFieldAccessor(endpoint).getPropertyValue("handler"))
 						.getPropertyValue("jmsTemplate"));
-		assertEquals(true, accessor.getPropertyValue("explicitQosEnabled"));
-		assertEquals(12345L, accessor.getPropertyValue("timeToLive"));
-		assertEquals(7, accessor.getPropertyValue("priority"));
-		assertEquals(DeliveryMode.NON_PERSISTENT, accessor.getPropertyValue("deliveryMode"));
+		assertThat(accessor.getPropertyValue("explicitQosEnabled")).isEqualTo(true);
+		assertThat(accessor.getPropertyValue("timeToLive")).isEqualTo(12345L);
+		assertThat(accessor.getPropertyValue("priority")).isEqualTo(7);
+		assertThat(accessor.getPropertyValue("deliveryMode")).isEqualTo(DeliveryMode.NON_PERSISTENT);
 		context.close();
 	}
 
@@ -196,7 +197,7 @@ public class JmsOutboundChannelAdapterParserTests {
 		DirectFieldAccessor accessor = new DirectFieldAccessor(
 				new DirectFieldAccessor(new DirectFieldAccessor(endpoint).getPropertyValue("handler"))
 						.getPropertyValue("jmsTemplate"));
-		assertEquals(false, accessor.getPropertyValue("explicitQosEnabled"));
+		assertThat(accessor.getPropertyValue("explicitQosEnabled")).isEqualTo(false);
 		context.close();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,8 @@
 
 package org.springframework.integration.jms.config;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-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.assertThat;
-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;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -80,14 +73,14 @@ public class JmsOutboundGatewayParserTests {
 		JmsOutboundGateway gateway = (JmsOutboundGateway) accessor.getPropertyValue("handler");
 		accessor = new DirectFieldAccessor(gateway);
 		int deliveryMode = (Integer) accessor.getPropertyValue("deliveryMode");
-		assertEquals(DeliveryMode.PERSISTENT, deliveryMode);
-		assertTrue(TestUtils.getPropertyValue(gateway, "async", Boolean.class));
+		assertThat(deliveryMode).isEqualTo(DeliveryMode.PERSISTENT);
+		assertThat(TestUtils.getPropertyValue(gateway, "async", Boolean.class)).isTrue();
 		DefaultMessageListenerContainer container = TestUtils.getPropertyValue(gateway, "replyContainer",
 				DefaultMessageListenerContainer.class);
-		assertEquals(4, TestUtils.getPropertyValue(container, "concurrentConsumers"));
-		assertEquals(5, TestUtils.getPropertyValue(container, "maxConcurrentConsumers"));
-		assertEquals(10, TestUtils.getPropertyValue(container, "maxMessagesPerTask"));
-		assertEquals(2000L, TestUtils.getPropertyValue(container, "receiveTimeout"));
+		assertThat(TestUtils.getPropertyValue(container, "concurrentConsumers")).isEqualTo(4);
+		assertThat(TestUtils.getPropertyValue(container, "maxConcurrentConsumers")).isEqualTo(5);
+		assertThat(TestUtils.getPropertyValue(container, "maxMessagesPerTask")).isEqualTo(10);
+		assertThat(TestUtils.getPropertyValue(container, "receiveTimeout")).isEqualTo(2000L);
 		Object recoveryInterval;
 		try {
 			recoveryInterval = TestUtils.getPropertyValue(container, "recoveryInterval");
@@ -95,14 +88,14 @@ public class JmsOutboundGatewayParserTests {
 		catch (NotReadablePropertyException e) {
 			recoveryInterval = TestUtils.getPropertyValue(container, "backOff.interval");
 		}
-		assertEquals(10000L, recoveryInterval);
+		assertThat(recoveryInterval).isEqualTo(10000L);
 
-		assertEquals(7, TestUtils.getPropertyValue(container, "idleConsumerLimit"));
-		assertEquals(2, TestUtils.getPropertyValue(container, "idleTaskExecutionLimit"));
-		assertEquals(3, TestUtils.getPropertyValue(container, "cacheLevel"));
-		assertTrue(container.isSessionTransacted());
-		assertSame(context.getBean("exec"), TestUtils.getPropertyValue(container, "taskExecutor"));
-		assertEquals(1234000L, TestUtils.getPropertyValue(gateway, "idleReplyContainerTimeout"));
+		assertThat(TestUtils.getPropertyValue(container, "idleConsumerLimit")).isEqualTo(7);
+		assertThat(TestUtils.getPropertyValue(container, "idleTaskExecutionLimit")).isEqualTo(2);
+		assertThat(TestUtils.getPropertyValue(container, "cacheLevel")).isEqualTo(3);
+		assertThat(container.isSessionTransacted()).isTrue();
+		assertThat(TestUtils.getPropertyValue(container, "taskExecutor")).isSameAs(context.getBean("exec"));
+		assertThat(TestUtils.getPropertyValue(gateway, "idleReplyContainerTimeout")).isEqualTo(1234000L);
 		context.close();
 	}
 
@@ -112,10 +105,10 @@ public class JmsOutboundGatewayParserTests {
 				"jmsOutboundGatewayWithDeliveryPersistent.xml", this.getClass());
 		EventDrivenConsumer endpoint = (EventDrivenConsumer) context.getBean("advised");
 		JmsOutboundGateway gateway = TestUtils.getPropertyValue(endpoint, "handler", JmsOutboundGateway.class);
-		assertFalse(TestUtils.getPropertyValue(gateway, "async", Boolean.class));
+		assertThat(TestUtils.getPropertyValue(gateway, "async", Boolean.class)).isFalse();
 		gateway.handleMessage(new GenericMessage<String>("foo"));
-		assertEquals(1, adviceCalled);
-		assertEquals(3, TestUtils.getPropertyValue(gateway, "replyContainer.sessionAcknowledgeMode"));
+		assertThat(adviceCalled).isEqualTo(1);
+		assertThat(TestUtils.getPropertyValue(gateway, "replyContainer.sessionAcknowledgeMode")).isEqualTo(3);
 		context.close();
 	}
 
@@ -128,7 +121,7 @@ public class JmsOutboundGatewayParserTests {
 		JmsOutboundGateway gateway = (JmsOutboundGateway) accessor.getPropertyValue("handler");
 		accessor = new DirectFieldAccessor(gateway);
 		MessageConverter converter = (MessageConverter) accessor.getPropertyValue("messageConverter");
-		assertTrue("Wrong message converter", converter instanceof StubMessageConverter);
+		assertThat(converter instanceof StubMessageConverter).as("Wrong message converter").isTrue();
 		context.close();
 	}
 
@@ -140,8 +133,8 @@ public class JmsOutboundGatewayParserTests {
 		DirectFieldAccessor accessor = new DirectFieldAccessor(
 				new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
 		Object order = accessor.getPropertyValue("order");
-		assertEquals(99, order);
-		assertEquals(Boolean.TRUE, accessor.getPropertyValue("requiresReply"));
+		assertThat(order).isEqualTo(99);
+		assertThat(accessor.getPropertyValue("requiresReply")).isEqualTo(Boolean.TRUE);
 		context.close();
 	}
 
@@ -153,7 +146,7 @@ public class JmsOutboundGatewayParserTests {
 		DirectFieldAccessor accessor = new DirectFieldAccessor(endpoint);
 		JmsOutboundGateway gateway = (JmsOutboundGateway) accessor.getPropertyValue("handler");
 		accessor = new DirectFieldAccessor(gateway);
-		assertSame(context.getBean("replyQueue"), accessor.getPropertyValue("replyDestination"));
+		assertThat(accessor.getPropertyValue("replyDestination")).isSameAs(context.getBean("replyQueue"));
 		context.close();
 	}
 
@@ -165,7 +158,7 @@ public class JmsOutboundGatewayParserTests {
 		DirectFieldAccessor accessor = new DirectFieldAccessor(endpoint);
 		JmsOutboundGateway gateway = (JmsOutboundGateway) accessor.getPropertyValue("handler");
 		accessor = new DirectFieldAccessor(gateway);
-		assertEquals("replyQueueName", accessor.getPropertyValue("replyDestinationName"));
+		assertThat(accessor.getPropertyValue("replyDestinationName")).isEqualTo("replyQueueName");
 		context.close();
 	}
 
@@ -180,9 +173,9 @@ public class JmsOutboundGatewayParserTests {
 				ExpressionEvaluatingMessageProcessor.class);
 		Expression expression = TestUtils.getPropertyValue(gateway, "replyDestinationExpressionProcessor.expression",
 				Expression.class);
-		assertEquals("payload", expression.getExpressionString());
+		assertThat(expression.getExpressionString()).isEqualTo("payload");
 		Message<?> message = MessageBuilder.withPayload("foo").build();
-		assertEquals("foo", processor.processMessage(message));
+		assertThat(processor.processMessage(message)).isEqualTo("foo");
 
 		Method method = JmsOutboundGateway.class.getDeclaredMethod("determineReplyDestination", Message.class, Session.class);
 		method.setAccessible(true);
@@ -191,7 +184,7 @@ public class JmsOutboundGatewayParserTests {
 		Queue queue = mock(Queue.class);
 		when(session.createQueue("foo")).thenReturn(queue);
 		Destination replyQ = (Destination) method.invoke(gateway, message, session);
-		assertSame(queue, replyQ);
+		assertThat(replyQ).isSameAs(queue);
 		context.close();
 	}
 
@@ -206,8 +199,8 @@ public class JmsOutboundGatewayParserTests {
 				ExpressionEvaluatingMessageProcessor.class);
 		Expression expression = TestUtils.getPropertyValue(gateway, "replyDestinationExpressionProcessor.expression",
 				Expression.class);
-		assertEquals("@replyQueue", expression.getExpressionString());
-		assertSame(context.getBean("replyQueue"), processor.processMessage(null));
+		assertThat(expression.getExpressionString()).isEqualTo("@replyQueue");
+		assertThat(processor.processMessage(null)).isSameAs(context.getBean("replyQueue"));
 		context.close();
 	}
 
@@ -219,8 +212,10 @@ public class JmsOutboundGatewayParserTests {
 			fail("Exception expected");
 		}
 		catch (BeanDefinitionParsingException e) {
-			assertTrue(e.getMessage().startsWith("Configuration problem: Only one of the " +
-					"'replyQueue', 'reply-destination-name', or 'reply-destination-expression' attributes is allowed."));
+			assertThat(e.getMessage().startsWith("Configuration problem: Only one of the " +
+					"'replyQueue', 'reply-destination-name', or 'reply-destination-expression' attributes is allowed" +
+					"."))
+					.isTrue();
 		}
 	}
 
@@ -233,23 +228,23 @@ public class JmsOutboundGatewayParserTests {
 		SubscribableChannel jmsInput = context.getBean("jmsInput", SubscribableChannel.class);
 		MessageHandler handler = message -> {
 			MessageHistory history = MessageHistory.read(message);
-			assertNotNull(history);
+			assertThat(history).isNotNull();
 			Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "inboundGateway", 0);
-			assertNotNull(componentHistoryRecord);
-			assertEquals("jms:inbound-gateway", componentHistoryRecord.get("type"));
+			assertThat(componentHistoryRecord).isNotNull();
+			assertThat(componentHistoryRecord.get("type")).isEqualTo("jms:inbound-gateway");
 			MessagingTemplate messagingTemplate = new MessagingTemplate();
 			messagingTemplate.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
 			messagingTemplate.send(message);
 		};
 		jmsInput.subscribe(handler);
 		String result = gateway.echo("hello");
-		assertEquals("hello", result);
+		assertThat(result).isEqualTo("hello");
 		JmsOutboundGateway gw1 = context.getBean("chain1$child.gateway.handler", JmsOutboundGateway.class);
 		MessageChannel out = TestUtils.getPropertyValue(gw1, "outputChannel", MessageChannel.class);
-		assertThat(out.getClass().getSimpleName(), equalTo("ReplyForwardingMessageChannel"));
+		assertThat(out.getClass().getSimpleName()).isEqualTo("ReplyForwardingMessageChannel");
 		JmsOutboundGateway gw2 = context.getBean("chain2$child.gateway.handler", JmsOutboundGateway.class);
 		out = TestUtils.getPropertyValue(gw2, "outputChannel", MessageChannel.class);
-		assertThat(out.getClass().getName(), containsString("MessageHandlerChain$"));
+		assertThat(out.getClass().getName()).contains("MessageHandlerChain$");
 		context.close();
 	}
 
@@ -260,8 +255,8 @@ public class JmsOutboundGatewayParserTests {
 		EventDrivenConsumer endpoint = (EventDrivenConsumer) context.getBean("defaultGateway");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(
 				new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
-		assertFalse((Boolean) accessor.getPropertyValue("requestPubSubDomain"));
-		assertFalse((Boolean) accessor.getPropertyValue("replyPubSubDomain"));
+		assertThat((Boolean) accessor.getPropertyValue("requestPubSubDomain")).isFalse();
+		assertThat((Boolean) accessor.getPropertyValue("replyPubSubDomain")).isFalse();
 		context.close();
 	}
 
@@ -272,8 +267,8 @@ public class JmsOutboundGatewayParserTests {
 		EventDrivenConsumer endpoint = (EventDrivenConsumer) context.getBean("pubSubDomainGateway");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(
 				new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
-		assertTrue((Boolean) accessor.getPropertyValue("requestPubSubDomain"));
-		assertTrue((Boolean) accessor.getPropertyValue("replyPubSubDomain"));
+		assertThat((Boolean) accessor.getPropertyValue("requestPubSubDomain")).isTrue();
+		assertThat((Boolean) accessor.getPropertyValue("replyPubSubDomain")).isTrue();
 		context.close();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-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 javax.jms.JMSException;
 import javax.jms.MessageProducer;
@@ -69,10 +67,10 @@ public class JmsPriorityTests {
 		Message<?> message = MessageBuilder.withPayload("test").build();
 		channelAdapterChannel.send(message);
 		Message<?> result = channelAdapterResults.receive(5000);
-		assertNotNull(result);
-		assertTrue(result.getPayload() instanceof javax.jms.Message);
+		assertThat(result).isNotNull();
+		assertThat(result.getPayload() instanceof javax.jms.Message).isTrue();
 		javax.jms.Message jmsMessage = (javax.jms.Message) result.getPayload();
-		assertEquals(3, jmsMessage.getJMSPriority());
+		assertThat(jmsMessage.getJMSPriority()).isEqualTo(3);
 	}
 
 	@Test
@@ -80,10 +78,10 @@ public class JmsPriorityTests {
 		Message<?> message = MessageBuilder.withPayload("test").setPriority(7).build();
 		channelAdapterChannel.send(message);
 		Message<?> result = channelAdapterResults.receive(5000);
-		assertNotNull(result);
-		assertTrue(result.getPayload() instanceof javax.jms.Message);
+		assertThat(result).isNotNull();
+		assertThat(result.getPayload() instanceof javax.jms.Message).isTrue();
 		javax.jms.Message jmsMessage = (javax.jms.Message) result.getPayload();
-		assertEquals(7, jmsMessage.getJMSPriority());
+		assertThat(jmsMessage.getJMSPriority()).isEqualTo(7);
 	}
 
 	@Test
@@ -92,8 +90,8 @@ public class JmsPriorityTests {
 		Message<?> message = MessageBuilder.withPayload("test").setReplyChannel(replyChannel).build();
 		gatewayChannel.send(message);
 		Message<?> result = replyChannel.receive(5000);
-		assertNotNull(result);
-		assertEquals("priority=2", result.getPayload());
+		assertThat(result).isNotNull();
+		assertThat(result.getPayload()).isEqualTo("priority=2");
 	}
 
 	@Test
@@ -102,8 +100,8 @@ public class JmsPriorityTests {
 		Message<?> message = MessageBuilder.withPayload("test").setPriority(8).setReplyChannel(replyChannel).build();
 		gatewayChannel.send(message);
 		Message<?> result = replyChannel.receive(5000);
-		assertNotNull(result);
-		assertEquals("priority=8", result.getPayload());
+		assertThat(result).isNotNull();
+		assertThat(result.getPayload()).isEqualTo("priority=8");
 	}
 
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -58,8 +57,8 @@ public class JmsWithMarshallingMessageConverterTests {
 		Message<String> replyMessage = (Message<String>) output.receive();
 		MessageHeaders headers = replyMessage.getHeaders();
 		// check for couple of JMS headers, make sure they are present
-		assertNotNull(headers.get("jms_redelivered"));
-		assertEquals("HELLO", replyMessage.getPayload());
+		assertThat(headers.get("jms_redelivered")).isNotNull();
+		assertThat(replyMessage.getPayload()).isEqualTo("HELLO");
 		ac.close();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/dsl/JmsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,7 @@
 
 package org.springframework.integration.jms.dsl;
 
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 import java.util.concurrent.CountDownLatch;
@@ -33,7 +29,6 @@ import javax.jms.ConnectionFactory;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.logging.log4j.Level;
-import org.hamcrest.Matchers;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -157,17 +152,17 @@ public class JmsTests extends ActiveMQMultiContextTests {
 	@Test
 	public void testPollingFlow() {
 		this.controlBus.send("@'jmsTests.ContextConfiguration.integerMessageSource.inboundChannelAdapter'.start()");
-		assertThat(this.beanFactory.getBean("integerChannel"), instanceOf(FixedSubscriberChannel.class));
+		assertThat(this.beanFactory.getBean("integerChannel")).isInstanceOf(FixedSubscriberChannel.class);
 		for (int i = 0; i < 5; i++) {
 			Message<?> message = this.outputChannel.receive(20000);
-			assertNotNull(message);
-			assertEquals("" + i, message.getPayload());
+			assertThat(message).isNotNull();
+			assertThat(message.getPayload()).isEqualTo("" + i);
 		}
 		this.controlBus.send("@'jmsTests.ContextConfiguration.integerMessageSource.inboundChannelAdapter'.stop()");
 
-		assertTrue(((ChannelInterceptorAware) this.outputChannel).getChannelInterceptors()
-				.contains(this.testChannelInterceptor));
-		assertThat(this.testChannelInterceptor.invoked.get(), Matchers.greaterThanOrEqualTo(5));
+		assertThat(((ChannelInterceptorAware) this.outputChannel).getChannelInterceptors()
+				.contains(this.testChannelInterceptor)).isTrue();
+		assertThat(this.testChannelInterceptor.invoked.get()).isGreaterThanOrEqualTo(5);
 
 	}
 
@@ -176,7 +171,7 @@ public class JmsTests extends ActiveMQMultiContextTests {
 		JmsTemplate jmsTemplate =
 				TestUtils.getPropertyValue(this.jmsDestinationPollingSource, "jmsTemplate", JmsTemplate.class);
 
-		assertEquals(1000, jmsTemplate.getReceiveTimeout());
+		assertThat(jmsTemplate.getReceiveTimeout()).isEqualTo(1000);
 
 		this.jmsOutboundInboundChannel.send(MessageBuilder.withPayload("hello THROUGH the JMS")
 				.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "jmsInbound")
@@ -184,8 +179,8 @@ public class JmsTests extends ActiveMQMultiContextTests {
 
 		Message<?> receive = this.jmsOutboundInboundReplyChannel.receive(10000);
 
-		assertNotNull(receive);
-		assertEquals("HELLO THROUGH THE JMS", receive.getPayload());
+		assertThat(receive).isNotNull();
+		assertThat(receive.getPayload()).isEqualTo("HELLO THROUGH THE JMS");
 
 		this.jmsOutboundInboundChannel.send(MessageBuilder.withPayload("hello THROUGH the JMS")
 				.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "jmsMessageDriven")
@@ -193,10 +188,10 @@ public class JmsTests extends ActiveMQMultiContextTests {
 
 		receive = this.jmsOutboundInboundReplyChannel.receive(10000);
 
-		assertNotNull(receive);
-		assertEquals("hello through the jms", receive.getPayload());
+		assertThat(receive).isNotNull();
+		assertThat(receive.getPayload()).isEqualTo("hello through the jms");
 
-		assertTrue(this.jmsMessageDrivenChannelCalled.get());
+		assertThat(this.jmsMessageDrivenChannelCalled.get()).isTrue();
 
 		this.jmsOutboundInboundChannel.send(MessageBuilder.withPayload("    foo    ")
 				.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "containerSpecDestination")
@@ -204,16 +199,16 @@ public class JmsTests extends ActiveMQMultiContextTests {
 
 		receive = this.jmsOutboundInboundReplyChannel.receive(10000);
 
-		assertNotNull(receive);
-		assertEquals("foo", receive.getPayload());
+		assertThat(receive).isNotNull();
+		assertThat(receive.getPayload()).isEqualTo("foo");
 
-		assertNotNull(this.jmsOutboundFlowTemplate);
+		assertThat(this.jmsOutboundFlowTemplate).isNotNull();
 	}
 
 	@Test
 	public void testJmsPipelineFlow() {
-		assertEquals(new Long(10000),
-				TestUtils.getPropertyValue(this.jmsOutboundGatewayHandler, "idleReplyContainerTimeout", Long.class));
+		assertThat(TestUtils.getPropertyValue(this.jmsOutboundGatewayHandler, "idleReplyContainerTimeout", Long.class))
+				.isEqualTo(new Long(10000));
 		PollableChannel replyChannel = new QueueChannel();
 		Message<String> message = MessageBuilder.withPayload("hello through the jms pipeline")
 				.setReplyChannel(replyChannel)
@@ -223,10 +218,10 @@ public class JmsTests extends ActiveMQMultiContextTests {
 
 		Message<?> receive = replyChannel.receive(5000);
 
-		assertNotNull(receive);
-		assertEquals("HELLO THROUGH THE JMS PIPELINE", receive.getPayload());
+		assertThat(receive).isNotNull();
+		assertThat(receive.getPayload()).isEqualTo("HELLO THROUGH THE JMS PIPELINE");
 
-		assertTrue(this.jmsInboundGatewayChannelCalled.get());
+		assertThat(this.jmsInboundGatewayChannelCalled.get()).isTrue();
 	}
 
 	@Test
@@ -236,8 +231,8 @@ public class JmsTests extends ActiveMQMultiContextTests {
 		template.setDefaultDestinationName("pubsub");
 		template.convertAndSend("foo");
 		Message<?> received = this.jmsPubSubBridgeChannel.receive(5000);
-		assertNotNull(received);
-		assertEquals("foo", received.getPayload());
+		assertThat(received).isNotNull();
+		assertThat(received.getPayload()).isEqualTo("foo");
 	}
 
 	@Test
@@ -246,9 +241,9 @@ public class JmsTests extends ActiveMQMultiContextTests {
 				.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "jmsMessageDrivenRedelivery")
 				.build());
 
-		assertTrue(this.redeliveryLatch.await(10, TimeUnit.SECONDS));
+		assertThat(this.redeliveryLatch.await(10, TimeUnit.SECONDS)).isTrue();
 
-		assertNotNull(this.jmsMessageDrivenRedeliveryFlowContainer);
+		assertThat(this.jmsMessageDrivenRedeliveryFlowContainer).isNotNull();
 		this.jmsMessageDrivenRedeliveryFlowContainer.stop();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/AsyncGatewayTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,7 @@
 
 package org.springframework.integration.jms.request_reply;
 
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import javax.jms.Message;
 import javax.jms.TextMessage;
@@ -80,16 +76,16 @@ public class AsyncGatewayTests extends ActiveMQMultiContextTests {
 		JmsTemplate template = new JmsTemplate(this.ccf);
 		template.setReceiveTimeout(10000);
 		final Message received = template.receive("asyncTest1");
-		assertNotNull(received);
+		assertThat(received).isNotNull();
 		template.send(received.getJMSReplyTo(), (MessageCreator) session -> {
 			TextMessage textMessage = session.createTextMessage("bar");
 			textMessage.setJMSCorrelationID(received.getJMSCorrelationID());
 			return textMessage;
 		});
 		org.springframework.messaging.Message<?> reply = replies.receive(10000);
-		assertNotNull(reply);
-		assertEquals("bar", reply.getPayload());
-		assertEquals("baz", reply.getHeaders().get(JmsHeaders.CORRELATION_ID));
+		assertThat(reply).isNotNull();
+		assertThat(reply.getPayload()).isEqualTo("bar");
+		assertThat(reply.getHeaders().get(JmsHeaders.CORRELATION_ID)).isEqualTo("baz");
 		this.gateway1.stop();
 	}
 
@@ -102,13 +98,13 @@ public class AsyncGatewayTests extends ActiveMQMultiContextTests {
 		JmsTemplate template = new JmsTemplate(this.ccf);
 		template.setReceiveTimeout(10000);
 		final Message received = template.receive("asyncTest3");
-		assertNotNull(received);
+		assertThat(received).isNotNull();
 		org.springframework.messaging.Message<?> error = errors.receive(10000);
-		assertNotNull(error);
-		assertThat(error, instanceOf(ErrorMessage.class));
-		assertThat(error.getPayload(), instanceOf(MessagingException.class));
-		assertThat(((MessagingException) error.getPayload()).getCause(), instanceOf(JmsTimeoutException.class));
-		assertEquals("foo", ((MessagingException) error.getPayload()).getFailedMessage().getPayload());
+		assertThat(error).isNotNull();
+		assertThat(error).isInstanceOf(ErrorMessage.class);
+		assertThat(error.getPayload()).isInstanceOf(MessagingException.class);
+		assertThat(((MessagingException) error.getPayload()).getCause()).isInstanceOf(JmsTimeoutException.class);
+		assertThat(((MessagingException) error.getPayload()).getFailedMessage().getPayload()).isEqualTo("foo");
 		this.gateway2.stop();
 	}
 
@@ -123,9 +119,9 @@ public class AsyncGatewayTests extends ActiveMQMultiContextTests {
 		JmsTemplate template = new JmsTemplate(this.ccf);
 		template.setReceiveTimeout(10000);
 		final Message received = template.receive("asyncTest3");
-		assertNotNull(received);
+		assertThat(received).isNotNull();
 		org.springframework.messaging.Message<?> error = errors.receive(1000);
-		assertNull(error);
+		assertThat(error).isNull();
 		this.gateway2.stop();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/GatewaySerializedReplyChannelTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.integration.jms.request_reply;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,8 +50,8 @@ public class GatewaySerializedReplyChannelTests {
 	public void test() {
 		input.send(new GenericMessage<String>("foo"));
 		Message<?> reply = output.receive(0);
-		assertNotNull(reply);
-		assertEquals("echo:foo", reply.getPayload());
+		assertThat(reply).isNotNull();
+		assertThat(reply.getPayload()).isEqualTo("echo:foo");
 	}
 
 }

spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/MiscellaneousTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.integration.jms.request_reply;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -59,8 +58,8 @@ public class MiscellaneousTests {
 		}
 		latch.await();
 		stopWatch.stop();
-		assertTrue(stopWatch.getTotalTimeMillis() <= 18000);
-		assertEquals(1, replies.get());
+		assertThat(stopWatch.getTotalTimeMillis() <= 18000).isTrue();
+		assertThat(replies.get()).isEqualTo(1);
 		context.close();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.integration.jms.request_reply;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -161,7 +160,7 @@ public class PipelineJmsTests extends ActiveMQMultiContextTests {
 				final int y = i;
 				executor.execute(() -> {
 					try {
-						assertEquals(y, gateway.exchange(new GenericMessage<Integer>(y)).getPayload());
+						assertThat(gateway.exchange(new GenericMessage<Integer>(y)).getPayload()).isEqualTo(y);
 						successCounter.incrementAndGet();
 					}
 					catch (MessageTimeoutException e) {
@@ -184,9 +183,9 @@ public class PipelineJmsTests extends ActiveMQMultiContextTests {
 			logger.info("Failure: " + failureCounter.get());
 			// technically all we care that its > 0,
 			// but reality of this test it has to be something more then 0
-			assertTrue(successCounter.get() > 1);
-			assertEquals(0, failureCounter.get());
-			assertEquals(requests, successCounter.get() + timeoutCounter.get());
+			assertThat(successCounter.get() > 1).isTrue();
+			assertThat(failureCounter.get()).isEqualTo(0);
+			assertThat(successCounter.get() + timeoutCounter.get()).isEqualTo(requests);
 			context.close();
 		}
 	}

spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.integration.jms.request_reply;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
@@ -92,7 +91,7 @@ public class PipelineNamedReplyQueuesJmsTests extends ActiveMQMultiContextTests
 	@Test
 	public void testPipeline2a() throws Exception {
 		int timeouts = this.test("pipeline-named-queue-02a.xml");
-		assertEquals(0, timeouts);
+		assertThat(timeouts).isEqualTo(0);
 	}
 
 	/**
@@ -116,7 +115,7 @@ public class PipelineNamedReplyQueuesJmsTests extends ActiveMQMultiContextTests
 	@Test
 	public void testPipeline3a() throws Exception {
 		int timeouts = this.test("pipeline-named-queue-03a.xml", 50000);
-		assertEquals(0, timeouts);
+		assertThat(timeouts).isEqualTo(0);
 	}
 
 	/**
@@ -126,7 +125,7 @@ public class PipelineNamedReplyQueuesJmsTests extends ActiveMQMultiContextTests
 	@Test
 	public void testPipeline4() throws Exception {
 		int timeouts = this.test("pipeline-named-queue-04.xml", 30000);
-		assertEquals(0, timeouts);
+		assertThat(timeouts).isEqualTo(0);
 	}
 
 	/**
@@ -174,7 +173,7 @@ public class PipelineNamedReplyQueuesJmsTests extends ActiveMQMultiContextTests
 				final int y = i;
 				executor.execute(() -> {
 					try {
-						assertEquals(y + offset, gateway.exchange(new GenericMessage<Integer>(y)).getPayload());
+						assertThat(gateway.exchange(new GenericMessage<Integer>(y)).getPayload()).isEqualTo(y + offset);
 						successCounter.incrementAndGet();
 					}
 					catch (MessageTimeoutException e) {
@@ -189,12 +188,12 @@ public class PipelineNamedReplyQueuesJmsTests extends ActiveMQMultiContextTests
 					}
 				});
 			}
-			assertTrue(latch.await(120, TimeUnit.SECONDS));
+			assertThat(latch.await(120, TimeUnit.SECONDS)).isTrue();
 			// technically all we care that its > 0,
 			// but reality of this test it has to be something more then 0
-			assertTrue(successCounter.get() > 1);
-			assertEquals(0, failureCounter.get());
-			assertEquals(requests, successCounter.get() + timeoutCounter.get());
+			assertThat(successCounter.get() > 1).isTrue();
+			assertThat(failureCounter.get()).isEqualTo(0);
+			assertThat(successCounter.get() + timeoutCounter.get()).isEqualTo(requests);
 			return timeoutCounter.get();
 		}
 		finally {

spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,13 @@
 
 package org.springframework.integration.jms.request_reply;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.CountDownLatch;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
+import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageProducer;
 import javax.jms.TextMessage;
@@ -45,6 +45,7 @@ import org.springframework.jms.listener.DefaultMessageListenerContainer;
 import org.springframework.jms.listener.SessionAwareMessageListener;
 import org.springframework.jms.support.converter.SimpleMessageConverter;
 import org.springframework.messaging.support.GenericMessage;
+
 /**
  * @author Oleg Zhurakousky
  * @author Gary Russell
@@ -60,9 +61,12 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti
 	public void messageCorrelationBasedOnRequestMessageIdOptimized() throws Exception {
 		ActiveMqTestUtils.prepare();
 
-		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("producer-cached-consumers.xml", this.getClass());
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("producer-cached-consumers.xml",
+				this
+				.getClass());
 		try {
-			RequestReplyExchanger gateway = context.getBean("standardMessageIdCopyingConsumerWithOptimization", RequestReplyExchanger.class);
+			RequestReplyExchanger gateway = context
+					.getBean("standardMessageIdCopyingConsumerWithOptimization", RequestReplyExchanger.class);
 			CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
 			final JmsTemplate jmsTemplate = new JmsTemplate(connectionFactory);
 
@@ -90,9 +94,12 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti
 	public void messageCorrelationBasedOnRequestMessageIdNonOptimized() throws Exception {
 		ActiveMqTestUtils.prepare();
 
-		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("producer-cached-consumers.xml", this.getClass());
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("producer-cached-consumers.xml",
+				this
+				.getClass());
 		try {
-			RequestReplyExchanger gateway = context.getBean("standardMessageIdCopyingConsumerWithoutOptimization", RequestReplyExchanger.class);
+			RequestReplyExchanger gateway = context
+					.getBean("standardMessageIdCopyingConsumerWithoutOptimization", RequestReplyExchanger.class);
 			CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
 			final JmsTemplate jmsTemplate = new JmsTemplate(connectionFactory);
 
@@ -108,8 +115,9 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti
 					return message;
 				});
 			}).start();
-			org.springframework.messaging.Message<?> siReplyMessage = gateway.exchange(new GenericMessage<String>("foo"));
-			assertEquals("bar", siReplyMessage.getPayload());
+			org.springframework.messaging.Message<?> siReplyMessage = gateway
+					.exchange(new GenericMessage<String>("foo"));
+			assertThat(siReplyMessage.getPayload()).isEqualTo("bar");
 		}
 		finally {
 			context.close();
@@ -119,9 +127,12 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti
 	@Test
 	public void messageCorrelationBasedOnRequestCorrelationIdOptimized() throws Exception {
 		ActiveMqTestUtils.prepare();
-		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("producer-cached-consumers.xml", this.getClass());
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("producer-cached-consumers.xml",
+				this
+				.getClass());
 		try {
-			RequestReplyExchanger gateway = context.getBean("correlationPropagatingConsumerWithOptimization", RequestReplyExchanger.class);
+			RequestReplyExchanger gateway = context
+					.getBean("correlationPropagatingConsumerWithOptimization", RequestReplyExchanger.class);
 			CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
 
 			final JmsTemplate jmsTemplate = new JmsTemplate(connectionFactory);
@@ -137,8 +148,9 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti
 					return message;
 				});
 			}).start();
-			org.springframework.messaging.Message<?> siReplyMessage = gateway.exchange(new GenericMessage<String>("foo"));
-			assertEquals("bar", siReplyMessage.getPayload());
+			org.springframework.messaging.Message<?> siReplyMessage = gateway
+					.exchange(new GenericMessage<String>("foo"));
+			assertThat(siReplyMessage.getPayload()).isEqualTo("bar");
 		}
 		finally {
 			context.close();
@@ -148,9 +160,12 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti
 	@Test(expected = MessageTimeoutException.class)
 	public void messageCorrelationBasedOnRequestCorrelationIdNonOptimized() throws Exception {
 		ActiveMqTestUtils.prepare();
-		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("producer-cached-consumers.xml", this.getClass());
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("producer-cached-consumers.xml",
+				this
+				.getClass());
 		try {
-			RequestReplyExchanger gateway = context.getBean("correlationPropagatingConsumerWithoutOptimization", RequestReplyExchanger.class);
+			RequestReplyExchanger gateway = context
+					.getBean("correlationPropagatingConsumerWithoutOptimization", RequestReplyExchanger.class);
 			CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
 
 			final JmsTemplate jmsTemplate = new JmsTemplate(connectionFactory);
@@ -180,8 +195,10 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti
 				new ClassPathXmlApplicationContext("producer-cached-consumers.xml", this.getClass());
 		try {
 			RequestReplyExchanger gateway =
-					context.getBean("correlationPropagatingConsumerWithOptimizationDelayFirstReply", RequestReplyExchanger.class);
-			final ConnectionFactory connectionFactory = context.getBean("jmsConnectionFactory", ConnectionFactory.class);
+					context.getBean("correlationPropagatingConsumerWithOptimizationDelayFirstReply",
+							RequestReplyExchanger.class);
+			final ConnectionFactory connectionFactory = context
+					.getBean("jmsConnectionFactory", ConnectionFactory.class);
 
 			final Destination requestDestination = context.getBean("siOutQueueE", Destination.class);
 			final Destination replyDestination = context.getBean("siInQueueE", Destination.class);
@@ -220,24 +237,18 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti
 			latch.await();
 
 
-
-			TestUtils.getPropertyValue(context.getBean("fastGateway"), "handler", JmsOutboundGateway.class).setReceiveTimeout(10000);
+			TestUtils.getPropertyValue(context.getBean("fastGateway"), "handler", JmsOutboundGateway.class)
+					.setReceiveTimeout(10000);
 			Thread.sleep(1000);
-			assertEquals("bar", gateway.exchange(new GenericMessage<String>("bar")).getPayload());
+			assertThat(gateway.exchange(new GenericMessage<>("bar")).getPayload()).isEqualTo("bar");
 		}
 		finally {
 			context.close();
 		}
 	}
 
-	private Object extractPayload(Message jmsMessage) {
-		try {
-			return converter.fromMessage(jmsMessage);
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-			fail();
-		}
-		return null;
+	private Object extractPayload(Message jmsMessage) throws JMSException {
+		return this.converter.fromMessage(jmsMessage);
 	}
+
 }

spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCorrelationKeyProvidedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.jms.request_reply;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.UUID;
 
@@ -76,7 +76,7 @@ public class RequestReplyScenariosWithCorrelationKeyProvidedTests extends Active
 		Message<?> result = gateway.exchange(MessageBuilder.withPayload("foo")
 				.setHeader(JmsHeaders.CORRELATION_ID, correlationId)
 				.build());
-		assertEquals(correlationId, result.getHeaders().get("receivedCorrelationId"));
+		assertThat(result.getHeaders().get("receivedCorrelationId")).isEqualTo(correlationId);
 		context.close();
 	}
 
@@ -99,7 +99,7 @@ public class RequestReplyScenariosWithCorrelationKeyProvidedTests extends Active
 
 		JmsOutboundGateway outGateway = TestUtils.getPropertyValue(context.getBean("outGateway"), "handler", JmsOutboundGateway.class);
 		outGateway.setReceiveTimeout(5000);
-		assertEquals("foo", gateway.exchange(MessageBuilder.withPayload("foo").build()).getPayload());
+		assertThat(gateway.exchange(MessageBuilder.withPayload("foo").build()).getPayload()).isEqualTo("foo");
 		context.close();
 	}
 

spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.jms.request_reply;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
@@ -66,7 +66,7 @@ public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMu
 				});
 			}).start();
 			org.springframework.messaging.Message<?> siReplyMessage = gateway.exchange(new GenericMessage<String>("foo"));
-			assertEquals("bar", siReplyMessage.getPayload());
+			assertThat(siReplyMessage.getPayload()).isEqualTo("bar");
 		}
 		finally {
 			context.close();
@@ -94,7 +94,7 @@ public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMu
 				});
 			}).start();
 			org.springframework.messaging.Message<?> siReplyMessage = gateway.exchange(new GenericMessage<String>("foo"));
-			assertEquals("bar", siReplyMessage.getPayload());
+			assertThat(siReplyMessage.getPayload()).isEqualTo("bar");
 		}
 		finally {
 			context.close();
@@ -122,7 +122,7 @@ public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMu
 				});
 			}).start();
 			org.springframework.messaging.Message<?> siReplyMessage = gateway.exchange(new GenericMessage<String>("foo"));
-			assertEquals("bar", siReplyMessage.getPayload());
+			assertThat(siReplyMessage.getPayload()).isEqualTo("bar");
 		}
 		finally {
 			context.close();

spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,9 @@
 
 package org.springframework.integration.jms.request_reply;
 
-import static org.junit.Assert.assertEquals;
-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;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -31,6 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
+import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageProducer;
 import javax.jms.TextMessage;
@@ -50,12 +48,12 @@ import org.springframework.integration.test.support.LongRunningIntegrationTest;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.jms.connection.CachingConnectionFactory;
 import org.springframework.jms.core.JmsTemplate;
-import org.springframework.jms.core.MessageCreator;
 import org.springframework.jms.listener.DefaultMessageListenerContainer;
 import org.springframework.jms.listener.SessionAwareMessageListener;
 import org.springframework.jms.support.converter.SimpleMessageConverter;
 import org.springframework.messaging.MessageDeliveryException;
 import org.springframework.messaging.support.GenericMessage;
+
 /**
  * @author Oleg Zhurakousky
  * @author Gary Russell
@@ -71,10 +69,12 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
 
 	@SuppressWarnings("resource")
 	@Test
-	public void messageCorrelationBasedOnRequestMessageId() throws Exception {
+	public void messageCorrelationBasedOnRequestMessageId() {
 		ActiveMqTestUtils.prepare();
 
-		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("producer-temp-reply-consumers.xml", this.getClass());
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("producer-temp-reply-consumers" +
+				".xml", this
+				.getClass());
 		RequestReplyExchanger gateway = context.getBean(RequestReplyExchanger.class);
 		CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
 		final JmsTemplate jmsTemplate = new JmsTemplate(connectionFactory);
@@ -87,23 +87,24 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
 			try {
 				replyTo = requestMessage.getJMSReplyTo();
 			}
-			catch (Exception e) {
-				fail();
+			catch (Exception ex) {
+				fail("Test failed", ex);
 			}
-			jmsTemplate.send(replyTo, (MessageCreator) session -> {
-				try {
-					TextMessage message = session.createTextMessage();
-					message.setText("bar");
-					message.setJMSCorrelationID(requestMessage.getJMSMessageID());
-					return message;
-				}
-				catch (Exception e) {
-					// ignore
-				}
-				return null;
-			});
+			jmsTemplate.send(replyTo,
+					session -> {
+						try {
+							TextMessage message = session.createTextMessage();
+							message.setText("bar");
+							message.setJMSCorrelationID(requestMessage.getJMSMessageID());
+							return message;
+						}
+						catch (Exception e) {
+							// ignore
+						}
+						return null;
+					});
 		}).start();
-		gateway.exchange(new GenericMessage<String>("foo"));
+		gateway.exchange(new GenericMessage<>("foo"));
 		context.close();
 	}
 
@@ -126,7 +127,7 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
 				replyTo = message.getJMSReplyTo();
 			}
 			catch (Exception e1) {
-				fail();
+				fail("Test failed", e1);
 			}
 			String requestPayload = (String) extractPayload(message);
 			if (requestPayload.equals("foo")) {
@@ -150,19 +151,13 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
 		dmlc.start();
 
 		try {
-			gateway.exchange(new GenericMessage<String>("foo"));
+			gateway.exchange(new GenericMessage<>("foo"));
 		}
 		catch (Exception e) {
 			// ignore
 		}
 		Thread.sleep(1000);
-		try {
-			assertEquals("bar", gateway.exchange(new GenericMessage<String>("bar")).getPayload());
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-			fail();
-		}
+		assertThat(gateway.exchange(new GenericMessage<>("bar")).getPayload()).isEqualTo("bar");
 		context.close();
 	}
 
@@ -176,7 +171,7 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
 		BrokerService broker = new BrokerService();
 		broker.setPersistent(false);
 		broker.setUseJmx(false);
-		broker.setTransportConnectorURIs(new String[]{"tcp://localhost:61623"});
+		broker.setTransportConnectorURIs(new String[] { "tcp://localhost:61623" });
 		broker.setDeleteAllMessagesOnStartup(true);
 		broker.start();
 
@@ -189,20 +184,22 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
 		int timeoutCounter = 0;
 		for (int i = 0; i < 50; i++) {
 			try {
-				assertEquals(i + "", gateway.exchange(new GenericMessage<String>(String.valueOf(i))).getPayload());
+				assertThat(gateway.exchange(new GenericMessage<>(String.valueOf(i))).getPayload())
+						.isEqualTo(i + "");
 				replyCounter++;
 			}
 			catch (Exception e) {
 				timeoutCounter++;
 			}
 			if (i == 0 || i == 20 || i == 40) {
-				Object replyDestination = TestUtils.getPropertyValue(context.getBean("jog"), "handler.replyDestination");
+				Object replyDestination = TestUtils
+						.getPropertyValue(context.getBean("jog"), "handler.replyDestination");
 				if (replyDestination != null) {
 					broker.removeDestination((ActiveMQDestination) replyDestination);
 				}
 			}
 		}
-		assertEquals(50, replyCounter + timeoutCounter);
+		assertThat(replyCounter + timeoutCounter).isEqualTo(50);
 		context.close();
 	}
 
@@ -223,7 +220,8 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
 			executor.execute(() -> {
 				try {
 
-					String reply = (String) gateway.exchange(new GenericMessage<String>(String.valueOf(y))).getPayload();
+					String reply = (String) gateway.exchange(new GenericMessage<>(String.valueOf(y)))
+							.getPayload();
 					if (!String.valueOf(y).equals(reply)) {
 						missmatches.incrementAndGet();
 					}
@@ -239,42 +237,39 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
 				latch.countDown();
 			});
 		}
-		assertTrue(latch.await(30, TimeUnit.SECONDS));
+		assertThat(latch.await(30, TimeUnit.SECONDS)).isTrue();
 		print(failures, timeouts, missmatches, testNumbers);
-		assertEquals(0, missmatches.get());
-		assertEquals(0, failures.get());
-		assertEquals(0, timeouts.get());
+		assertThat(missmatches.get()).isEqualTo(0);
+		assertThat(failures.get()).isEqualTo(0);
+		assertThat(timeouts.get()).isEqualTo(0);
 		context.close();
 		executor.shutdownNow();
 	}
 
-	private void print(AtomicInteger failures, AtomicInteger timeouts, AtomicInteger missmatches, long echangesProcessed) {
+	private void print(AtomicInteger failures, AtomicInteger timeouts, AtomicInteger mismatches,
+			long echangesProcessed) {
 		logger.info("============================");
 		logger.info(echangesProcessed + " exchanges processed");
 		logger.info("Failures: " + failures.get());
 		logger.info("Timeouts: " + timeouts.get());
-		logger.info("Missmatches: " + missmatches.get());
+		logger.info("Missmatches: " + mismatches.get());
 		logger.info("============================");
 	}
 
 	public static class MyRandomlySlowService {
+
 		Random random = new Random();
-		List<Integer> list = new ArrayList<Integer>();
+
 		public String secho(String value) throws Exception {
 			int i = random.nextInt(2000);
 			Thread.sleep(i);
 			return value;
 		}
+
 	}
 
-	private Object extractPayload(Message jmsMessage) {
-		try {
-			return converter.fromMessage(jmsMessage);
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-			fail();
-		}
-		return null;
+	private Object extractPayload(Message jmsMessage) throws JMSException {
+		return this.converter.fromMessage(jmsMessage);
 	}
+
 }

spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/StopStartTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 the original author or authors.
+ * Copyright 2015-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.jms.request_reply;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,10 +51,10 @@ public class StopStartTests {
 	public void test() {
 		MessagingTemplate template = new MessagingTemplate(this.test);
 		this.outGateway.start();
-		assertEquals("FOO", template.convertSendAndReceive("foo", String.class));
+		assertThat(template.convertSendAndReceive("foo", String.class)).isEqualTo("FOO");
 		this.outGateway.stop();
 		this.outGateway.start();
-		assertEquals("BAR", template.convertSendAndReceive("bar", String.class));
+		assertThat(template.convertSendAndReceive("bar", String.class)).isEqualTo("BAR");
 		this.outGateway.stop();
 	}