X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParserTest.java;h=46eecb790848cbc7ce8fb49b0bf365833a1eb732;hp=0daf94444d247b8cfefa74532a5e3ab941604036;hb=a2369ab3b5b0f3f6dcc9d9fd1fcdc02c3003da64;hpb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae

diff --git a/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java b/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
index 0daf944..46eecb7 100644
--- a/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
+++ b/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
@@ -26,20 +26,21 @@ import static org.hamcrest.Matchers.notNullValue;
 import java.io.IOException;
 import java.util.Collection;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.impl.IdOnlySone;
 import net.pterodactylus.sone.database.PostProvider;
 import net.pterodactylus.sone.database.SoneProvider;
 
-import com.google.common.base.Function;
 import com.google.common.base.Optional;
+import kotlin.jvm.functions.Function1;
 import org.junit.Test;
 
 /**
  * JUnit test case for {@link SoneTextParser}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class SoneTextParserTest {
 
@@ -204,6 +205,23 @@ public class SoneTextParserTest {
 	}
 
 	@Test
+	public void invalidSskAndUskLinkIsParsedAsText() {
+		Iterable<Part> parts = soneTextParser.parse("SSK@a USK@a", null);
+		assertThat("Part Text", convertText(parts), is("SSK@a USK@a"));
+	}
+
+	@Test
+	public void sskWithoutDocumentNameIsParsedCorrectly() {
+		Iterable<Part> parts = soneTextParser.parse(
+				"SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8",
+				null);
+		assertThat("Part Text", convertText(parts),
+				is("[SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8|"
+						+ "SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8|"
+						+ "SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU]"));
+	}
+
+	@Test
 	public void sskLinkWithoutContextIsNotTrusted() {
 		Iterable<Part> parts = soneTextParser.parse("SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test", null);
 		assertThat("Part Text", convertText(parts), is("[SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test|SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test|test]"));
@@ -399,27 +417,24 @@ public class SoneTextParserTest {
 
 	/**
 	 * Mock Sone provider.
-	 *
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
 	private static class TestSoneProvider implements SoneProvider {
 
+		@Nonnull
 		@Override
-		public Function<String, Optional<Sone>> soneLoader() {
-			return new Function<String, Optional<Sone>>() {
+		public Function1<String, Sone> getSoneLoader() {
+			return new Function1<String, Sone>() {
 				@Override
-				public Optional<Sone> apply(String soneId) {
+				public Sone invoke(String soneId) {
 					return getSone(soneId);
 				}
 			};
 		}
 
-		/**
-		 * {@inheritDoc}
-		 */
+		@Nullable
 		@Override
-		public Optional<Sone> getSone(final String soneId) {
-			return Optional.<Sone>of(new IdOnlySone(soneId));
+		public Sone getSone(final String soneId) {
+			return new IdOnlySone(soneId);
 		}
 
 		/**
@@ -451,17 +466,18 @@ public class SoneTextParserTest {
 	private static class AbsentSoneProvider extends TestSoneProvider {
 
 		@Override
-		public Optional<Sone> getSone(String soneId) {
-			return Optional.absent();
+		public Sone getSone(String soneId) {
+			return null;
 		}
 
 	}
 
 	private static class TestPostProvider implements PostProvider {
 
+		@Nullable
 		@Override
-		public Optional<Post> getPost(final String postId) {
-			return Optional.<Post>of(new Post() {
+		public Post getPost(@Nonnull final String postId) {
+			return new Post() {
 				@Override
 				public String getId() {
 					return postId;
@@ -506,7 +522,7 @@ public class SoneTextParserTest {
 				public Post setKnown(boolean known) {
 					return null;
 				}
-			});
+			};
 		}
 
 		@Override
@@ -523,9 +539,10 @@ public class SoneTextParserTest {
 
 	private static class AbsentPostProvider extends TestPostProvider {
 
+		@Nullable
 		@Override
-		public Optional<Post> getPost(String postId) {
-			return Optional.absent();
+		public Post getPost(@Nonnull String postId) {
+			return null;
 		}
 
 	}