From 4bb17187f028f9fa7e311a305c601d99c3403331 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Wed, 8 Jan 2025 07:40:33 +0100 Subject: [PATCH] =?utf8?q?=E2=99=BB=EF=B8=8F=20Move=20TestFcpConnection=20?= =?utf8?q?to=20its=20own=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../pterodactylus/fcp/highlevel/FcpClientTest.java | 41 +-------------- .../fcp/plugin/WebOfTrustPluginTest.java | 52 +------------------ .../pterodactylus/fcp/test/TestFcpConnection.java | 59 ++++++++++++++++++++++ 3 files changed, 62 insertions(+), 90 deletions(-) create mode 100644 src/test/java/net/pterodactylus/fcp/test/TestFcpConnection.java 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 --- 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> messageConsumer) { - return new FcpConnection() { - private final List 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 listenerNotifier = messageConsumer.apply(fcpMessage); - listeners.forEach(listener -> new Thread(() -> listenerNotifier.accept(listener, this)).start()); - } - }; + return new TestFcpConnection(messageConsumer); } private static Predicate 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 --- 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> 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 listenerNotifier = messageConsumer.apply(fcpMessage); - listeners.forEach(listener -> new Thread(() -> listenerNotifier.accept(listener, this)).start()); - } - - private final Function> messageConsumer; - private final List listeners = new ArrayList<>(); - private volatile boolean closed = false; - private final List 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 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> 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 listenerNotifier = messageConsumer.apply(fcpMessage); + listeners.forEach(listener -> new Thread(() -> listenerNotifier.accept(listener, this)).start()); + } + + private final Function> messageConsumer; + private final List listeners = new ArrayList<>(); + private volatile boolean closed = false; + public final List sentMessages = new ArrayList<>(); + +} -- 2.7.4