From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Wed, 4 Oct 2017 20:09:00 +0000 (+0200)
Subject: Merge remote-tracking branch 'meteorite/next' into next
X-Git-Tag: v0.1.6^2~2
X-Git-Url: https://git.pterodactylus.net/?p=jFCPlib.git;a=commitdiff_plain;h=0a7a6f78d22d3057053c4bc4f6dd7a9bedb583e1;hp=43c9b2ad0e27b4b0bd90c2189f7791f8d8ae5a1a

Merge remote-tracking branch 'meteorite/next' into next
---

diff --git a/pom.xml b/pom.xml
index 26dbf4c..837695d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.pterodactylus</groupId>
 	<artifactId>jFCPlib</artifactId>
-	<version>0.1.4</version>
+	<version>0.1.6-SNAPSHOT</version>
 	<name>jFCPlib</name>
 	<packaging>jar</packaging>
 	<distributionManagement>
diff --git a/src/main/java/net/pterodactylus/fcp/FcpConnection.java b/src/main/java/net/pterodactylus/fcp/FcpConnection.java
index fbc2c13..3331bdf 100644
--- a/src/main/java/net/pterodactylus/fcp/FcpConnection.java
+++ b/src/main/java/net/pterodactylus/fcp/FcpConnection.java
@@ -290,7 +290,7 @@ public class FcpConnection implements Closeable {
 		} else if ("UnknownNodeIdentifier".equals(messageName)) {
 			fcpListenerManager.fireReceivedUnknownNodeIdentifier(new UnknownNodeIdentifier(fcpMessage));
 		} else if ("FCPPluginReply".equals(messageName)) {
-			InputStream payloadInputStream = getInputStream(FcpUtils.safeParseLong(fcpMessage.getField("DataLength")));
+			InputStream payloadInputStream = getInputStream(FcpUtils.safeParseLong(fcpMessage.getField("DataLength"), 0));
 			fcpListenerManager.fireReceivedFCPPluginReply(new FCPPluginReply(fcpMessage, payloadInputStream));
 		} else if ("PluginInfo".equals(messageName)) {
 			fcpListenerManager.fireReceivedPluginInfo(new PluginInfo(fcpMessage));
diff --git a/src/main/java/net/pterodactylus/fcp/WatchFeeds.java b/src/main/java/net/pterodactylus/fcp/WatchFeeds.java
new file mode 100644
index 0000000..e71df53
--- /dev/null
+++ b/src/main/java/net/pterodactylus/fcp/WatchFeeds.java
@@ -0,0 +1,15 @@
+package net.pterodactylus.fcp;
+
+/**
+ * Implementation of the “WatchFeeds” command.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class WatchFeeds extends FcpMessage {
+
+	public WatchFeeds(boolean enabled) {
+		super("WatchFeeds");
+		setField("Enabled", String.valueOf(enabled));
+	}
+
+}
diff --git a/src/test/java/net/pterodactylus/fcp/AbstractFcpMessageTest.java b/src/test/java/net/pterodactylus/fcp/AbstractFcpMessageTest.java
new file mode 100644
index 0000000..d5c9d24
--- /dev/null
+++ b/src/test/java/net/pterodactylus/fcp/AbstractFcpMessageTest.java
@@ -0,0 +1,21 @@
+package net.pterodactylus.fcp;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Base test for all tests that verify a message’s appearance.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class AbstractFcpMessageTest {
+
+	protected List<String> encodeMessage(FcpMessage fcpMessage) throws Exception {
+		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+		fcpMessage.write(outputStream);
+		return Arrays.asList(outputStream.toString().split("\r?\n"));
+	}
+
+}
diff --git a/src/test/java/net/pterodactylus/fcp/FcpMessageTest.java b/src/test/java/net/pterodactylus/fcp/FcpMessageTest.java
index bc0dbd1..e2b9fcf 100644
--- a/src/test/java/net/pterodactylus/fcp/FcpMessageTest.java
+++ b/src/test/java/net/pterodactylus/fcp/FcpMessageTest.java
@@ -4,8 +4,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
@@ -15,16 +13,14 @@ import org.junit.Test;
  *
  * @author <a href="mailto:david.roden@bietr.de">David Roden</a>
  */
-public class FcpMessageTest {
+public class FcpMessageTest extends AbstractFcpMessageTest {
 
 	private final FcpMessage fcpMessage = new FcpMessage("TestMessage");
 
 	@Test
 	public void fcpMessageWithPayloadIsTerminatedByData() throws Exception {
 		fcpMessage.setPayloadInputStream(new ByteArrayInputStream("Test".getBytes()));
-		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-		fcpMessage.write(outputStream);
-		List<String> lines = Arrays.asList(outputStream.toString().split("\r?\n"));
+		List<String> lines = encodeMessage(fcpMessage);
 		assertThat(lines, contains(
 			"TestMessage",
 			"Data",
diff --git a/src/test/java/net/pterodactylus/fcp/WatchFeedsTest.java b/src/test/java/net/pterodactylus/fcp/WatchFeedsTest.java
new file mode 100644
index 0000000..e4bedfe
--- /dev/null
+++ b/src/test/java/net/pterodactylus/fcp/WatchFeedsTest.java
@@ -0,0 +1,35 @@
+package net.pterodactylus.fcp;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+
+import org.junit.Test;
+
+/**
+ * Unit test for {@link WatchFeeds}.
+ *
+ * @author <a href="mailto:david.roden@bietr.de">David Roden</a>
+ */
+public class WatchFeedsTest extends AbstractFcpMessageTest {
+
+	@Test
+	public void enablingWatchFeedsSendsCorrectOutput() throws Exception {
+		WatchFeeds watchFeeds = new WatchFeeds(true);
+		assertThat(encodeMessage(watchFeeds), contains(
+			"WatchFeeds",
+			"Enabled=true",
+			"EndMessage"
+		));
+	}
+
+	@Test
+	public void disablingWatchFeedsSendsCorrectOutput() throws Exception {
+		WatchFeeds watchFeeds = new WatchFeeds(false);
+		assertThat(encodeMessage(watchFeeds), contains(
+			"WatchFeeds",
+			"Enabled=false",
+			"EndMessage"
+		));
+	}
+
+}