X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParserTest.java;h=7b03ba69ac497f35d85a26dc11455630ba5218c4;hb=7da4d587d416bc474a25b08f56aaab7c82dc8351;hp=c805998d697c72c0151d5e70d19776afa0167ecc;hpb=aadf0893d8d3c791d9bb01db8009bb12f06e49c7;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java b/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
index c805998..7b03ba6 100644
--- a/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
+++ b/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneTextParserTest.java - Copyright © 2011–2013 David Roden
+ * Sone - SoneTextParserTest.java - Copyright © 2011–2015 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,17 +18,17 @@
 package net.pterodactylus.sone.text;
 
 import java.io.IOException;
-import java.io.StringReader;
 import java.util.Arrays;
 import java.util.Collection;
 
-import com.google.common.base.Optional;
-
-import junit.framework.TestCase;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.impl.IdOnlySone;
 import net.pterodactylus.sone.database.SoneProvider;
 
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import junit.framework.TestCase;
+
 /**
  * JUnit test case for {@link SoneTextParser}.
  *
@@ -52,17 +52,17 @@ public class SoneTextParserTest extends TestCase {
 		Iterable<Part> parts;
 
 		/* check basic operation. */
-		parts = soneTextParser.parse(null, new StringReader("Test."));
+		parts = soneTextParser.parse("Test.", null);
 		assertNotNull("Parts", parts);
 		assertEquals("Part Text", "Test.", convertText(parts, PlainTextPart.class));
 
 		/* check empty lines at start and end. */
-		parts = soneTextParser.parse(null, new StringReader("\nTest.\n\n"));
+		parts = soneTextParser.parse("\nTest.\n\n", null);
 		assertNotNull("Parts", parts);
 		assertEquals("Part Text", "Test.", convertText(parts, PlainTextPart.class));
 
 		/* check duplicate empty lines in the text. */
-		parts = soneTextParser.parse(null, new StringReader("\nTest.\n\n\nTest."));
+		parts = soneTextParser.parse("\nTest.\n\n\nTest.", null);
 		assertNotNull("Parts", parts);
 		assertEquals("Part Text", "Test.\n\nTest.", convertText(parts, PlainTextPart.class));
 	}
@@ -79,17 +79,17 @@ public class SoneTextParserTest extends TestCase {
 		Iterable<Part> parts;
 
 		/* check basic links. */
-		parts = soneTextParser.parse(null, new StringReader("KSK@gpl.txt"));
+		parts = soneTextParser.parse("KSK@gpl.txt", null);
 		assertNotNull("Parts", parts);
 		assertEquals("Part Text", "[KSK@gpl.txt|gpl.txt|gpl.txt]", convertText(parts, FreenetLinkPart.class));
 
 		/* check embedded links. */
-		parts = soneTextParser.parse(null, new StringReader("Link is KSK@gpl.txt\u200b."));
+		parts = soneTextParser.parse("Link is KSK@gpl.txt\u200b.", null);
 		assertNotNull("Parts", parts);
 		assertEquals("Part Text", "Link is [KSK@gpl.txt|gpl.txt|gpl.txt]\u200b.", convertText(parts, PlainTextPart.class, FreenetLinkPart.class));
 
 		/* check embedded links and line breaks. */
-		parts = soneTextParser.parse(null, new StringReader("Link is KSK@gpl.txt\nKSK@test.dat\n"));
+		parts = soneTextParser.parse("Link is KSK@gpl.txt\nKSK@test.dat\n", null);
 		assertNotNull("Parts", parts);
 		assertEquals("Part Text", "Link is [KSK@gpl.txt|gpl.txt|gpl.txt]\n[KSK@test.dat|test.dat|test.dat]", convertText(parts, PlainTextPart.class, FreenetLinkPart.class));
 	}
@@ -106,7 +106,7 @@ public class SoneTextParserTest extends TestCase {
 		Iterable<Part> parts;
 
 		/* check basic links. */
-		parts = soneTextParser.parse(null, new StringReader("Some text.\n\nLink to sone://DAxKQzS48mtaQc7sUVHIgx3fnWZPQBz0EueBreUVWrU and stuff."));
+		parts = soneTextParser.parse("Some text.\n\nLink to sone://DAxKQzS48mtaQc7sUVHIgx3fnWZPQBz0EueBreUVWrU and stuff.", null);
 		assertNotNull("Parts", parts);
 		assertEquals("Part Text", "Some text.\n\nLink to [Sone|DAxKQzS48mtaQc7sUVHIgx3fnWZPQBz0EueBreUVWrU] and stuff.", convertText(parts, PlainTextPart.class, SonePart.class));
 	}
@@ -124,7 +124,7 @@ public class SoneTextParserTest extends TestCase {
 		Iterable<Part> parts;
 
 		/* check empty http links. */
-		parts = soneTextParser.parse(null, new StringReader("Some text. Empty link: http:// – nice!"));
+		parts = soneTextParser.parse("Some text. Empty link: http:// – nice!", null);
 		assertNotNull("Parts", parts);
 		assertEquals("Part Text", "Some text. Empty link: http:// – nice!", convertText(parts, PlainTextPart.class));
 	}
@@ -181,6 +181,16 @@ public class SoneTextParserTest extends TestCase {
 	 */
 	private static class TestSoneProvider implements SoneProvider {
 
+		@Override
+		public Function<String, Optional<Sone>> soneLoader() {
+			return new Function<String, Optional<Sone>>() {
+				@Override
+				public Optional<Sone> apply(String soneId) {
+					return getSone(soneId);
+				}
+			};
+		}
+
 		/**
 		 * {@inheritDoc}
 		 */