X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftest%2FTestPostBuilder.kt;h=6443cb2c28a972e681619c2316021bceb616bfda;hp=4c9efe75fba26e53d74da92ee5131a738e3cd156;hb=2a9ef0e07136d8c56f4eea32ed49e43bfd5e576f;hpb=73ba74461ca2dd1da89f322aa87035f710fe4865

diff --git a/src/test/kotlin/net/pterodactylus/sone/test/TestPostBuilder.kt b/src/test/kotlin/net/pterodactylus/sone/test/TestPostBuilder.kt
index 4c9efe7..6443cb2 100644
--- a/src/test/kotlin/net/pterodactylus/sone/test/TestPostBuilder.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/TestPostBuilder.kt
@@ -1,8 +1,6 @@
 package net.pterodactylus.sone.test
 
-import com.google.common.base.Optional
 import net.pterodactylus.sone.data.Post
-import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.database.PostBuilder
 import java.util.UUID
 
@@ -11,44 +9,43 @@ import java.util.UUID
  */
 class TestPostBuilder : PostBuilder {
 
-	private val post = mock<Post>()
+	private var id: String? = null
+	private var soneId: String? = null
 	private var recipientId: String? = null
+	private var time: Long? = null
+	private var text: String? = null
 
 	override fun copyPost(post: Post): PostBuilder = this
 
 	override fun from(senderId: String): PostBuilder = apply {
-		val sone = mock<Sone>()
-		whenever(sone.id).thenReturn(senderId)
-		whenever(post.sone).thenReturn(sone)
+		soneId = senderId
 	}
 
 	override fun randomId(): PostBuilder = apply {
-		whenever(post.id).thenReturn(UUID.randomUUID().toString())
+		id = UUID.randomUUID().toString()
 	}
 
 	override fun withId(id: String): PostBuilder = apply {
-		whenever(post.id).thenReturn(id)
+		this.id = id
 	}
 
 	override fun currentTime(): PostBuilder = apply {
-		whenever(post.time).thenReturn(System.currentTimeMillis())
+		time = System.currentTimeMillis()
 	}
 
 	override fun withTime(time: Long): PostBuilder = apply {
-		whenever(post.time).thenReturn(time)
+		this.time = time
 	}
 
 	override fun withText(text: String): PostBuilder = apply {
-		whenever(post.text).thenReturn(text)
+		this.text = text
 	}
 
 	override fun to(recipientId: String): PostBuilder = apply {
 		this.recipientId = recipientId
 	}
 
-	override fun build(): Post = post
-			.also {
-				whenever(post.recipientId).thenReturn(Optional.fromNullable(recipientId))
-			}
+	override fun build(): Post =
+			createPost(text!!, sone = createRemoteSone(soneId!!), time = time!!, recipient = recipientId?.let { createRemoteSone(it) }, id = id!!)
 
 }