Complete unit test for options page

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

diff --git a/src/test/java/net/pterodactylus/sone/web/WebPageTest.java b/src/test/java/net/pterodactylus/sone/web/WebPageTest.java
index b8b7fa6..71cc9f2 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/web/WebPageTest.java
+++ b/src/test/java/net/pterodactylus/sone/web/WebPageTest.java
@@ -30,6 +30,7 @@ import net.pterodactylus.sone.core.UpdateChecker;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.SoneOptions.DefaultSoneOptions;
 import net.pterodactylus.sone.data.TemporaryImage;
@@ -83,7 +84,7 @@ public abstract class WebPageTest {
 
        private final Set<OwnIdentity> ownIdentities = new HashSet<>();
        private final Map<String, Sone> sones = new HashMap<>();
-       private final List<Sone> localSones = new ArrayList<>();
+       protected final List<Sone> localSones = new ArrayList<>();
 
        protected WebPageTest() {
                try {
@@ -122,7 +123,7 @@ public abstract class WebPageTest {
                when(httpRequest.isPartSet(anyString())).thenAnswer(new Answer<Boolean>() {
                        @Override
                        public Boolean answer(InvocationOnMock invocation) throws Throwable {
-                               return requestParameters.containsKey(invocation.<String>getArgument(0));
+                               return requestParameters.get(invocation.<String>getArgument(0)) != null;
                        }
                });
                when(httpRequest.getParts()).thenAnswer(new Answer<String[]>() {
@@ -210,6 +211,10 @@ public abstract class WebPageTest {
                when(core.getPost(postId)).thenReturn(Optional.fromNullable(post));
        }
 
+       protected void addPostReply(String postReplyId, PostReply postReply) {
+               when(core.getPostReply(postReplyId)).thenReturn(Optional.fromNullable(postReply));
+       }
+
        protected void addSone(String soneId, Sone sone) {
                sones.put(soneId, sone);
        }