X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebPageTest.java;h=2bd2680b3d809816feedea140e611bbda75ac692;hb=9c61b749711a041a40a5370c17fdaa23c10e7696;hp=a1af8cc9b5bc3c0fb497d8a712335349cee8a7e0;hpb=05cb6903f37f8166eab0ca2244b2cac7f06a6a52;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/web/WebPageTest.java b/src/test/java/net/pterodactylus/sone/web/WebPageTest.java
index a1af8cc..2bd2680 100644
--- a/src/test/java/net/pterodactylus/sone/web/WebPageTest.java
+++ b/src/test/java/net/pterodactylus/sone/web/WebPageTest.java
@@ -164,6 +164,13 @@ public abstract class WebPageTest {
 				return requestParameters.containsKey(parameter) ? requestParameters.get(parameter).iterator().next() : invocation.<String>getArgument(1);
 			}
 		});
+		when(httpRequest.isParameterSet(anyString())).thenAnswer(new Answer<Boolean>() {
+			@Override
+			public Boolean answer(InvocationOnMock invocation) throws Throwable {
+				return requestParameters.containsKey(invocation.<String>getArgument(0)) &&
+						requestParameters.get(invocation.<String>getArgument(0)).iterator().next() != null;
+			}
+		});
 		when(httpRequest.isPartSet(anyString())).thenAnswer(new Answer<Boolean>() {
 			@Override
 			public Boolean answer(InvocationOnMock invocation) throws Throwable {
@@ -265,8 +272,8 @@ public abstract class WebPageTest {
 
 	@Before
 	public final void setupWebInterface() {
-		when(webInterface.getCurrentSone(toadletContext)).thenReturn(currentSone);
-		when(webInterface.getCurrentSone(eq(toadletContext), anyBoolean())).thenReturn(currentSone);
+		when(webInterface.getCurrentSoneCreatingSession(toadletContext)).thenReturn(currentSone);
+		when(webInterface.getCurrentSoneWithoutCreatingSession(toadletContext)).thenReturn(currentSone);
 		when(webInterface.getNotification(anyString())).thenReturn(Optional.<Notification>absent());
 		when(webInterface.getNotifications(currentSone)).thenReturn(new ArrayList<Notification>());
 	}
@@ -281,8 +288,8 @@ public abstract class WebPageTest {
 	}
 
 	protected void unsetCurrentSone() {
-		when(webInterface.getCurrentSone(toadletContext)).thenReturn(null);
-		when(webInterface.getCurrentSone(eq(toadletContext), anyBoolean())).thenReturn(null);
+		when(webInterface.getCurrentSoneCreatingSession(toadletContext)).thenReturn(null);
+		when(webInterface.getCurrentSoneWithoutCreatingSession(toadletContext)).thenReturn(null);
 	}
 
 	protected void request(String uri, Method method) {