♻️ Move TestFcpConnection to its own file

diff --git a/src/test/java/net/pterodactylus/fcp/highlevel/FcpClientTest.java b/src/test/java/net/pterodactylus/fcp/highlevel/FcpClientTest.java
index 29e95f0..02ade9d 100644 (file)
--- a/src/test/java/net/pterodactylus/fcp/highlevel/FcpClientTest.java
+++ b/src/test/java/net/pterodactylus/fcp/highlevel/FcpClientTest.java
@@ -27,6 +27,7 @@ import net.pterodactylus.fcp.ProtocolError;
 import net.pterodactylus.fcp.SSKKeypair;
 import net.pterodactylus.fcp.SimpleProgress;
 import net.pterodactylus.fcp.UnknownNodeIdentifier;
+import net.pterodactylus.fcp.test.TestFcpConnection;
 import org.hamcrest.Matcher;
 import org.junit.Rule;
 import org.junit.Test;
@@ -1027,45 +1028,7 @@ public class FcpClientTest {
        }
 
        private static FcpConnection createFcpConnection(Function<FcpMessage, BiConsumer<FcpListener, FcpConnection>> messageConsumer) {
-               return new FcpConnection() {
-                       private final List<FcpListener> listeners = new ArrayList<>();
-                       private volatile boolean closed = false;
-
-                       @Override
-                       public void addFcpListener(FcpListener fcpListener) {
-                               listeners.add(fcpListener);
-                       }
-
-                       @Override
-                       public void removeFcpListener(FcpListener fcpListener) {
-                               listeners.remove(fcpListener);
-                       }
-
-                       @Override
-                       public boolean isClosed() {
-                               return closed;
-                       }
-
-                       @Override
-                       public void connect() throws IllegalStateException {
-                       }
-
-                       @Override
-                       public void disconnect() {
-                               close();
-                       }
-
-                       @Override
-                       public void close() {
-                               closed = true;
-                       }
-
-                       @Override
-                       public void sendMessage(FcpMessage fcpMessage) {
-                               BiConsumer<FcpListener, FcpConnection> listenerNotifier = messageConsumer.apply(fcpMessage);
-                               listeners.forEach(listener -> new Thread(() -> listenerNotifier.accept(listener, this)).start());
-                       }
-               };
+               return new TestFcpConnection(messageConsumer);
        }
 
        private static Predicate<FcpMessage> named(String name) {

diff --git a/src/test/java/net/pterodactylus/fcp/plugin/WebOfTrustPluginTest.java b/src/test/java/net/pterodactylus/fcp/plugin/WebOfTrustPluginTest.java
index 1063947..96b3398 100644 (file)
--- a/src/test/java/net/pterodactylus/fcp/plugin/WebOfTrustPluginTest.java
+++ b/src/test/java/net/pterodactylus/fcp/plugin/WebOfTrustPluginTest.java
@@ -6,14 +6,13 @@ import net.pterodactylus.fcp.FcpListener;
 import net.pterodactylus.fcp.FcpMessage;
 import net.pterodactylus.fcp.highlevel.FcpClient;
 import net.pterodactylus.fcp.highlevel.FcpException;
+import net.pterodactylus.fcp.test.TestFcpConnection;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -154,53 +153,4 @@ public class WebOfTrustPluginTest {
        @Rule
        public final Timeout timeout = Timeout.seconds(5);
 
-       private static class TestFcpConnection implements FcpConnection {
-
-               public TestFcpConnection(Function<FcpMessage, BiConsumer<FcpListener, FcpConnection>> messageConsumer) {
-                       this.messageConsumer = messageConsumer;
-               }
-
-               @Override
-               public void addFcpListener(FcpListener fcpListener) {
-                       listeners.add(fcpListener);
-               }
-
-               @Override
-               public void removeFcpListener(FcpListener fcpListener) {
-                       listeners.remove(fcpListener);
-               }
-
-               @Override
-               public boolean isClosed() {
-                       return closed;
-               }
-
-               @Override
-               public void connect() throws IllegalStateException {
-               }
-
-               @Override
-               public void disconnect() {
-                       close();
-               }
-
-               @Override
-               public void close() {
-                       closed = true;
-               }
-
-               @Override
-               public void sendMessage(FcpMessage fcpMessage) {
-                       sentMessages.add(fcpMessage);
-                       BiConsumer<FcpListener, FcpConnection> listenerNotifier = messageConsumer.apply(fcpMessage);
-                       listeners.forEach(listener -> new Thread(() -> listenerNotifier.accept(listener, this)).start());
-               }
-
-               private final Function<FcpMessage, BiConsumer<FcpListener, FcpConnection>> messageConsumer;
-               private final List<FcpListener> listeners = new ArrayList<>();
-               private volatile boolean closed = false;
-               private final List<FcpMessage> sentMessages = new ArrayList<>();
-
-       }
-
 }

diff --git a/src/test/java/net/pterodactylus/fcp/test/TestFcpConnection.java b/src/test/java/net/pterodactylus/fcp/test/TestFcpConnection.java
new file mode 100644 (file)
index 0000000..9580a69
--- /dev/null
+++ b/src/test/java/net/pterodactylus/fcp/test/TestFcpConnection.java
@@ -0,0 +1,59 @@
+package net.pterodactylus.fcp.test;
+
+import net.pterodactylus.fcp.FcpConnection;
+import net.pterodactylus.fcp.FcpListener;
+import net.pterodactylus.fcp.FcpMessage;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+public class TestFcpConnection implements FcpConnection {
+
+       public TestFcpConnection(Function<FcpMessage, BiConsumer<FcpListener, FcpConnection>> messageConsumer) {
+               this.messageConsumer = messageConsumer;
+       }
+
+       @Override
+       public void addFcpListener(FcpListener fcpListener) {
+               listeners.add(fcpListener);
+       }
+
+       @Override
+       public void removeFcpListener(FcpListener fcpListener) {
+               listeners.remove(fcpListener);
+       }
+
+       @Override
+       public boolean isClosed() {
+               return closed;
+       }
+
+       @Override
+       public void connect() throws IllegalStateException {
+       }
+
+       @Override
+       public void disconnect() {
+               close();
+       }
+
+       @Override
+       public void close() {
+               closed = true;
+       }
+
+       @Override
+       public void sendMessage(FcpMessage fcpMessage) {
+               sentMessages.add(fcpMessage);
+               BiConsumer<FcpListener, FcpConnection> listenerNotifier = messageConsumer.apply(fcpMessage);
+               listeners.forEach(listener -> new Thread(() -> listenerNotifier.accept(listener, this)).start());
+       }
+
+       private final Function<FcpMessage, BiConsumer<FcpListener, FcpConnection>> messageConsumer;
+       private final List<FcpListener> listeners = new ArrayList<>();
+       private volatile boolean closed = false;
+       public final List<FcpMessage> sentMessages = new ArrayList<>();
+
+}