X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabaseTest.kt;h=caacb68d7526914938f8daf89fe1764802a85360;hp=6e9b31a7caf4d8f5e5bd7fe5d38d643be4058058;hb=2a9ef0e07136d8c56f4eea32ed49e43bfd5e576f;hpb=73ba74461ca2dd1da89f322aa87035f710fe4865

diff --git a/src/test/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.kt b/src/test/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.kt
index 6e9b31a..caacb68 100644
--- a/src/test/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.kt
@@ -177,26 +177,18 @@ class MemoryDatabaseTest {
 
 	@Test
 	fun `post recipients are detected correctly`() {
-		val postWithRecipient = createPost(of(RECIPIENT_ID))
+		val postWithRecipient = createPost(id = "p1", recipient = createRemoteSone(RECIPIENT_ID))
 		memoryDatabase.storePost(postWithRecipient)
-		val postWithoutRecipient = createPost(absent())
+		val postWithoutRecipient = createPost(id = "p2", recipient = null)
 		memoryDatabase.storePost(postWithoutRecipient)
-		assertThat(memoryDatabase.getDirectedPosts(RECIPIENT_ID), contains(postWithRecipient))
-	}
-
-	private fun createPost(recipient: Optional<String>): Post {
-		val postWithRecipient = mock<Post>()
-		whenever(postWithRecipient.id).thenReturn(randomUUID().toString())
-		whenever(postWithRecipient.sone).thenReturn(sone)
-		whenever(postWithRecipient.recipientId).thenReturn(recipient)
-		return postWithRecipient
+		assertThat(memoryDatabase.getDirectedPosts(RECIPIENT_ID), contains(isPost(isRecipientId = equalTo(RECIPIENT_ID))))
 	}
 
 	@Test
 	fun `post replies are managed correctly`() {
-		val firstPost = createPost(absent())
+		val firstPost = createPost()
 		val firstPostFirstReply = createPostReply(id = "p1r1", post = firstPost, time = 1000L)
-		val secondPost = createPost(absent())
+		val secondPost = createPost()
 		val secondPostFirstReply = createPostReply(id = "p2r1", post = secondPost, time = 1000L)
 		val secondPostSecondReply = createPostReply(id = "p2r2", post = secondPost, time = 2000L)
 		memoryDatabase.storePost(firstPost)