Allow adding posts without specific ID

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / web / ajax / JsonPageTest.kt

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageTest.kt
index 09e8e85..5656874 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageTest.kt
@@ -9,6 +9,7 @@ import net.pterodactylus.sone.core.ElementLoader
 import net.pterodactylus.sone.core.LinkedElement
 import net.pterodactylus.sone.core.Preferences
 import net.pterodactylus.sone.data.Album
+import net.pterodactylus.sone.data.Image
 import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.PostReply
 import net.pterodactylus.sone.data.Profile
@@ -51,7 +52,7 @@ abstract class JsonPageTest(
        protected val preferences = Preferences(eventBus)
        protected val elementLoader = mock<ElementLoader>()
        protected open val page: JsonPage by lazy { pageSupplier(webInterface) }
-       protected val json by lazy { page.createJsonObject(freenetRequest)!! }
+       protected val json by lazy { page.createJsonObject(freenetRequest) }
 
        protected val toadletContext = mock<ToadletContext>()
        protected val freenetRequest = mock<FreenetRequest>()
@@ -71,6 +72,7 @@ abstract class JsonPageTest(
        private val linkedElements = mutableMapOf<String, LinkedElement>()
        private val notifications = mutableMapOf<String, Notification>()
        private val albums = mutableMapOf<String, Album>()
+       private val images = mutableMapOf<String, Image>()
 
        @Before
        fun setupWebInterface() {
@@ -92,6 +94,8 @@ abstract class JsonPageTest(
                whenever(core.getPost(anyString())).thenAnswer { (posts + newPosts)[it[0]].asOptional() }
                whenever(core.getPostReply(anyString())).then { replies[it[0]].asOptional() }
                whenever(core.getAlbum(anyString())).then { albums[it[0]] }
+               whenever(core.getImage(anyString())).then { images[it[0]] }
+               whenever(core.getImage(anyString(), anyBoolean())).then { images[it[0]] }
        }
 
        @Before
@@ -174,8 +178,8 @@ abstract class JsonPageTest(
                localSones += id to sone
        }
 
-       protected fun addPost(id: String, post: Post) {
-               posts[id] = post
+       protected fun addPost(post: Post, id: String? = null) {
+               posts[id ?: post.id] = post
        }
 
        protected fun addNewPost(id: String, soneId: String, time: Long, recipientId: String? = null) =
@@ -213,6 +217,10 @@ abstract class JsonPageTest(
                albums[albumId ?: album.id] = album
        }
 
+       protected fun addImage(image: Image, imageId: String? = null) {
+               images[imageId ?: image.id] = image
+       }
+
        @Test
        fun `page returns correct path`() {
                assertThat(page.path, equalTo(expectedPath))