X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParserTest.java;h=e763a20959bad2c271e46c2a5e31149cde8d24d2;hb=081a7b1344574efb641fe925088e4eb975e2e47e;hp=6483171071f9f90732a4c56b52e9d0fd91e958b2;hpb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;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 6483171..e763a20 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â2016 David Roden
+ * Sone - SoneTextParserTest.java - Copyright © 2011â2019 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
@@ -17,6 +17,7 @@
package net.pterodactylus.sone.text;
+import static java.lang.String.format;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.isIn;
@@ -25,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 David âBombeâ Roden
*/
public class SoneTextParserTest {
@@ -49,17 +51,14 @@ public class SoneTextParserTest {
public void testPlainText() throws IOException {
/* check basic operation. */
Iterable parts = soneTextParser.parse("Test.", null);
- assertThat("Parts", parts, notNullValue());
assertThat("Part Text", convertText(parts, PlainTextPart.class), is("Test."));
/* check empty lines at start and end. */
parts = soneTextParser.parse("\nTest.\n\n", null);
- assertThat("Parts", parts, notNullValue());
assertThat("Part Text", convertText(parts, PlainTextPart.class), is("Test."));
/* check duplicate empty lines in the text. */
parts = soneTextParser.parse("\nTest.\n\n\nTest.", null);
- assertThat("Parts", parts, notNullValue());
assertThat("Part Text", convertText(parts, PlainTextPart.class), is("Test.\n\nTest."));
}
@@ -72,13 +71,13 @@ public class SoneTextParserTest {
@Test
public void freenetLinksHaveTheFreenetPrefixRemoved() {
Iterable parts = soneTextParser.parse("freenet:KSK@gpl.txt", null);
- assertThat("Part Text", convertText(parts), is("[KSK@gpl.txt|gpl.txt|gpl.txt]"));
+ assertThat("Part Text", convertText(parts), is("[KSK@gpl.txt|KSK@gpl.txt|gpl.txt]"));
}
@Test
public void onlyTheFirstItemInALineIsPrefixedWithALineBreak() {
Iterable parts = soneTextParser.parse("Text.\nKSK@gpl.txt and KSK@gpl.txt", null);
- assertThat("Part Text", convertText(parts), is("Text.\n[KSK@gpl.txt|gpl.txt|gpl.txt] and [KSK@gpl.txt|gpl.txt|gpl.txt]"));
+ assertThat("Part Text", convertText(parts), is("Text.\n[KSK@gpl.txt|KSK@gpl.txt|gpl.txt] and [KSK@gpl.txt|KSK@gpl.txt|gpl.txt]"));
}
@Test
@@ -95,6 +94,13 @@ public class SoneTextParserTest {
}
@Test
+ public void soneAndPostCanBeParsedFromTheSameText() {
+ SoneTextParser parser = new SoneTextParser(new TestSoneProvider(), new TestPostProvider());
+ Iterable parts = parser.parse("Text sone://DAxKQzS48mtaQc7sUVHIgx3fnWZPQBz0EueBreUVWrU more text post://f3757817-b45a-497a-803f-9c5aafc10dc6 even more text", null);
+ assertThat("Part Text", convertText(parts), is("Text [Sone|DAxKQzS48mtaQc7sUVHIgx3fnWZPQBz0EueBreUVWrU] more text [Post|f3757817-b45a-497a-803f-9c5aafc10dc6|text] even more text"));
+ }
+
+ @Test
public void postLinkIsRenderedAsPlainTextIfPostIdIsTooShort() {
Iterable parts = soneTextParser.parse("post://too-short", null);
assertThat("Part Text", convertText(parts), is("post://too-short"));
@@ -116,26 +122,26 @@ public class SoneTextParserTest {
@Test
public void nameOfFreenetLinkDoesNotContainUrlParameters() {
- Iterable parts = soneTextParser.parse("KSK@gpl.txt?max-size=12345", null);
- assertThat("Part Text", convertText(parts), is("[KSK@gpl.txt?max-size=12345|gpl.txt|gpl.txt]"));
+ Iterable parts = soneTextParser.parse("KSK@gpl.txt?max-size=12345", null);
+ assertThat("Part Text", convertText(parts), is("[KSK@gpl.txt?max-size=12345|KSK@gpl.txt|gpl.txt]"));
}
@Test
public void trailingSlashInFreenetLinkIsRemovedForName() {
Iterable parts = soneTextParser.parse("KSK@gpl.txt/", null);
- assertThat("Part Text", convertText(parts), is("[KSK@gpl.txt/|gpl.txt|gpl.txt]"));
+ assertThat("Part Text", convertText(parts), is("[KSK@gpl.txt/|KSK@gpl.txt/|gpl.txt]"));
}
@Test
public void lastMetaStringOfFreenetLinkIsUsedAsName() {
Iterable parts = soneTextParser.parse("CHK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/COPYING", null);
- assertThat("Part Text", convertText(parts), is("[CHK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/COPYING|COPYING|COPYING]"));
+ assertThat("Part Text", convertText(parts), is("[CHK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/COPYING|CHK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/COPYING|COPYING]"));
}
@Test
public void freenetLinkWithoutMetaStringsAndDocNameGetsFirstNineCharactersOfKeyAsName() {
Iterable parts = soneTextParser.parse("CHK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8", null);
- assertThat("Part Text", convertText(parts), is("[CHK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8|CHK@qM1nm|CHK@qM1nm]"));
+ assertThat("Part Text", convertText(parts), is("[CHK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8|CHK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8|CHK@qM1nm]"));
}
@Test
@@ -147,43 +153,43 @@ public class SoneTextParserTest {
@Test
public void httpsLinkHasItsPathsShortened() {
Iterable parts = soneTextParser.parse("https://test.test/some-long-path/file.txt", null);
- assertThat("Part Text", convertText(parts), is("[https://test.test/some-long-path/file.txt|test.test/â¦/file.txt|test.test/â¦/file.txt]"));
+ assertThat("Part Text", convertText(parts), is("[https://test.test/some-long-path/file.txt|https://test.test/some-long-path/file.txt|test.test/â¦/file.txt]"));
}
@Test
public void httpLinksHaveTheirLastSlashRemoved() {
- Iterable parts = soneTextParser.parse("http://test.test/test/", null);
- assertThat("Part Text", convertText(parts), is("[http://test.test/test/|test.test/â¦|test.test/â¦]"));
+ Iterable parts = soneTextParser.parse("http://test.test/test/", null);
+ assertThat("Part Text", convertText(parts), is("[http://test.test/test/|http://test.test/test/|test.test/â¦]"));
}
@Test
public void wwwPrefixIsRemovedForHostnameWithTwoDotsAndNoPath() {
Iterable parts = soneTextParser.parse("http://www.test.test", null);
- assertThat("Part Text", convertText(parts), is("[http://www.test.test|test.test|test.test]"));
+ assertThat("Part Text", convertText(parts), is("[http://www.test.test|http://www.test.test|test.test]"));
}
@Test
public void wwwPrefixIsRemovedForHostnameWithTwoDotsAndAPath() {
Iterable parts = soneTextParser.parse("http://www.test.test/test.html", null);
- assertThat("Part Text", convertText(parts), is("[http://www.test.test/test.html|test.test/test.html|test.test/test.html]"));
+ assertThat("Part Text", convertText(parts), is("[http://www.test.test/test.html|http://www.test.test/test.html|test.test/test.html]"));
}
@Test
public void hostnameIsKeptIntactIfNotBeginningWithWww() {
Iterable parts = soneTextParser.parse("http://test.test.test/test.html", null);
- assertThat("Part Text", convertText(parts), is("[http://test.test.test/test.html|test.test.test/test.html|test.test.test/test.html]"));
+ assertThat("Part Text", convertText(parts), is("[http://test.test.test/test.html|http://test.test.test/test.html|test.test.test/test.html]"));
}
@Test
public void hostnameWithOneDotButNoSlashIsKeptIntact() {
Iterable parts = soneTextParser.parse("http://test.test", null);
- assertThat("Part Text", convertText(parts), is("[http://test.test|test.test|test.test]"));
+ assertThat("Part Text", convertText(parts), is("[http://test.test|http://test.test|test.test]"));
}
@Test
public void urlParametersAreRemovedForHttpLinks() {
Iterable parts = soneTextParser.parse("http://test.test?foo=bar", null);
- assertThat("Part Text", convertText(parts), is("[http://test.test?foo=bar|test.test|test.test]"));
+ assertThat("Part Text", convertText(parts), is("[http://test.test?foo=bar|http://test.test?foo=bar|test.test]"));
}
@Test
@@ -199,37 +205,54 @@ public class SoneTextParserTest {
}
@Test
+ public void invalidSskAndUskLinkIsParsedAsText() {
+ Iterable parts = soneTextParser.parse("SSK@a USK@a", null);
+ assertThat("Part Text", convertText(parts), is("SSK@a USK@a"));
+ }
+
+ @Test
+ public void sskWithoutDocumentNameIsParsedCorrectly() {
+ Iterable 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 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|test|test]"));
+ 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]"));
}
@Test
public void sskLinkWithContextWithoutSoneIsNotTrusted() {
SoneTextParserContext context = new SoneTextParserContext(null);
Iterable parts = soneTextParser.parse("SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test", context);
- assertThat("Part Text", convertText(parts), is("[SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test|test|test]"));
+ 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]"));
}
@Test
public void sskLinkWithContextWithDifferentSoneIsNotTrusted() {
SoneTextParserContext context = new SoneTextParserContext(new IdOnlySone("DAxKQzS48mtaQc7sUVHIgx3fnWZPQBz0EueBreUVWrU"));
Iterable parts = soneTextParser.parse("SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test", context);
- assertThat("Part Text", convertText(parts), is("[SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test|test|test]"));
+ 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]"));
}
@Test
public void sskLinkWithContextWithCorrectSoneIsTrusted() {
SoneTextParserContext context = new SoneTextParserContext(new IdOnlySone("qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU"));
Iterable parts = soneTextParser.parse("SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test", context);
- assertThat("Part Text", convertText(parts), is("[SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test|trusted|test|test]"));
+ assertThat("Part Text", convertText(parts), is("[SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test|trusted|SSK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test|test]"));
}
@Test
public void uskLinkWithContextWithCorrectSoneIsTrusted() {
SoneTextParserContext context = new SoneTextParserContext(new IdOnlySone("qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU"));
Iterable parts = soneTextParser.parse("USK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test/0", context);
- assertThat("Part Text", convertText(parts), is("[USK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test/0|trusted|test|test]"));
+ assertThat("Part Text", convertText(parts), is("[USK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test/0|trusted|USK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test/0|test]"));
}
@SuppressWarnings("static-method")
@@ -237,18 +260,15 @@ public class SoneTextParserTest {
public void testKSKLinks() throws IOException {
/* check basic links. */
Iterable parts = soneTextParser.parse("KSK@gpl.txt", null);
- assertThat("Parts", parts, notNullValue());
- assertThat("Part Text", convertText(parts, FreenetLinkPart.class), is("[KSK@gpl.txt|gpl.txt|gpl.txt]"));
+ assertThat("Part Text", convertText(parts, FreenetLinkPart.class), is("[KSK@gpl.txt|KSK@gpl.txt|gpl.txt]"));
/* check embedded links. */
parts = soneTextParser.parse("Link is KSK@gpl.txt\u200b.", null);
- assertThat("Parts", parts, notNullValue());
- assertThat("Part Text", convertText(parts, PlainTextPart.class, FreenetLinkPart.class), is("Link is [KSK@gpl.txt|gpl.txt|gpl.txt]\u200b."));
+ assertThat("Part Text", convertText(parts, PlainTextPart.class, FreenetLinkPart.class), is("Link is [KSK@gpl.txt|KSK@gpl.txt|gpl.txt]\u200b."));
/* check embedded links and line breaks. */
parts = soneTextParser.parse("Link is KSK@gpl.txt\nKSK@test.dat\n", null);
- assertThat("Parts", parts, notNullValue());
- assertThat("Part Text", convertText(parts, PlainTextPart.class, FreenetLinkPart.class), is("Link is [KSK@gpl.txt|gpl.txt|gpl.txt]\n[KSK@test.dat|test.dat|test.dat]"));
+ assertThat("Part Text", convertText(parts, PlainTextPart.class, FreenetLinkPart.class), is("Link is [KSK@gpl.txt|KSK@gpl.txt|gpl.txt]\n[KSK@test.dat|KSK@test.dat|test.dat]"));
}
@SuppressWarnings({ "synthetic-access", "static-method" })
@@ -258,7 +278,6 @@ public class SoneTextParserTest {
/* check basic links. */
Iterable parts = soneTextParser.parse("Some text.\n\nLink to sone://DAxKQzS48mtaQc7sUVHIgx3fnWZPQBz0EueBreUVWrU and stuff.", null);
- assertThat("Parts", parts, notNullValue());
assertThat("Part Text", convertText(parts, PlainTextPart.class, SonePart.class), is("Some text.\n\nLink to [Sone|DAxKQzS48mtaQc7sUVHIgx3fnWZPQBz0EueBreUVWrU] and stuff."));
}
@@ -269,52 +288,91 @@ public class SoneTextParserTest {
/* check empty http links. */
Iterable parts = soneTextParser.parse("Some text. Empty link: http:// â nice!", null);
- assertThat("Parts", parts, notNullValue());
assertThat("Part Text", convertText(parts, PlainTextPart.class), is("Some text. Empty link: http:// â nice!"));
}
@Test
public void httpLinkWithoutParensEndsAtNextClosingParen() {
Iterable parts = soneTextParser.parse("Some text (and a link: http://example.sone/abc) â nice!", null);
- assertThat("Parts", parts, notNullValue());
- assertThat("Part Text", convertText(parts, PlainTextPart.class, LinkPart.class), is("Some text (and a link: [http://example.sone/abc|example.sone/abc|example.sone/abc]) â nice!"));
+ assertThat("Part Text", convertText(parts, PlainTextPart.class, LinkPart.class), is("Some text (and a link: [http://example.sone/abc|http://example.sone/abc|example.sone/abc]) â nice!"));
}
@Test
public void uskLinkEndsAtFirstNonNumericNonSlashCharacterAfterVersionNumber() {
Iterable parts = soneTextParser.parse("Some link (USK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test/0). Nice", null);
- assertThat("Parts", parts, notNullValue());
- assertThat("Part Text", convertText(parts), is("Some link ([USK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test/0|test|test]). Nice"));
+ assertThat("Part Text", convertText(parts), is("Some link ([USK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test/0|USK@qM1nmgU-YUnIttmEhqjTl7ifAF3Z6o~5EPwQW03uEQU,aztSUkT-VT1dWvfSUt9YpfyW~Flmf5yXpBnIE~v8sAg,AAMC--8/test/0|test]). Nice"));
}
@Test
public void httpLinkWithOpenedAndClosedParensEndsAtNextClosingParen() {
Iterable parts = soneTextParser.parse("Some text (and a link: http://example.sone/abc_(def)) â nice!", null);
- assertThat("Parts", parts, notNullValue());
- assertThat("Part Text", convertText(parts, PlainTextPart.class, LinkPart.class), is("Some text (and a link: [http://example.sone/abc_(def)|example.sone/abc_(def)|example.sone/abc_(def)]) â nice!"));
+ assertThat("Part Text", convertText(parts, PlainTextPart.class, LinkPart.class), is("Some text (and a link: [http://example.sone/abc_(def)|http://example.sone/abc_(def)|example.sone/abc_(def)]) â nice!"));
}
@Test
public void punctuationIsIgnoredAtEndOfLinkBeforeWhitespace() {
- SoneTextParser soneTextParser = new SoneTextParser(null, null);
Iterable parts = soneTextParser.parse("Some text and a link: http://example.sone/abc. Nice!", null);
- assertThat("Parts", parts, notNullValue());
- assertThat("Part Text", convertText(parts, PlainTextPart.class, LinkPart.class), is("Some text and a link: [http://example.sone/abc|example.sone/abc|example.sone/abc]. Nice!"));
+ assertThat("Part Text", convertText(parts, PlainTextPart.class, LinkPart.class), is("Some text and a link: [http://example.sone/abc|http://example.sone/abc|example.sone/abc]. Nice!"));
}
@Test
public void multiplePunctuationCharactersAreIgnoredAtEndOfLinkBeforeWhitespace() {
Iterable parts = soneTextParser.parse("Some text and a link: http://example.sone/abc... Nice!", null);
- assertThat("Parts", parts, notNullValue());
- assertThat("Part Text", convertText(parts, PlainTextPart.class, LinkPart.class), is("Some text and a link: [http://example.sone/abc|example.sone/abc|example.sone/abc]... Nice!"));
+ assertThat("Part Text", convertText(parts, PlainTextPart.class, LinkPart.class), is("Some text and a link: [http://example.sone/abc|http://example.sone/abc|example.sone/abc]... Nice!"));
}
@Test
public void commasAreIgnoredAtEndOfLinkBeforeWhitespace() {
- SoneTextParser soneTextParser = new SoneTextParser(null, null);
Iterable parts = soneTextParser.parse("Some text and a link: http://example.sone/abc, nice!", null);
- assertThat("Parts", parts, notNullValue());
- assertThat("Part Text", convertText(parts, PlainTextPart.class, LinkPart.class), is("Some text and a link: [http://example.sone/abc|example.sone/abc|example.sone/abc], nice!"));
+ assertThat("Part Text", convertText(parts, PlainTextPart.class, LinkPart.class), is("Some text and a link: [http://example.sone/abc|http://example.sone/abc|example.sone/abc], nice!"));
+ }
+
+ @Test
+ public void exclamationMarksAreIgnoredAtEndOfLinkBeforeWhitespace() {
+ Iterable parts = soneTextParser.parse("A link: http://example.sone/abc!", null);
+ assertThat("Part Text", convertText(parts, PlainTextPart.class, LinkPart.class), is("A link: [http://example.sone/abc|http://example.sone/abc|example.sone/abc]!"));
+ }
+
+ @Test
+ public void questionMarksAreIgnoredAtEndOfLinkBeforeWhitespace() {
+ Iterable parts = soneTextParser.parse("A link: http://example.sone/abc?", null);
+ assertThat("Part Text", convertText(parts, PlainTextPart.class, LinkPart.class), is("A link: [http://example.sone/abc|http://example.sone/abc|example.sone/abc]?"));
+ }
+
+ @Test
+ public void correctFreemailAddressIsLinkedToCorrectly() {
+ Iterable parts = soneTextParser.parse("Mail me at sone@t4dlzfdww3xvsnsc6j6gtliox6zaoak7ymkobbmcmdw527ubuqra.freemail!", null);
+ assertThat("Part Text", convertText(parts), is("Mail me at [Freemail|sone|t4dlzfdww3xvsnsc6j6gtliox6zaoak7ymkobbmcmdw527ubuqra|nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI]!"));
+ }
+
+ @Test
+ public void freemailAddressWithInvalidFreemailIdIsParsedAsText() {
+ Iterable parts = soneTextParser.parse("Mail me at sone@t4dlzfdww3xvsnsc6j6gtliox6zaoak7ymkobbmcmdw527ubuqr8.freemail!", null);
+ assertThat("Part Text", convertText(parts), is("Mail me at sone@t4dlzfdww3xvsnsc6j6gtliox6zaoak7ymkobbmcmdw527ubuqr8.freemail!"));
+ }
+
+ @Test
+ public void freemailAddressWithInvalidSizedFreemailIdIsParsedAsText() {
+ Iterable parts = soneTextParser.parse("Mail me at sone@4dlzfdww3xvsnsc6j6gtliox6zaoak7ymkobbmcmdw527ubuqra.freemail!", null);
+ assertThat("Part Text", convertText(parts), is("Mail me at sone@4dlzfdww3xvsnsc6j6gtliox6zaoak7ymkobbmcmdw527ubuqra.freemail!"));
+ }
+
+ @Test
+ public void freemailAddressWithoutLocalPartIsParsedAsText() {
+ Iterable parts = soneTextParser.parse(" @t4dlzfdww3xvsnsc6j6gtliox6zaoak7ymkobbmcmdw527ubuqra.freemail!", null);
+ assertThat("Part Text", convertText(parts), is(" @t4dlzfdww3xvsnsc6j6gtliox6zaoak7ymkobbmcmdw527ubuqra.freemail!"));
+ }
+
+ @Test
+ public void correctFreemailAddressIsParsedCorrectly() {
+ Iterable parts = soneTextParser.parse("sone@t4dlzfdww3xvsnsc6j6gtliox6zaoak7ymkobbmcmdw527ubuqra.freemail", null);
+ assertThat("Part Text", convertText(parts), is("[Freemail|sone|t4dlzfdww3xvsnsc6j6gtliox6zaoak7ymkobbmcmdw527ubuqra|nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI]"));
+ }
+
+ @Test
+ public void localPartOfFreemailAddressCanContainLettersDigitsMinusDotUnderscore() {
+ Iterable parts = soneTextParser.parse("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._@t4dlzfdww3xvsnsc6j6gtliox6zaoak7ymkobbmcmdw527ubuqra.freemail", null);
+ assertThat("Part Text", convertText(parts), is("[Freemail|ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._|t4dlzfdww3xvsnsc6j6gtliox6zaoak7ymkobbmcmdw527ubuqra|nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI]"));
}
/**
@@ -339,7 +397,10 @@ public class SoneTextParserTest {
text.append(((PlainTextPart) part).getText());
} else if (part instanceof FreenetLinkPart) {
FreenetLinkPart freenetLinkPart = (FreenetLinkPart) part;
- text.append('[').append(freenetLinkPart.getLink()).append('|').append(freenetLinkPart.isTrusted() ? "trusted|" : "").append(freenetLinkPart.getTitle()).append('|').append(freenetLinkPart.getText()).append(']');
+ text.append('[').append(freenetLinkPart.getLink()).append('|').append(freenetLinkPart.getTrusted() ? "trusted|" : "").append(freenetLinkPart.getTitle()).append('|').append(freenetLinkPart.getText()).append(']');
+ } else if (part instanceof FreemailPart) {
+ FreemailPart freemailPart = (FreemailPart) part;
+ text.append(format("[Freemail|%s|%s|%s]", freemailPart.getEmailLocalPart(), freemailPart.getFreemailId(), freemailPart.getIdentityId()));
} else if (part instanceof LinkPart) {
LinkPart linkPart = (LinkPart) part;
text.append('[').append(linkPart.getLink()).append('|').append(linkPart.getTitle()).append('|').append(linkPart.getText()).append(']');
@@ -356,27 +417,24 @@ public class SoneTextParserTest {
/**
* Mock Sone provider.
- *
- * @author David âBombeâ Roden
*/
private static class TestSoneProvider implements SoneProvider {
+ @Nonnull
@Override
- public Function> soneLoader() {
- return new Function>() {
+ public Function1 getSoneLoader() {
+ return new Function1() {
@Override
- public Optional apply(String soneId) {
+ public Sone invoke(String soneId) {
return getSone(soneId);
}
};
}
- /**
- * {@inheritDoc}
- */
+ @Nullable
@Override
- public Optional getSone(final String soneId) {
- return Optional.of(new IdOnlySone(soneId));
+ public Sone getSone(final String soneId) {
+ return new IdOnlySone(soneId);
}
/**
@@ -408,17 +466,18 @@ public class SoneTextParserTest {
private static class AbsentSoneProvider extends TestSoneProvider {
@Override
- public Optional getSone(String soneId) {
- return Optional.absent();
+ public Sone getSone(String soneId) {
+ return null;
}
}
private static class TestPostProvider implements PostProvider {
+ @Nullable
@Override
- public Optional getPost(final String postId) {
- return Optional.of(new Post() {
+ public Post getPost(@Nonnull final String postId) {
+ return new Post() {
@Override
public String getId() {
return postId;
@@ -463,7 +522,7 @@ public class SoneTextParserTest {
public Post setKnown(boolean known) {
return null;
}
- });
+ };
}
@Override
@@ -480,9 +539,10 @@ public class SoneTextParserTest {
private static class AbsentPostProvider extends TestPostProvider {
+ @Nullable
@Override
- public Optional getPost(String postId) {
- return Optional.absent();
+ public Post getPost(@Nonnull String postId) {
+ return null;
}
}