X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryBookmarkDatabaseTest.java;h=7edea067b56d4e419ca43a733f387273ac0fc199;hb=52014e28ee29c9620dbcc842d8bf543aaadead9e;hp=06c5b96c8349d1432b53abf413d0819f9617ee85;hpb=f229fe41f708d2b275c20ceb9aba5993761218a3;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabaseTest.java b/src/test/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabaseTest.java
index 06c5b96..7edea06 100644
--- a/src/test/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabaseTest.java
+++ b/src/test/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabaseTest.java
@@ -1,12 +1,11 @@
 package net.pterodactylus.sone.database.memory;
 
-import static com.google.common.base.Optional.fromNullable;
-import static net.pterodactylus.sone.Matchers.isPostWithId;
+import static net.pterodactylus.sone.test.Matchers.isPostWithId;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.is;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -19,7 +18,6 @@ import java.util.Set;
 
 import net.pterodactylus.sone.data.Post;
 
-import com.google.common.base.Optional;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
@@ -42,12 +40,11 @@ public class MemoryBookmarkDatabaseTest {
 	@Before
 	public void setupMemoryDatabase() {
 		when(memoryDatabase.getPost(anyString())).thenAnswer(
-				new Answer<Optional<Post>>() {
+				new Answer<Post>() {
 					@Override
-					public Optional<Post> answer(
+					public Post answer(
 							InvocationOnMock invocation) {
-						return fromNullable(
-								posts.get(invocation.getArguments()[0]));
+						return posts.get(invocation.getArguments()[0]);
 					}
 				});
 	}