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

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 150336f..caacb68 100644
--- a/src/test/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.kt
@@ -25,6 +25,7 @@ import net.pterodactylus.sone.test.*
 import net.pterodactylus.sone.test.Matchers.*
 import net.pterodactylus.util.config.*
 import org.hamcrest.MatcherAssert.*
+import org.hamcrest.Matchers
 import org.hamcrest.Matchers.*
 import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mockito.*
@@ -176,45 +177,27 @@ 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 firstPostFirstReply = createPostReply(firstPost, 1000L)
-		val secondPost = createPost(absent())
-		val secondPostFirstReply = createPostReply(secondPost, 1000L)
-		val secondPostSecondReply = createPostReply(secondPost, 2000L)
+		val firstPost = createPost()
+		val firstPostFirstReply = createPostReply(id = "p1r1", post = firstPost, time = 1000L)
+		val secondPost = createPost()
+		val secondPostFirstReply = createPostReply(id = "p2r1", post = secondPost, time = 1000L)
+		val secondPostSecondReply = createPostReply(id = "p2r2", post = secondPost, time = 2000L)
 		memoryDatabase.storePost(firstPost)
 		memoryDatabase.storePost(secondPost)
 		memoryDatabase.storePostReply(firstPostFirstReply)
 		memoryDatabase.storePostReply(secondPostFirstReply)
 		memoryDatabase.storePostReply(secondPostSecondReply)
-		assertThat(memoryDatabase.getReplies(firstPost.id), contains(firstPostFirstReply))
-		assertThat(memoryDatabase.getReplies(secondPost.id), contains(secondPostFirstReply, secondPostSecondReply))
-	}
-
-	private fun createPostReply(post: Post, time: Long): PostReply {
-		val postReply = mock<PostReply>()
-		whenever(postReply.id).thenReturn(randomUUID().toString())
-		whenever(postReply.time).thenReturn(time)
-		whenever(postReply.post).thenReturn(of(post))
-		val postId = post.id
-		whenever(postReply.postId).thenReturn(postId)
-		return postReply
+		assertThat(memoryDatabase.getReplies(firstPost.id).map(PostReply::id), Matchers.contains("p1r1"))
+		assertThat(memoryDatabase.getReplies(secondPost.id).map(PostReply::id), contains("p2r1", "p2r2"))
 	}
 
 	@Test
@@ -405,7 +388,7 @@ class MemoryDatabaseTest {
 		prepareConfigurationValues()
 		val postReply = mock<PostReply>()
 		whenever(postReply.id).thenReturn("post-reply-id")
-		memoryDatabase.setPostReplyKnown(postReply, true)
+		memoryDatabase.setPostReplyKnown(postReply)
 		assertThat(configuration.getStringValue("KnownReplies/0/ID").value, equalTo("post-reply-id"))
 		assertThat(configuration.getStringValue("KnownReplies/1/ID").value, equalTo<Any>(null))
 	}
@@ -435,8 +418,8 @@ class MemoryDatabaseTest {
 		prepareConfigurationValues()
 		val postReply = mock<PostReply>()
 		whenever(postReply.id).thenReturn("post-reply-id")
-		memoryDatabase.setPostReplyKnown(postReply, true)
-		memoryDatabase.setPostReplyKnown(postReply, true)
+		memoryDatabase.setPostReplyKnown(postReply)
+		memoryDatabase.setPostReplyKnown(postReply)
 		verify(configuration, times(1)).getStringValue("KnownReplies/1/ID")
 	}