X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParserTest.java;h=2ac6db7b6a7cd985ea1215cd19cd4163fcd9f372;hp=0343f05dcf3870b7039212c9ee5b33054e9a9e8d;hb=b9281ba712aac6ea70b7dc217607608ae80b594d;hpb=7e5975ac5bde98002c55d2743614a4806f5f0713

diff --git a/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java b/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
index 0343f05..2ac6db7 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 David Roden
+ * Sone - SoneTextParserTest.java - Copyright © 2011–2013 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
@@ -19,7 +19,15 @@ package net.pterodactylus.sone.text;
 
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.Arrays;
+import java.util.Collection;
 
+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;
 
 /**
@@ -39,6 +47,7 @@ public class SoneTextParserTest extends TestCase {
 	 * @throws IOException
 	 *             if an I/O error occurs
 	 */
+	@SuppressWarnings("static-method")
 	public void testPlainText() throws IOException {
 		SoneTextParser soneTextParser = new SoneTextParser(null, null);
 		Iterable<Part> parts;
@@ -65,6 +74,7 @@ public class SoneTextParserTest extends TestCase {
 	 * @throws IOException
 	 *             if an I/O error occurs
 	 */
+	@SuppressWarnings("static-method")
 	public void testKSKLinks() throws IOException {
 		SoneTextParser soneTextParser = new SoneTextParser(null, null);
 		Iterable<Part> parts;
@@ -85,6 +95,41 @@ public class SoneTextParserTest extends TestCase {
 		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));
 	}
 
+	/**
+	 * Test case for a bug that was discovered in 0.6.7.
+	 *
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 */
+	@SuppressWarnings({ "synthetic-access", "static-method" })
+	public void testEmptyLinesAndSoneLinks() throws IOException {
+		SoneTextParser soneTextParser = new SoneTextParser(new TestSoneProvider(), null);
+		Iterable<Part> parts;
+
+		/* check basic links. */
+		parts = soneTextParser.parse(null, new StringReader("Some text.\n\nLink to sone://DAxKQzS48mtaQc7sUVHIgx3fnWZPQBz0EueBreUVWrU and stuff."));
+		assertNotNull("Parts", parts);
+		assertEquals("Part Text", "Some text.\n\nLink to [Sone|DAxKQzS48mtaQc7sUVHIgx3fnWZPQBz0EueBreUVWrU] and stuff.", convertText(parts, PlainTextPart.class, SonePart.class));
+	}
+
+	/**
+	 * Test for a bug discovered in Sone 0.8.4 where a plain “http://” would be
+	 * parsed into a link.
+	 *
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 */
+	@SuppressWarnings({ "synthetic-access", "static-method" })
+	public void testEmpyHttpLinks() throws IOException {
+		SoneTextParser soneTextParser = new SoneTextParser(new TestSoneProvider(), null);
+		Iterable<Part> parts;
+
+		/* check empty http links. */
+		parts = soneTextParser.parse(null, new StringReader("Some text. Empty link: http:// – nice!"));
+		assertNotNull("Parts", parts);
+		assertEquals("Part Text", "Some text. Empty link: http:// – nice!", convertText(parts, PlainTextPart.class));
+	}
+
 	//
 	// PRIVATE METHODS
 	//
@@ -100,7 +145,7 @@ public class SoneTextParserTest extends TestCase {
 	 *            valid
 	 * @return The converted text
 	 */
-	private String convertText(Iterable<Part> parts, Class<?>... validClasses) {
+	private static String convertText(Iterable<Part> parts, Class<?>... validClasses) {
 		StringBuilder text = new StringBuilder();
 		for (Part part : parts) {
 			assertNotNull("Part", part);
@@ -112,7 +157,7 @@ public class SoneTextParserTest extends TestCase {
 				}
 			}
 			if (!classValid) {
-				assertEquals("Part’s Class", null, part.getClass());
+				fail("Part’s Class (" + part.getClass() + ") is not one of " + Arrays.toString(validClasses));
 			}
 			if (part instanceof PlainTextPart) {
 				text.append(((PlainTextPart) part).getText());
@@ -122,9 +167,63 @@ public class SoneTextParserTest extends TestCase {
 			} else if (part instanceof LinkPart) {
 				LinkPart linkPart = (LinkPart) part;
 				text.append('[').append(linkPart.getLink()).append('|').append(linkPart.getTitle()).append('|').append(linkPart.getText()).append(']');
+			} else if (part instanceof SonePart) {
+				SonePart sonePart = (SonePart) part;
+				text.append("[Sone|").append(sonePart.getSone().getId()).append(']');
 			}
 		}
 		return text.toString();
 	}
 
+	/**
+	 * Mock Sone provider.
+	 *
+	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+	 */
+	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}
+		 */
+		@Override
+		public Optional<Sone> getSone(final String soneId) {
+			return Optional.<Sone>of(new IdOnlySone(soneId));
+		}
+
+		/**
+		 * {@inheritDocs}
+		 */
+		@Override
+		public Collection<Sone> getSones() {
+			return null;
+		}
+
+		/**
+		 * {@inheritDocs}
+		 */
+		@Override
+		public Collection<Sone> getLocalSones() {
+			return null;
+		}
+
+		/**
+		 * {@inheritDocs}
+		 */
+		@Override
+		public Collection<Sone> getRemoteSones() {
+			return null;
+		}
+
+	}
+
 }