X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCoreTest.java;h=85f981c2800ad6c47f0ca875d3b9a28c74ab1bbd;hp=8e83e217c10afe61925864caf27a6af8905ab021;hb=04709e23f38e9d447337682ba27201da5dc19bd9;hpb=f8d561254a8c7046b3f5570c1850f7926b95906b

diff --git a/src/test/java/net/pterodactylus/sone/core/CoreTest.java b/src/test/java/net/pterodactylus/sone/core/CoreTest.java
index 8e83e21..85f981c 100644
--- a/src/test/java/net/pterodactylus/sone/core/CoreTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/CoreTest.java
@@ -1,11 +1,11 @@
 package net.pterodactylus.sone.core;
 
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
 
 import net.pterodactylus.sone.core.Core.MarkPostKnown;
 import net.pterodactylus.sone.core.Core.MarkReplyKnown;
@@ -22,7 +22,6 @@ import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.freenet.wot.event.IdentityRemovedEvent;
 import net.pterodactylus.util.config.Configuration;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.eventbus.EventBus;
@@ -34,8 +33,6 @@ import org.mockito.InOrder;
 
 /**
  * Unit test for {@link Core} and its subclasses.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class CoreTest {
 
@@ -74,7 +71,7 @@ public class CoreTest {
 		Identity identity = mock(Identity.class);
 		when(identity.getId()).thenReturn("sone-id");
 		Sone sone = mock(Sone.class);
-		when(database.getSone("sone-id")).thenReturn(Optional.of(sone));
+		when(database.getSone("sone-id")).thenReturn(sone);
 		PostReply postReply1 = mock(PostReply.class);
 		PostReply postReply2 = mock(PostReply.class);
 		when(sone.getReplies()).thenReturn(ImmutableSet.of(postReply1, postReply2));
@@ -103,8 +100,8 @@ public class CoreTest {
 					mismatchDescription.appendText("is not PostRemovedEvent");
 					return false;
 				}
-				if (((PostRemovedEvent) item).post() != post) {
-					mismatchDescription.appendText("post is ").appendValue(((PostRemovedEvent) item).post());
+				if (((PostRemovedEvent) item).getPost() != post) {
+					mismatchDescription.appendText("post is ").appendValue(((PostRemovedEvent) item).getPost());
 					return false;
 				}
 				return true;
@@ -147,8 +144,8 @@ public class CoreTest {
 					mismatchDescription.appendText("is not SoneRemovedEvent");
 					return false;
 				}
-				if (((SoneRemovedEvent) item).sone() != sone) {
-					mismatchDescription.appendText("sone is ").appendValue(((SoneRemovedEvent) item).sone());
+				if (((SoneRemovedEvent) item).getSone() != sone) {
+					mismatchDescription.appendText("sone is ").appendValue(((SoneRemovedEvent) item).getSone());
 					return false;
 				}
 				return true;