X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParserTest.java;h=b8d2fb4f0bfc1b7784fceaf5142b532d6805e4fd;hb=f4dd3d176c5732a7e2111f37cdbb4ea6c83aaf46;hp=7a06dcfa8449eb66a2ce41acb333b4a2f85127f3;hpb=3d6cffe82270a1faacf1f0d39c34b11ab316e0db;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 7a06dcf..b8d2fb4 100644
--- a/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
+++ b/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
@@ -17,8 +17,12 @@
package net.pterodactylus.sone.text;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isIn;
+import static org.hamcrest.Matchers.notNullValue;
+
import java.io.IOException;
-import java.util.Arrays;
import java.util.Collection;
import net.pterodactylus.sone.data.Sone;
@@ -27,111 +31,113 @@ import net.pterodactylus.sone.database.SoneProvider;
import com.google.common.base.Function;
import com.google.common.base.Optional;
-import junit.framework.TestCase;
+import org.junit.Test;
/**
* JUnit test case for {@link SoneTextParser}.
*
* @author David âBombeâ Roden
*/
-public class SoneTextParserTest extends TestCase {
+public class SoneTextParserTest {
- //
- // ACTIONS
- //
+ private final SoneTextParser soneTextParser = new SoneTextParser(null, null);
- /**
- * Tests basic plain-text operation of the parser.
- *
- * @throws IOException
- * if an I/O error occurs
- */
@SuppressWarnings("static-method")
+ @Test
public void testPlainText() throws IOException {
- SoneTextParser soneTextParser = new SoneTextParser(null, null);
- Iterable parts;
-
/* check basic operation. */
- parts = soneTextParser.parse("Test.", null);
- assertNotNull("Parts", parts);
- assertEquals("Part Text", "Test.", convertText(parts, PlainTextPart.class));
+ 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);
- assertNotNull("Parts", parts);
- assertEquals("Part Text", "Test.", convertText(parts, PlainTextPart.class));
+ 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);
- assertNotNull("Parts", parts);
- assertEquals("Part Text", "Test.\n\nTest.", convertText(parts, PlainTextPart.class));
+ assertThat("Parts", parts, notNullValue());
+ assertThat("Part Text", convertText(parts, PlainTextPart.class), is("Test.\n\nTest."));
}
- /**
- * Tests parsing of KSK links.
- *
- * @throws IOException
- * if an I/O error occurs
- */
@SuppressWarnings("static-method")
+ @Test
public void testKSKLinks() throws IOException {
- SoneTextParser soneTextParser = new SoneTextParser(null, null);
- Iterable parts;
-
/* check basic links. */
- parts = soneTextParser.parse("KSK@gpl.txt", null);
- assertNotNull("Parts", parts);
- assertEquals("Part Text", "[KSK@gpl.txt|gpl.txt|gpl.txt]", convertText(parts, FreenetLinkPart.class));
+ 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]"));
/* check embedded links. */
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));
+ assertThat("Parts", parts, notNullValue());
+ assertThat("Part Text", convertText(parts, PlainTextPart.class, FreenetLinkPart.class), is("Link is [KSK@gpl.txt|gpl.txt|gpl.txt]\u200b."));
/* check embedded links and line breaks. */
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));
+ 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]"));
}
- /**
- * 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" })
+ @Test
public void testEmptyLinesAndSoneLinks() throws IOException {
SoneTextParser soneTextParser = new SoneTextParser(new TestSoneProvider(), null);
- Iterable parts;
/* check basic links. */
- 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));
+ 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."));
}
- /**
- * 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" })
+ @Test
public void testEmpyHttpLinks() throws IOException {
SoneTextParser soneTextParser = new SoneTextParser(new TestSoneProvider(), null);
- Iterable parts;
/* check empty http links. */
- 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));
+ 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!"));
}
- //
- // PRIVATE METHODS
- //
+ @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!"));
+ }
+
+ @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!"));
+ }
+
+ @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!"));
+ }
+
+ @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!"));
+ }
/**
* Converts all given {@link Part}s into a string, validating that the
@@ -147,16 +153,9 @@ public class SoneTextParserTest extends TestCase {
private static String convertText(Iterable parts, Class>... validClasses) {
StringBuilder text = new StringBuilder();
for (Part part : parts) {
- assertNotNull("Part", part);
- boolean classValid = validClasses.length == 0;
- for (Class> validClass : validClasses) {
- if (validClass.isAssignableFrom(part.getClass())) {
- classValid = true;
- break;
- }
- }
- if (!classValid) {
- fail("Partâs Class (" + part.getClass() + ") is not one of " + Arrays.toString(validClasses));
+ assertThat("Part", part, notNullValue());
+ if (validClasses.length != 0) {
+ assertThat("Partâs class", part.getClass(), isIn(validClasses));
}
if (part instanceof PlainTextPart) {
text.append(((PlainTextPart) part).getText());