From 8a6efbfb639dea6c707dfe26aafcb6c5029dda9a Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Thu, 14 Nov 2013 06:30:03 +0100
Subject: [PATCH] Move InputStream matcher to Matchers.

---
 src/test/java/net/pterodactylus/sone/Matchers.java | 40 ++++++++++++++++++++
 .../pterodactylus/sone/fcp/FcpInterfaceTest.java   | 43 +---------------------
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/src/test/java/net/pterodactylus/sone/Matchers.java b/src/test/java/net/pterodactylus/sone/Matchers.java
index c08ffb1..8873278 100644
--- a/src/test/java/net/pterodactylus/sone/Matchers.java
+++ b/src/test/java/net/pterodactylus/sone/Matchers.java
@@ -20,6 +20,8 @@ package net.pterodactylus.sone;
 import static java.util.Arrays.asList;
 import static java.util.regex.Pattern.compile;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -112,4 +114,42 @@ public class Matchers {
 		};
 	}
 
+	public static Matcher<InputStream> delivers(final byte[] data) {
+		return new TypeSafeMatcher<InputStream>() {
+			byte[] readData = new byte[data.length];
+
+			@Override
+			protected boolean matchesSafely(InputStream inputStream) {
+				int offset = 0;
+				try {
+					while (true) {
+						int r = inputStream.read();
+						if (r == -1) {
+							return offset == data.length;
+						}
+						if (offset == data.length) {
+							return false;
+						}
+						if (data[offset] != (readData[offset] = (byte) r)) {
+							return false;
+						}
+						offset++;
+					}
+				} catch (IOException ioe1) {
+					return false;
+				}
+			}
+
+			@Override
+			public void describeTo(Description description) {
+				description.appendValue(data);
+			}
+
+			@Override
+			protected void describeMismatchSafely(InputStream item, Description mismatchDescription) {
+				mismatchDescription.appendValue(readData);
+			}
+		};
+	}
+
 }
diff --git a/src/test/java/net/pterodactylus/sone/fcp/FcpInterfaceTest.java b/src/test/java/net/pterodactylus/sone/fcp/FcpInterfaceTest.java
index bbbf509..78b2591 100644
--- a/src/test/java/net/pterodactylus/sone/fcp/FcpInterfaceTest.java
+++ b/src/test/java/net/pterodactylus/sone/fcp/FcpInterfaceTest.java
@@ -20,6 +20,7 @@ package net.pterodactylus.sone.fcp;
 import static freenet.pluginmanager.FredPluginFCP.ACCESS_DIRECT;
 import static freenet.pluginmanager.FredPluginFCP.ACCESS_FCP_FULL;
 import static freenet.pluginmanager.FredPluginFCP.ACCESS_FCP_RESTRICTED;
+import static net.pterodactylus.sone.Matchers.delivers;
 import static net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.ALWAYS;
 import static net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.NO;
 import static net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.WRITING;
@@ -30,7 +31,6 @@ import static org.hamcrest.Matchers.notNullValue;
 import static org.mockito.Mockito.mock;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 
 import net.pterodactylus.sone.core.Core;
@@ -44,9 +44,6 @@ import freenet.support.api.Bucket;
 import freenet.support.io.ArrayBucket;
 
 import com.google.common.collect.Lists;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
 import org.junit.Test;
 
 /**
@@ -302,44 +299,6 @@ public class FcpInterfaceTest {
 		assertThat(pluginReplySender.results.get(0).bucket.getInputStream(), delivers(new byte[] { 4, 5, 6 }));
 	}
 
-	private Matcher<InputStream> delivers(final byte[] data) {
-		return new TypeSafeMatcher<InputStream>() {
-			byte[] readData = new byte[data.length];
-
-			@Override
-			protected boolean matchesSafely(InputStream inputStream) {
-				int offset = 0;
-				try {
-					while (true) {
-						int r = inputStream.read();
-						if (r == -1) {
-							return offset == data.length;
-						}
-						if (offset == data.length) {
-							return false;
-						}
-						if (data[offset] != (readData[offset] = (byte) r)) {
-							return false;
-						}
-						offset++;
-					}
-				} catch (IOException ioe1) {
-					return false;
-				}
-			}
-
-			@Override
-			public void describeTo(Description description) {
-				description.appendValue(data);
-			}
-
-			@Override
-			protected void describeMismatchSafely(InputStream item, Description mismatchDescription) {
-				mismatchDescription.appendValue(readData);
-			}
-		};
-	}
-
 	private void verifyError() {
 		assertThat(pluginReplySender.results, hasSize(1));
 		assertThat(pluginReplySender.results.get(0).fieldSet, notNullValue());
-- 
2.7.4