X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParserTest.java;h=72860012d04ea0c66e8fd0ca495ce8a5e74b47be;hb=6e9a43ccd93ae125720547c0fe421dc81a54ba90;hp=d98d4ec79f4f922e6d900413272150e60669cceb;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2;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 d98d4ec..7286001 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,10 +19,14 @@ 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.core.SoneProvider;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.database.SoneProvider;
 
 /**
  * JUnit test case for {@link SoneTextParser}.
@@ -41,6 +45,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;
@@ -67,6 +72,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;
@@ -93,7 +99,7 @@ public class SoneTextParserTest extends TestCase {
 	 * @throws IOException
 	 *             if an I/O error occurs
 	 */
-	@SuppressWarnings("synthetic-access")
+	@SuppressWarnings({ "synthetic-access", "static-method" })
 	public void testEmptyLinesAndSoneLinks() throws IOException {
 		SoneTextParser soneTextParser = new SoneTextParser(new TestSoneProvider(), null);
 		Iterable<Part> parts;
@@ -104,6 +110,24 @@ public class SoneTextParserTest extends TestCase {
 		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
 	//
@@ -119,7 +143,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);
@@ -131,7 +155,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());
@@ -160,8 +184,8 @@ public class SoneTextParserTest extends TestCase {
 		 * {@inheritDoc}
 		 */
 		@Override
-		public Sone getSone(final String soneId, boolean create) {
-			return new Sone(soneId) {
+		public Optional<Sone> getSone(final String soneId) {
+			return Optional.<Sone> fromNullable(new Sone(soneId, false) {
 
 				/**
 				 * {@inheritDoc}
@@ -170,7 +194,31 @@ public class SoneTextParserTest extends TestCase {
 				public String getName() {
 					return 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;
 		}
 
 	}