From 1df489f8cc3a4e905dcaa03444f8f72e421a53ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Tue, 12 Nov 2013 07:09:26 +0100 Subject: [PATCH] Add class with Sone-specific matchers. --- src/test/java/net/pterodactylus/sone/Matchers.java | 47 ++++++++++++++++++++++ .../pterodactylus/sone/freenet/wot/TrustTest.java | 19 +-------- 2 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 src/test/java/net/pterodactylus/sone/Matchers.java diff --git a/src/test/java/net/pterodactylus/sone/Matchers.java b/src/test/java/net/pterodactylus/sone/Matchers.java new file mode 100644 index 0000000..4bf7aa5 --- /dev/null +++ b/src/test/java/net/pterodactylus/sone/Matchers.java @@ -0,0 +1,47 @@ +/* + * Sone - Matchers.java - Copyright © 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.pterodactylus.sone; + +import static java.util.regex.Pattern.compile; + +import org.hamcrest.Description; +import org.hamcrest.Matcher; +import org.hamcrest.TypeSafeMatcher; + +/** + * Matchers used throughout the tests. + * + * @author David ‘Bombe’ Roden + */ +public class Matchers { + + public static Matcher matches(final String regex) { + return new TypeSafeMatcher() { + @Override + protected boolean matchesSafely(String item) { + return compile(regex).matcher(item).find(); + } + + @Override + public void describeTo(Description description) { + description.appendText("matches: ").appendValue(regex); + } + }; + } + +} diff --git a/src/test/java/net/pterodactylus/sone/freenet/wot/TrustTest.java b/src/test/java/net/pterodactylus/sone/freenet/wot/TrustTest.java index 93eebb8..102afb4 100644 --- a/src/test/java/net/pterodactylus/sone/freenet/wot/TrustTest.java +++ b/src/test/java/net/pterodactylus/sone/freenet/wot/TrustTest.java @@ -17,15 +17,12 @@ package net.pterodactylus.sone.freenet.wot; -import static java.util.regex.Pattern.compile; +import static net.pterodactylus.sone.Matchers.matches; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import org.hamcrest.Description; -import org.hamcrest.Matcher; -import org.hamcrest.TypeSafeMatcher; import org.junit.Test; /** @@ -73,18 +70,4 @@ public class TrustTest { assertThat(trustString, matches("\\b2\\b")); } - private static Matcher matches(final String regex) { - return new TypeSafeMatcher() { - @Override - protected boolean matchesSafely(String item) { - return compile(regex).matcher(item).find(); - } - - @Override - public void describeTo(Description description) { - description.appendText("matches: ").appendValue(regex); - } - }; - } - } -- 2.7.4