Clean test code

fridujo · Oct 16, 2018 · 782954e · 782954e
1 parent 6e2c9c6
commit 782954e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/src/test/java/com/github/fridujo/rabbitmq/mock/ChannelTest.java b/src/test/java/com/github/fridujo/rabbitmq/mock/ChannelTest.java
@@ -1,14 +1,7 @@
 package com.github.fridujo.rabbitmq.mock;
 
-import com.rabbitmq.client.AMQP;
-import com.rabbitmq.client.BuiltinExchangeType;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.DefaultConsumer;
-import com.rabbitmq.client.Envelope;
-import com.rabbitmq.client.GetResponse;
-import com.rabbitmq.client.ShutdownSignalException;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -18,8 +11,15 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.BuiltinExchangeType;
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.DefaultConsumer;
+import com.rabbitmq.client.Envelope;
+import com.rabbitmq.client.GetResponse;
+import com.rabbitmq.client.ShutdownSignalException;
+import org.junit.jupiter.api.Test;
 
 class ChannelTest {
 
@@ -339,7 +339,7 @@ void basicConsume_with_callbacks() throws IOException, TimeoutException, Interru
 
                 List<String> messages = new ArrayList<>();
                 AtomicBoolean cancelled = new AtomicBoolean();
-                String consumerTag = channel.basicConsume("",
+                channel.basicConsume("",
                     (ct, delivery) -> messages.add(new String(delivery.getBody())),
                     ct -> cancelled.set(true));
 

diff --git a/src/test/java/com/github/fridujo/rabbitmq/mock/MetricsCollectorTest.java b/src/test/java/com/github/fridujo/rabbitmq/mock/MetricsCollectorTest.java
@@ -153,6 +153,7 @@ public void handleDelivery(String consumerTag,
 
                 @Override
                 public void handleCancelOk(String consumerTag) {
+                    // Consumer cancellation is not the purpose of this test
                 }
             });
 

diff --git a/src/test/java/com/github/fridujo/rabbitmq/mock/MockConnectionTest.java b/src/test/java/com/github/fridujo/rabbitmq/mock/MockConnectionTest.java
@@ -1,5 +1,11 @@
 package com.github.fridujo.rabbitmq.mock;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+import java.io.IOException;
+import java.util.UUID;
+
 import com.rabbitmq.client.AlreadyClosedException;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
@@ -8,12 +14,6 @@
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 class MockConnectionTest {
 
     @Test