X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUploadImagePageTest.java;h=3bdf5880c6eca588caf534e794d4ef43116d8595;hb=d338aacec01efa636f96c5f8aab11b2345147691;hp=4b31b900a961751b03a9eb993b48dc4432bda356;hpb=d14d3498b42feaf7b5ae6390910c106ce4823234;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/web/UploadImagePageTest.java b/src/test/java/net/pterodactylus/sone/web/UploadImagePageTest.java
index 4b31b90..3bdf588 100644
--- a/src/test/java/net/pterodactylus/sone/web/UploadImagePageTest.java
+++ b/src/test/java/net/pterodactylus/sone/web/UploadImagePageTest.java
@@ -1,8 +1,9 @@
 package net.pterodactylus.sone.web;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static net.pterodactylus.sone.web.WebTestUtils.redirectsTo;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -13,7 +14,6 @@ import net.pterodactylus.sone.core.UpdateChecker;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.sone.web.page.FreenetTemplatePage.RedirectException;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.web.Method;
@@ -21,9 +21,6 @@ import net.pterodactylus.util.web.Method;
 import freenet.clients.http.ToadletContext;
 import freenet.support.api.HTTPRequest;
 
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeDiagnosingMatcher;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -73,22 +70,4 @@ public class UploadImagePageTest {
 		uploadImagePage.processTemplate(request, templateContext);
 	}
 
-	private Matcher<RedirectException> redirectsTo(final String page) {
-		return new TypeSafeDiagnosingMatcher<RedirectException>() {
-			@Override
-			protected boolean matchesSafely(RedirectException exception, Description mismatchDescription) {
-				if (!exception.getTarget().equals(page)) {
-					mismatchDescription.appendText("target is ").appendValue(exception.getTarget());
-					return false;
-				}
-				return true;
-			}
-
-			@Override
-			public void describeTo(Description description) {
-				description.appendText("target is ").appendValue(page);
-			}
-		};
-	}
-
 }