From 6116ab8aa248eab6a4d800f991e749debc496df9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Thu, 9 Jan 2020 22:12:31 +0100
Subject: [PATCH] =?utf8?q?=F0=9F=9A=9A=20Move=20post=20and=20reply=20mocks?=
 =?utf8?q?=20to=20correct=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../kotlin/net/pterodactylus/sone/test/Mocks.kt    | 28 ++++++++++++++++++++++
 .../sone/text/SoneMentionDetectorTest.kt           | 27 ---------------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt b/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt
index f469dd7..0bb8bc9 100644
--- a/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt
@@ -17,14 +17,42 @@
 
 package net.pterodactylus.sone.test
 
+import com.google.common.base.*
 import freenet.crypt.*
 import freenet.keys.*
+import net.pterodactylus.sone.data.*
 import net.pterodactylus.sone.data.impl.*
+import net.pterodactylus.sone.text.*
 import net.pterodactylus.sone.utils.*
 
+val remoteSone1 = createRemoteSone()
+val remoteSone2 = createRemoteSone()
+
+val localSone1 = createLocalSone()
+val localSone2 = createLocalSone()
+
 fun createId() = InsertableClientSSK.createRandom(DummyRandomSource(), "").uri.routingKey.asFreenetBase64
 
 fun createLocalSone(id: String? = createId()) = object : IdOnlySone(id) {
 	override fun isLocal() = true
 }
 fun createRemoteSone(id: String? = createId()) = IdOnlySone(id)
+
+fun createPost(text: String = "", sone: Sone = remoteSone1, known: Boolean = false): Post.EmptyPost {
+	return object : Post.EmptyPost("post-id") {
+		override fun getSone() = sone
+		override fun getText() = text
+		override fun isKnown() = known
+	}
+}
+
+fun emptyPostReply(text: String = "", post: Post = createPost(), sone: Sone = remoteSone1, known: Boolean = false) = object : PostReply {
+	override val id = "reply-id"
+	override fun getSone() = sone
+	override fun getPostId() = post.id
+	override fun getPost(): Optional<Post> = Optional.of(post)
+	override fun getTime() = 1L
+	override fun getText() = text
+	override fun isKnown() = known
+	override fun setKnown(known: Boolean): PostReply = this
+}
diff --git a/src/test/kotlin/net/pterodactylus/sone/text/SoneMentionDetectorTest.kt b/src/test/kotlin/net/pterodactylus/sone/text/SoneMentionDetectorTest.kt
index 24d2335..6ae437b 100644
--- a/src/test/kotlin/net/pterodactylus/sone/text/SoneMentionDetectorTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/text/SoneMentionDetectorTest.kt
@@ -17,8 +17,6 @@
 
 package net.pterodactylus.sone.text
 
-import com.google.common.base.*
-import com.google.common.base.Optional.*
 import com.google.common.eventbus.*
 import net.pterodactylus.sone.core.event.*
 import net.pterodactylus.sone.data.*
@@ -226,20 +224,6 @@ class SoneMentionDetectorTest {
 
 }
 
-private val remoteSone1 = createRemoteSone()
-private val remoteSone2 = createRemoteSone()
-
-private val localSone1 = createLocalSone()
-private val localSone2 = createLocalSone()
-
-private fun createPost(text: String = "", sone: Sone = remoteSone1, known: Boolean = false): Post.EmptyPost {
-	return object : Post.EmptyPost("post-id") {
-		override fun getSone() = sone
-		override fun getText() = text
-		override fun isKnown() = known
-	}
-}
-
 private class TestSoneProvider : SoneProvider {
 
 	override val sones: Collection<Sone> get() = remoteSones + localSones
@@ -268,14 +252,3 @@ private class TestPostReplyProvider : PostReplyProvider {
 	override fun getReplies(postId: String) = postReplies[postId] ?: emptyList()
 
 }
-
-private fun emptyPostReply(text: String = "", post: Post = createPost(), sone: Sone = remoteSone1, known: Boolean = false) = object : PostReply {
-	override val id = "reply-id"
-	override fun getSone() = sone
-	override fun getPostId() = post.id
-	override fun getPost(): Optional<Post> = of(post)
-	override fun getTime() = 1L
-	override fun getText() = text
-	override fun isKnown() = known
-	override fun setKnown(known: Boolean): PostReply = this
-}
-- 
2.7.4