Merge branch '4.1.x-stable' of github.com:rabbitmq/rabbitmq-java-client into 4.1.x-stable

Author: acogoluegnes

pom.xml

@@ -693,6 +693,12 @@
       <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

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

@@ -32,10 +32,9 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 public class AMQChannelTest {
 

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

@@ -27,10 +27,8 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeoutException;
 
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 public class ChannelRpcTimeoutIntegrationTest {
 

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

@@ -15,8 +15,8 @@
 import java.nio.channels.WritableByteChannel;
 import java.util.*;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 /**
  *

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

@@ -20,10 +20,9 @@
 import com.rabbitmq.client.impl.StandardMetricsCollector;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 /**
  *

src/test/java/com/rabbitmq/client/test/functional/Metrics.java

@@ -32,11 +32,9 @@
 import java.util.Random;
 import java.util.concurrent.*;
 
-import static org.awaitility.Awaitility.waitAtMost;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.awaitility.Awaitility.*;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 /**
  *