Don’t use an argument captor when using an answer.

[Sone.git] / src / test / java / net / pterodactylus / sone / data / Mocks.java

diff --git a/src/test/java/net/pterodactylus/sone/data/Mocks.java b/src/test/java/net/pterodactylus/sone/data/Mocks.java
index 7ee612d..34aff9b 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/data/Mocks.java
+++ b/src/test/java/net/pterodactylus/sone/data/Mocks.java
@@ -59,20 +59,16 @@ public class Mocks {
        }
 
        public static Sone mockLocalSone(Core core, final String id) {
-               Sone sone = mock(Sone.class);
-               when(sone.getId()).thenReturn(id);
+               Sone sone = mockRemoteSone(core, id);
                when(sone.isLocal()).thenReturn(true);
                final Database database = core.getDatabase();
                when(sone.newPostBuilder()).thenReturn(new DefaultPostBuilder(database, id));
-               final ArgumentCaptor<String> postIdCaptor = forClass(String.class);
-               when(sone.newPostReplyBuilder(postIdCaptor.capture())).then(new Answer<PostReplyBuilder>() {
+               when(sone.newPostReplyBuilder(anyString())).then(new Answer<PostReplyBuilder>() {
                        @Override
-                       public PostReplyBuilder answer(InvocationOnMock invocationOnMock) throws Throwable {
-                               return new DefaultPostReplyBuilder(database, id, postIdCaptor.getValue());
+                       public PostReplyBuilder answer(InvocationOnMock invocation) throws Throwable {
+                               return new DefaultPostReplyBuilder(database, id, (String) invocation.getArguments()[0]);
                        }
                });
-               when(core.getSone(eq(id))).thenReturn(of(sone));
-               when(database.getSone(eq(id))).thenReturn(of(sone));
                return sone;
        }
 
@@ -80,8 +76,9 @@ public class Mocks {
                Sone sone = mock(Sone.class);
                when(sone.getId()).thenReturn(id);
                when(sone.isLocal()).thenReturn(false);
+               when(sone.getProfile()).thenReturn(new Profile(sone));
                final Database database = core.getDatabase();
-               when(sone.newPostBuilder()).thenReturn(new DefaultPostBuilder(database, id));
+               when(sone.newPostBuilder()).thenThrow(IllegalStateException.class);
                when(sone.newPostReplyBuilder(Matchers.<String>anyObject())).thenThrow(IllegalStateException.class);
                when(core.getSone(eq(id))).thenReturn(of(sone));
                when(database.getSone(eq(id))).thenReturn(of(sone));