X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryBookmarkDatabaseTest.java;h=188b74019ea484a707695b40672084f6dd81f5a4;hp=06c5b96c8349d1432b53abf413d0819f9617ee85;hb=2bacfa78f3191fd9847574a6c8b218a4882844a4;hpb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d

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..188b740 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;
@@ -27,8 +25,6 @@ import org.mockito.stubbing.Answer;
 
 /**
  * Unit test for {@link MemoryBookmarkDatabase}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class MemoryBookmarkDatabaseTest {
 
@@ -37,17 +33,16 @@ public class MemoryBookmarkDatabaseTest {
 			mock(ConfigurationLoader.class);
 	private final MemoryBookmarkDatabase bookmarkDatabase =
 			new MemoryBookmarkDatabase(memoryDatabase, configurationLoader);
-	private final Map<String, Post> posts = new HashMap<String, Post>();
+	private final Map<String, Post> posts = new HashMap<>();
 
 	@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]);
 					}
 				});
 	}
@@ -72,7 +67,7 @@ public class MemoryBookmarkDatabaseTest {
 
 	@Test
 	public void bookmarkDatabaseRetainsBookmarkedPosts() {
-		Set<Post> allPosts = new HashSet<Post>(posts.values());
+		Set<Post> allPosts = new HashSet<>(posts.values());
 		for (Post post : allPosts) {
 			bookmarkDatabase.bookmarkPost(post);
 		}
@@ -103,7 +98,7 @@ public class MemoryBookmarkDatabaseTest {
 
 	@Test
 	public void removingABookmarkRemovesTheCorrectBookmark() {
-		Set<Post> allPosts = new HashSet<Post>(posts.values());
+		Set<Post> allPosts = new HashSet<>(posts.values());
 		for (Post post : allPosts) {
 			bookmarkDatabase.bookmarkPost(post);
 		}