X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCoreTest.java;h=66ef7437b3482782221a363a3e5d8bccb45c472c;hp=95f9dbfa7cd319156a1e2e3f84d7c7a8dbd012d7;hb=62573c314957b1851f4fbe693b8746686caa940a;hpb=d9d178b845ae83155f22a52e4ea697359864883c

diff --git a/src/test/java/net/pterodactylus/sone/core/CoreTest.java b/src/test/java/net/pterodactylus/sone/core/CoreTest.java
index 95f9dbf..66ef743 100644
--- a/src/test/java/net/pterodactylus/sone/core/CoreTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/CoreTest.java
@@ -1,6 +1,6 @@
 package net.pterodactylus.sone.core;
 
-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;
@@ -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));