Bump test dependencies

Don't use JUnit's assertThat anymore, as it's deprecated in 4.13. Use
assertj instead.

Get rid of Awaitility (created a waitUntil test utility instead) and Hamcrest
(not used anymore).

Author: acogoluegnes

pom.xml

@@ -59,11 +59,10 @@
     <micrometer.version>1.3.2</micrometer.version>
     <jackson.version>2.10.1</jackson.version>
     <logback.version>1.2.3</logback.version>
-    <junit.version>4.12</junit.version>
-    <awaitility.version>4.0.1</awaitility.version>
-    <mockito.version>3.2.0</mockito.version>
-    <assertj.version>3.14.0</assertj.version>
-    <jetty.version>9.4.24.v20191120</jetty.version>
+    <junit.version>4.13</junit.version>
+    <mockito.version>3.3.3</mockito.version>
+    <assertj.version>3.15.0</assertj.version>
+    <jetty.version>9.4.27.v20200227</jetty.version>
     <bouncycastle.version>1.64</bouncycastle.version>
 
     <maven.javadoc.plugin.version>3.1.1</maven.javadoc.plugin.version>
@@ -722,12 +721,6 @@
       <version>${logback.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.awaitility</groupId>
-      <artifactId>awaitility</artifactId>
-      <version>${awaitility.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
@@ -740,12 +733,6 @@
       <version>${assertj.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>

src/test/java/com/rabbitmq/client/test/AMQChannelTest.java

@@ -33,8 +33,8 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Mockito.*;
 
 public class AMQChannelTest {
@@ -69,10 +69,10 @@ public class AMQChannelTest {
             fail("Should time out and throw an exception");
         } catch(ChannelContinuationTimeoutException e) {
             // OK
-            assertThat((DummyAmqChannel) e.getChannel(), is(channel));
-            assertThat(e.getChannelNumber(), is(channel.getChannelNumber()));
-            assertThat(e.getMethod(), is(method));
-            assertNull("outstanding RPC should have been cleaned", channel.nextOutstandingRpc());
+            assertThat((DummyAmqChannel) e.getChannel()).isEqualTo(channel);
+            assertThat(e.getChannelNumber()).isEqualTo(channel.getChannelNumber());
+            assertThat(e.getMethod()).isEqualTo(method);
+            assertThat(channel.nextOutstandingRpc()).as("outstanding RPC should have been cleaned").isNull();
         }
     }
 
@@ -105,7 +105,7 @@ public Void call() throws Exception {
         }, (long) (rpcTimeout / 2.0), TimeUnit.MILLISECONDS);
 
         AMQCommand rpcResponse = channel.rpc(method);
-        assertThat(rpcResponse.getMethod(), is(response));
+        assertThat(rpcResponse.getMethod()).isEqualTo(response);
     }
 
     @Test
@@ -130,10 +130,10 @@ public void testRpcTimeoutReplyComesDuringNexRpc() throws Exception {
             fail("Should time out and throw an exception");
         } catch(final ChannelContinuationTimeoutException e) {
             // OK
-            assertThat((DummyAmqChannel) e.getChannel(), is(channel));
-            assertThat(e.getChannelNumber(), is(channel.getChannelNumber()));
-            assertThat(e.getMethod(), is(method));
-            assertNull("outstanding RPC should have been cleaned", channel.nextOutstandingRpc());
+            assertThat((DummyAmqChannel) e.getChannel()).isEqualTo(channel);
+            assertThat(e.getChannelNumber()).isEqualTo(channel.getChannelNumber());
+            assertThat(e.getMethod()).isEqualTo(method);
+            assertThat(channel.nextOutstandingRpc()).as("outstanding RPC should have been cleaned").isNull();
         }
 
         // now do a basic.consume request and have the queue.declareok returned instead
@@ -151,18 +151,15 @@ public void testRpcTimeoutReplyComesDuringNexRpc() throws Exception {
         final Method response2 = new AMQImpl.Basic.ConsumeOk.Builder()
             .consumerTag("456").build();
 
-        scheduler.schedule(new Callable<Void>() {
-            @Override
-            public Void call() throws Exception {
-                channel.handleCompleteInboundCommand(new AMQCommand(response1));
-                Thread.sleep(10);
-                channel.handleCompleteInboundCommand(new AMQCommand(response2));
-                return null;
-            }
+        scheduler.schedule((Callable<Void>) () -> {
+            channel.handleCompleteInboundCommand(new AMQCommand(response1));
+            Thread.sleep(10);
+            channel.handleCompleteInboundCommand(new AMQCommand(response2));
+            return null;
         }, (long) (rpcTimeout / 2.0), TimeUnit.MILLISECONDS);
 
         AMQCommand rpcResponse = channel.rpc(method);
-        assertThat(rpcResponse.getMethod(), is(response2));
+        assertThat(rpcResponse.getMethod()).isEqualTo(response2);
     }
 
     static class DummyAmqChannel extends AMQChannel {

src/test/java/com/rabbitmq/client/test/ChannelRpcTimeoutIntegrationTest.java

@@ -27,8 +27,8 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeoutException;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 public class ChannelRpcTimeoutIntegrationTest {
 
@@ -73,9 +73,9 @@ public void tearDown() {
                 fail("Should time out and throw an exception");
             } catch(ChannelContinuationTimeoutException e) {
                 // OK
-                assertThat((Channel) e.getChannel(), is(channel));
-                assertThat(e.getChannelNumber(), is(channel.getChannelNumber()));
-                assertThat(e.getMethod(), instanceOf(AMQP.Queue.Declare.class));
+                assertThat((Channel) e.getChannel()).isEqualTo(channel);
+                assertThat(e.getChannelNumber()).isEqualTo(channel.getChannelNumber());
+                assertThat(e.getMethod()).isInstanceOf(AMQP.Queue.Declare.class);
             }
         } finally {
             connection.close();

src/test/java/com/rabbitmq/client/test/ClientVersionTest.java

@@ -18,15 +18,13 @@
 import com.rabbitmq.client.impl.ClientVersion;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ClientVersionTest {
 
     @Test
     public void clientVersion() {
-        assertThat(ClientVersion.VERSION, notNullValue());
-        assertThat(ClientVersion.VERSION, not("0.0.0"));
+        assertThat(ClientVersion.VERSION).isNotNull();
+        assertThat(ClientVersion.VERSION).isNotEqualTo("0.0.0");
     }
 }

src/test/java/com/rabbitmq/client/test/DnsSrvRecordAddressResolverTest.java

@@ -23,8 +23,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  *
@@ -46,12 +45,12 @@ protected List<SrvRecord> lookupSrvRecords(String service, String dnsUrls) throw
         };
 
         List<Address> addresses = resolver.getAddresses();
-        assertThat(addresses.size(), is(5));
-        assertThat(addresses.get(0).getHost(), is("alt1.xmpp-server.l.google.com"));
-        assertThat(addresses.get(1).getHost(), is("alt2.xmpp-server.l.google.com"));
-        assertThat(addresses.get(2).getHost(), is("alt3.xmpp-server.l.google.com"));
-        assertThat(addresses.get(3).getHost(), is("alt4.xmpp-server.l.google.com"));
-        assertThat(addresses.get(4).getHost(), is("alt5.xmpp-server.l.google.com"));
+        assertThat(addresses.size()).isEqualTo(5);
+        assertThat(addresses.get(0).getHost()).isEqualTo("alt1.xmpp-server.l.google.com");
+        assertThat(addresses.get(1).getHost()).isEqualTo("alt2.xmpp-server.l.google.com");
+        assertThat(addresses.get(2).getHost()).isEqualTo("alt3.xmpp-server.l.google.com");
+        assertThat(addresses.get(3).getHost()).isEqualTo("alt4.xmpp-server.l.google.com");
+        assertThat(addresses.get(4).getHost()).isEqualTo("alt5.xmpp-server.l.google.com");
     }
 
 }

src/test/java/com/rabbitmq/client/test/FrameBuilderTest.java

@@ -28,11 +28,8 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 /**
  *
@@ -52,10 +49,10 @@ public void buildFrameInOneGo() throws IOException {
         buffer = ByteBuffer.wrap(new byte[] { 1, 0, 0, 0, 0, 0, 3, 1, 2, 3, end() });
         builder = new FrameBuilder(channel, buffer);
         Frame frame = builder.readFrame();
-        assertThat(frame, notNullValue());
-        assertThat(frame.getType(), is(1));
-        assertThat(frame.getChannel(), is(0));
-        assertThat(frame.getPayload().length, is(3));
+        assertThat(frame).isNotNull();
+        assertThat(frame.getType()).isEqualTo(1);
+        assertThat(frame.getChannel()).isEqualTo(0);
+        assertThat(frame.getPayload()).hasSize(3);
     }
 
     @Test
@@ -73,31 +70,31 @@ public void buildFramesInOneGo() throws IOException {
         int frameCount = 0;
         Frame frame;
         while ((frame = builder.readFrame()) != null) {
-            assertThat(frame, notNullValue());
-            assertThat(frame.getType(), is(1));
-            assertThat(frame.getChannel(), is(0));
-            assertThat(frame.getPayload().length, is(3));
+            assertThat(frame).isNotNull();
+            assertThat(frame.getType()).isEqualTo(1);
+            assertThat(frame.getChannel()).isEqualTo(0);
+            assertThat(frame.getPayload()).hasSize(3);
             frameCount++;
         }
-        assertThat(frameCount, is(nbFrames));
+        assertThat(frameCount).isEqualTo(nbFrames);
     }
 
     @Test
     public void buildFrameInSeveralCalls() throws IOException {
         buffer = ByteBuffer.wrap(new byte[] { 1, 0, 0, 0, 0, 0, 3, 1, 2 });
         builder = new FrameBuilder(channel, buffer);
         Frame frame = builder.readFrame();
-        assertThat(frame, nullValue());
+        assertThat(frame).isNull();
 
         buffer.clear();
         buffer.put(b(3)).put(end());
         buffer.flip();
 
         frame = builder.readFrame();
-        assertThat(frame, notNullValue());
-        assertThat(frame.getType(), is(1));
-        assertThat(frame.getChannel(), is(0));
-        assertThat(frame.getPayload().length, is(3));
+        assertThat(frame).isNotNull();
+        assertThat(frame.getType()).isEqualTo(1);
+        assertThat(frame.getChannel()).isEqualTo(0);
+        assertThat(frame.getPayload()).hasSize(3);
     }
 
     @Test
@@ -127,7 +124,7 @@ public void protocolMismatchHeader() throws IOException {
                 builder.readFrame();
                 fail("protocol header not correct, exception should have been thrown");
             } catch (MalformedFrameException e) {
-                assertThat(e.getMessage(), is(messages[i]));
+                assertThat(e.getMessage()).isEqualTo(messages[i]);
             }
         }
     }

src/test/java/com/rabbitmq/client/test/FrameTest.java

@@ -17,8 +17,7 @@
 import java.util.List;
 import java.util.Random;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  *
@@ -72,7 +71,7 @@ private void checkWrittenChunks(int totalFrameSize, AccumulatorWritableByteChann
         for (byte[] chunk : channel.chunks) {
             totalWritten += chunk.length;
         }
-        assertThat(totalWritten, equalTo(totalFrameSize));
+        assertThat(totalWritten).isEqualTo(totalFrameSize);
     }
 
     private static class AccumulatorWritableByteChannel implements WritableByteChannel {