From: David ‘Bombe’ Roden Date: Fri, 24 Jul 2015 13:54:19 +0000 (+0200) Subject: Use JUnit 4 syntax, change some formatting X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=3f3dbf8cb1d63f1a62b1a58eeb8b9febd307440a Use JUnit 4 syntax, change some formatting --- diff --git a/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java b/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java index 2ac6db7..1e2928a 100644 --- a/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java +++ b/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java @@ -17,6 +17,10 @@ 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; @@ -28,14 +32,14 @@ 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 @@ -47,25 +51,25 @@ public class SoneTextParserTest extends TestCase { * @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(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.")); } /** @@ -74,25 +78,26 @@ public class SoneTextParserTest extends TestCase { * @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(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]")); } /** @@ -101,15 +106,16 @@ public class SoneTextParserTest extends TestCase { * @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(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.")); } /** @@ -119,15 +125,15 @@ public class SoneTextParserTest extends TestCase { * @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(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)); + assertThat(parts, notNullValue()); + assertThat(convertText(parts, PlainTextPart.class), is("Some text. Empty link: http:// – nice!")); } // @@ -148,7 +154,7 @@ public class SoneTextParserTest extends TestCase { 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())) { @@ -156,17 +162,28 @@ public class SoneTextParserTest extends TestCase { break; } } - if (!classValid) { - fail("Part’s Class (" + part.getClass() + ") is not one of " + Arrays.toString(validClasses)); - } + 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(']');