Convert upload image page test to use new web page test base

[Sone.git] / src / test / java / net / pterodactylus / sone / web / pages / WebPageTest.java

diff --git a/src/test/java/net/pterodactylus/sone/web/pages/WebPageTest.java b/src/test/java/net/pterodactylus/sone/web/pages/WebPageTest.java
index 9d77df7..9774915 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/web/pages/WebPageTest.java
+++ b/src/test/java/net/pterodactylus/sone/web/pages/WebPageTest.java
@@ -2,6 +2,7 @@ package net.pterodactylus.sone.web.pages;
 
 import static net.pterodactylus.sone.test.GuiceKt.supply;
 import static net.pterodactylus.sone.web.WebTestUtils.redirectsTo;
+import static net.pterodactylus.util.web.Method.GET;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -126,6 +127,7 @@ public abstract class WebPageTest {
 
        @Before
        public final void setupFreenetRequest() throws SizeLimitExceededException {
+               setMethod(GET);
                when(freenetRequest.getToadletContext()).thenReturn(toadletContext);
                when(freenetRequest.getHttpRequest()).thenReturn(httpRequest);
                when(httpRequest.getMultipleParam(anyString())).thenAnswer(new Answer<String[]>() {
@@ -309,15 +311,18 @@ public abstract class WebPageTest {
                when(webInterface.getCurrentSoneWithoutCreatingSession(toadletContext)).thenReturn(null);
        }
 
-       protected void request(String uri, Method method) {
+       protected void setMethod(Method method) {
+               when(freenetRequest.getMethod()).thenReturn(method);
+               when(httpRequest.getMethod()).thenReturn(method.name());
+       }
+
+       protected void request(String uri) {
                try {
                        when(httpRequest.getPath()).thenReturn(uri);
                        when(freenetRequest.getUri()).thenReturn(new URI(uri));
                } catch (URISyntaxException e) {
                        throw new RuntimeException(e);
                }
-               when(freenetRequest.getMethod()).thenReturn(method);
-               when(httpRequest.getMethod()).thenReturn(method.name());
        }
 
        protected void addHttpRequestHeader(@Nonnull String name, String value) {
@@ -402,4 +407,13 @@ public abstract class WebPageTest {
                }
        }
 
+       protected void verifyNoRedirect(Runnable verification) throws RedirectException {
+               getPage().handleRequest(freenetRequest, templateContext);
+               verification.run();
+       }
+
+       protected void addTranslation(@Nonnull String key, @Nonnull String value) {
+               when(l10n.getString(key)).thenReturn(value);
+       }
+
 }