X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fquelaton%2FDefaultFcpClientTest.java;h=557350b1a109790abfcc860a86cb8c7821af59f4;hb=be6c1651ce3c53daa254fb2dbce9221450d381e8;hp=78aa52a1112d95263b657cb79b1ded4b7c04e66e;hpb=8896f7ed90fe70b0f1f918bb791f094be1b2ebdb;p=jFCPlib.git

diff --git a/src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java b/src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java
index 78aa52a..557350b 100644
--- a/src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java
+++ b/src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java
@@ -2126,14 +2126,8 @@ public class DefaultFcpClientTest {
 				public void failedLoad() throws ExecutionException, InterruptedException, IOException {
 					Future<Optional<PluginInfo>> pluginInfo =
 						fcpClient.loadPlugin().officialFromFreenet("superPlugin").execute();
-					connectNode();
-					List<String> lines = fcpServer.collectUntil(is("EndMessage"));
-					String identifier = extractIdentifier(lines);
-					fcpServer.writeLine(
-						"ProtocolError",
-						"Identifier=" + identifier,
-						"EndMessage"
-					);
+					connectAndAssert(() -> matchesFcpMessage("LoadPlugin", "EndMessage"));
+					replyWithProtocolError();
 					assertThat(pluginInfo.get().isPresent(), is(false));
 				}
 
@@ -2141,6 +2135,14 @@ public class DefaultFcpClientTest {
 
 		}
 
+		private void replyWithProtocolError() throws IOException {
+			fcpServer.writeLine(
+				"ProtocolError",
+				"Identifier=" + identifier,
+				"EndMessage"
+			);
+		}
+
 		public class ReloadPlugin {
 
 			@Test
@@ -2260,6 +2262,16 @@ public class DefaultFcpClientTest {
 				verifyPluginInfo(pluginInfo);
 			}
 
+			@Test
+			public void protocolErrorIsRecognizedAsFailure()
+			throws InterruptedException, ExecutionException, IOException {
+				Future<Optional<PluginInfo>> pluginInfo =
+					fcpClient.getPluginInfo().detailed().plugin(CLASS_NAME).execute();
+				connectAndAssert(() -> allOf(matchGetPluginInfoMessage(), hasItem("Detailed=true")));
+				replyWithProtocolError();
+				assertThat(pluginInfo.get(), is(Optional.empty()));
+			}
+
 			private Matcher<List<String>> matchGetPluginInfoMessage() {
 				return matchesFcpMessage(
 					"GetPluginInfo",