X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParserTest.java;h=1e2928a69ba0045fe9828c6a5eabdd6f6de816ac;hb=3f3dbf8cb1d63f1a62b1a58eeb8b9febd307440a;hp=d98d4ec79f4f922e6d900413272150e60669cceb;hpb=143137ab32369113b98e85ec4258ee87f732265b;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..1e2928a 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
@@ -17,19 +17,29 @@
package net.pterodactylus.sone.text;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
import java.io.IOException;
import java.io.StringReader;
+import java.util.Arrays;
+import java.util.Collection;
-import junit.framework.TestCase;
-import net.pterodactylus.sone.core.SoneProvider;
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 org.junit.Test;
/**
* JUnit test case for {@link SoneTextParser}.
*
* @author David âBombeâ Roden
*/
-public class SoneTextParserTest extends TestCase {
+public class SoneTextParserTest {
//
// ACTIONS
@@ -41,24 +51,25 @@ public class SoneTextParserTest extends TestCase {
* @throws IOException
* if an I/O error occurs
*/
+ @Test
public void testPlainText() throws IOException {
SoneTextParser soneTextParser = new SoneTextParser(null, null);
Iterable parts;
/* check basic operation. */
parts = soneTextParser.parse(null, new StringReader("Test."));
- assertNotNull("Parts", parts);
- assertEquals("Part Text", "Test.", convertText(parts, PlainTextPart.class));
+ assertThat(parts, notNullValue());
+ assertThat(convertText(parts, PlainTextPart.class), is("Test."));
/* check empty lines at start and end. */
parts = soneTextParser.parse(null, new StringReader("\nTest.\n\n"));
- assertNotNull("Parts", parts);
- assertEquals("Part Text", "Test.", convertText(parts, PlainTextPart.class));
+ assertThat(parts, notNullValue());
+ assertThat(convertText(parts, PlainTextPart.class), is("Test."));
/* check duplicate empty lines in the text. */
parts = soneTextParser.parse(null, new StringReader("\nTest.\n\n\nTest."));
- assertNotNull("Parts", parts);
- assertEquals("Part Text", "Test.\n\nTest.", convertText(parts, PlainTextPart.class));
+ assertThat(parts, notNullValue());
+ assertThat(convertText(parts, PlainTextPart.class), is("Test.\n\nTest."));
}
/**
@@ -67,24 +78,26 @@ public class SoneTextParserTest extends TestCase {
* @throws IOException
* if an I/O error occurs
*/
+ @Test
public void testKSKLinks() throws IOException {
SoneTextParser soneTextParser = new SoneTextParser(null, null);
Iterable parts;
/* check basic links. */
parts = soneTextParser.parse(null, new StringReader("KSK@gpl.txt"));
- assertNotNull("Parts", parts);
- assertEquals("Part Text", "[KSK@gpl.txt|gpl.txt|gpl.txt]", convertText(parts, FreenetLinkPart.class));
+ assertThat(parts, notNullValue());
+ assertThat(convertText(parts, FreenetLinkPart.class), is("[KSK@gpl.txt|gpl.txt|gpl.txt]"));
/* check embedded links. */
parts = soneTextParser.parse(null, new StringReader("Link is KSK@gpl.txt\u200b."));
- assertNotNull("Parts", parts);
- assertEquals("Part Text", "Link is [KSK@gpl.txt|gpl.txt|gpl.txt]\u200b.", convertText(parts, PlainTextPart.class, FreenetLinkPart.class));
+ assertThat(parts, notNullValue());
+ assertThat(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(null, new StringReader("Link is KSK@gpl.txt\nKSK@test.dat\n"));
- 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, notNullValue());
+ assertThat(convertText(parts, PlainTextPart.class, FreenetLinkPart.class),
+ is("Link is [KSK@gpl.txt|gpl.txt|gpl.txt]\n[KSK@test.dat|test.dat|test.dat]"));
}
/**
@@ -93,15 +106,34 @@ public class SoneTextParserTest extends TestCase {
* @throws IOException
* if an I/O error occurs
*/
- @SuppressWarnings("synthetic-access")
+ @Test
public void testEmptyLinesAndSoneLinks() throws IOException {
SoneTextParser soneTextParser = new SoneTextParser(new TestSoneProvider(), null);
Iterable 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));
+ assertThat(parts, notNullValue());
+ assertThat(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
+ */
+ @Test
+ public void testEmpyHttpLinks() throws IOException {
+ SoneTextParser soneTextParser = new SoneTextParser(new TestSoneProvider(), null);
+ Iterable parts;
+
+ /* check empty http links. */
+ parts = soneTextParser.parse(null, new StringReader("Some text. Empty link: http:// â nice!"));
+ assertThat(parts, notNullValue());
+ assertThat(convertText(parts, PlainTextPart.class), is("Some text. Empty link: http:// â nice!"));
}
//
@@ -119,10 +151,10 @@ public class SoneTextParserTest extends TestCase {
* valid
* @return The converted text
*/
- private String convertText(Iterable parts, Class>... validClasses) {
+ private static String convertText(Iterable parts, Class>... validClasses) {
StringBuilder text = new StringBuilder();
for (Part part : parts) {
- assertNotNull("Part", part);
+ assertThat(part, notNullValue());
boolean classValid = validClasses.length == 0;
for (Class> validClass : validClasses) {
if (validClass.isAssignableFrom(part.getClass())) {
@@ -130,17 +162,28 @@ public class SoneTextParserTest extends TestCase {
break;
}
}
- if (!classValid) {
- assertEquals("Partâs Class", null, part.getClass());
- }
+ assertThat("Partâs Class (" + part.getClass() + ") is not one of " + Arrays.toString(validClasses), classValid, is(true));
if (part instanceof PlainTextPart) {
- text.append(((PlainTextPart) part).getText());
+ text.append(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.isTrusted() ? "trusted|" : "")
+ .append(freenetLinkPart.getTitle())
+ .append('|')
+ .append(freenetLinkPart.getText())
+ .append(']');
} else if (part instanceof LinkPart) {
LinkPart linkPart = (LinkPart) part;
- text.append('[').append(linkPart.getLink()).append('|').append(linkPart.getTitle()).append('|').append(linkPart.getText()).append(']');
+ 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(']');
@@ -156,21 +199,46 @@ public class SoneTextParserTest extends TestCase {
*/
private static class TestSoneProvider implements SoneProvider {
+ @Override
+ public Function> soneLoader() {
+ return new Function>() {
+ @Override
+ public Optional apply(String soneId) {
+ return getSone(soneId);
+ }
+ };
+ }
+
/**
* {@inheritDoc}
*/
@Override
- public Sone getSone(final String soneId, boolean create) {
- return new Sone(soneId) {
+ public Optional getSone(final String soneId) {
+ return Optional.of(new IdOnlySone(soneId));
+ }
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return soneId;
- }
- };
+ /**
+ * {@inheritDocs}
+ */
+ @Override
+ public Collection getSones() {
+ return null;
+ }
+
+ /**
+ * {@inheritDocs}
+ */
+ @Override
+ public Collection getLocalSones() {
+ return null;
+ }
+
+ /**
+ * {@inheritDocs}
+ */
+ @Override
+ public Collection getRemoteSones() {
+ return null;
}
}