X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Ffilters%2Ftorrents%2FTorrentzEuFilterTest.java;h=d7afc940c05db054d81633742ce54bd633d25e04;hb=e76eb2e775937956010cabfc87fff91f3245a2db;hp=4720d9b37e3c6e0e947b3c7f7619c668270c259b;hpb=71d2db823b40e782b0c89fc084fe9565d7f4f5e8;p=rhynodge.git diff --git a/src/test/java/net/pterodactylus/rhynodge/filters/torrents/TorrentzEuFilterTest.java b/src/test/java/net/pterodactylus/rhynodge/filters/torrents/TorrentzEuFilterTest.java index 4720d9b..d7afc94 100644 --- a/src/test/java/net/pterodactylus/rhynodge/filters/torrents/TorrentzEuFilterTest.java +++ b/src/test/java/net/pterodactylus/rhynodge/filters/torrents/TorrentzEuFilterTest.java @@ -5,13 +5,9 @@ import java.io.IOException; import net.pterodactylus.rhynodge.State; import net.pterodactylus.rhynodge.states.HtmlState; import net.pterodactylus.rhynodge.states.TorrentState; -import net.pterodactylus.rhynodge.states.TorrentState.TorrentFile; -import org.hamcrest.Description; -import org.hamcrest.Matcher; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.hamcrest.TypeSafeDiagnosingMatcher; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.junit.Test; @@ -35,42 +31,9 @@ public class TorrentzEuFilterTest { TorrentState torrentState = (TorrentState) newState; MatcherAssert.assertThat(torrentState.torrentFiles(), Matchers.hasSize(2)); MatcherAssert.assertThat(torrentState.torrentFiles(), Matchers.contains( - isTorrent("Ubuntu 14 04 64Bit ISO File", "981 MB", 0, 1), - isTorrent("Ubuntu 14 04 LTS Desktop 64bit ISO", "964 MB", 75, 5) + TorrentMatcher.isTorrent("Ubuntu 14 04 64Bit ISO File", "981 MB", 0, 1), + TorrentMatcher.isTorrent("Ubuntu 14 04 LTS Desktop 64bit ISO", "964 MB", 75, 5) )); } - private Matcher isTorrent(String name, String size, int seedCount, int leechCount) { - return new TypeSafeDiagnosingMatcher() { - @Override - protected boolean matchesSafely(TorrentFile torrentFile, Description mismatchDescription) { - if (!torrentFile.name().equals(name)) { - mismatchDescription.appendText("name is ").appendValue(torrentFile.name()); - return false; - } - if (!torrentFile.size().equals(size)) { - mismatchDescription.appendText("size is ").appendValue(torrentFile.size()); - return false; - } - if (torrentFile.seedCount() != seedCount) { - mismatchDescription.appendText("seed count is ").appendValue(torrentFile.seedCount()); - return false; - } - if (torrentFile.leechCount() != leechCount) { - mismatchDescription.appendText("leech count is ").appendValue(torrentFile.leechCount()); - return false; - } - return true; - } - - @Override - public void describeTo(Description description) { - description.appendText("torrent named ").appendValue(name); - description.appendText(", size ").appendValue(size); - description.appendText(", seeds ").appendValue(seedCount); - description.appendText(", leechs ").appendValue(leechCount); - } - }; - } - }