Mock the HTTP request, too.

diff --git a/src/test/java/net/pterodactylus/sone/data/Mocks.java b/src/test/java/net/pterodactylus/sone/data/Mocks.java
index e4449c4..72a4e75 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/data/Mocks.java
+++ b/src/test/java/net/pterodactylus/sone/data/Mocks.java
@@ -166,8 +166,10 @@ public class Mocks {
                return new PostReplyMocker(replyId, sone);
        }
 
                return new PostReplyMocker(replyId, sone);
        }
 

-       public FreenetRequest mockRequest(String path) throws URISyntaxException {
-               HTTPRequest httpRequest = new HTTPRequestImpl(new URI(path), "GET");
+       public FreenetRequest mockRequest(String path) {
+               HTTPRequest httpRequest = mock(HTTPRequest.class);
+               when(httpRequest.getMethod()).thenReturn("GET");
+               when(httpRequest.getPath()).thenReturn(path);

                FreenetRequest request = mock(FreenetRequest.class);
                when(request.getHttpRequest()).thenReturn(httpRequest);
                return request;
                FreenetRequest request = mock(FreenetRequest.class);
                when(request.getHttpRequest()).thenReturn(httpRequest);
                return request;

diff --git a/src/test/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPageTest.java b/src/test/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPageTest.java
index 0239464..ed07a5b 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPageTest.java
+++ b/src/test/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPageTest.java
@@ -13,6 +13,7 @@ import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

+import static org.mockito.Mockito.when;

 
 import java.net.URISyntaxException;
 
 
 import java.net.URISyntaxException;
 


@@ -42,20 +43,22 @@ public class BookmarkAjaxPageTest {
 
        @Test
        public void testBookmarkingExistingPost() throws URISyntaxException {
 
        @Test
        public void testBookmarkingExistingPost() throws URISyntaxException {

-               JsonReturnObject jsonReturnObject = performRequest("/ajax/bookmark.ajax?post=abc", bookmarkAjaxPage);
+               JsonReturnObject jsonReturnObject = performRequest(bookmarkAjaxPage, "abc");

                verifySuccessfulJsonResponse(jsonReturnObject);
                verify(core, times(1)).bookmarkPost(eq("abc"));
        }
 
        @Test
        public void testBookmarkingMissingPost() throws URISyntaxException {
                verifySuccessfulJsonResponse(jsonReturnObject);
                verify(core, times(1)).bookmarkPost(eq("abc"));
        }
 
        @Test
        public void testBookmarkingMissingPost() throws URISyntaxException {

-               JsonReturnObject jsonReturnObject = performRequest("/ajax/bookmark.ajax", bookmarkAjaxPage);
+               JsonReturnObject jsonReturnObject = performRequest(bookmarkAjaxPage, null);

                verifyJsonError(jsonReturnObject, "invalid-post-id");
                verify(core, never()).bookmarkPost(anyString());
        }
 
                verifyJsonError(jsonReturnObject, "invalid-post-id");
                verify(core, never()).bookmarkPost(anyString());
        }
 

-       private JsonReturnObject performRequest(String path, BookmarkAjaxPage bookmarkAjaxPage) throws URISyntaxException {
-               FreenetRequest request = mocks.mockRequest(path);
+       private JsonReturnObject performRequest(BookmarkAjaxPage bookmarkAjaxPage, String postId) throws URISyntaxException {
+               FreenetRequest request = mocks.mockRequest("");
+               when(request.getHttpRequest().getParam("post")).thenReturn(postId);
+               when(request.getHttpRequest().getParam("post", null)).thenReturn(postId);

                return bookmarkAjaxPage.createJsonObject(request);
        }
 
                return bookmarkAjaxPage.createJsonObject(request);
        }