projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add test for get post ajax page
[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
5656874
..
fed8784
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageTest.kt
@@
-8,6
+8,7
@@
import net.pterodactylus.sone.core.Core
import net.pterodactylus.sone.core.ElementLoader
import net.pterodactylus.sone.core.LinkedElement
import net.pterodactylus.sone.core.Preferences
import net.pterodactylus.sone.core.ElementLoader
import net.pterodactylus.sone.core.LinkedElement
import net.pterodactylus.sone.core.Preferences
+import net.pterodactylus.sone.core.UpdateChecker
import net.pterodactylus.sone.data.Album
import net.pterodactylus.sone.data.Image
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.data.Album
import net.pterodactylus.sone.data.Image
import net.pterodactylus.sone.data.Post
@@
-16,6
+17,7
@@
import net.pterodactylus.sone.data.Profile
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.data.Sone.SoneStatus
import net.pterodactylus.sone.data.Sone.SoneStatus.idle
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.data.Sone.SoneStatus
import net.pterodactylus.sone.data.Sone.SoneStatus.idle
+import net.pterodactylus.sone.data.SoneOptions.DefaultSoneOptions
import net.pterodactylus.sone.test.deepMock
import net.pterodactylus.sone.test.get
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.deepMock
import net.pterodactylus.sone.test.get
import net.pterodactylus.sone.test.mock
@@
-24,11
+26,13
@@
import net.pterodactylus.sone.utils.asOptional
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.notify.Notification
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.notify.Notification
+import net.pterodactylus.util.template.TemplateContextFactory
import net.pterodactylus.util.web.Method.GET
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.junit.Before
import org.junit.Test
import net.pterodactylus.util.web.Method.GET
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.junit.Before
import org.junit.Test
+import org.mockito.ArgumentMatchers.any
import org.mockito.ArgumentMatchers.anyBoolean
import org.mockito.ArgumentMatchers.anyInt
import org.mockito.ArgumentMatchers.anyString
import org.mockito.ArgumentMatchers.anyBoolean
import org.mockito.ArgumentMatchers.anyInt
import org.mockito.ArgumentMatchers.anyString
@@
-50,6
+54,7
@@
abstract class JsonPageTest(
protected val core = mock<Core>()
protected val eventBus = mock<EventBus>()
protected val preferences = Preferences(eventBus)
protected val core = mock<Core>()
protected val eventBus = mock<EventBus>()
protected val preferences = Preferences(eventBus)
+ protected val updateChecker = mock<UpdateChecker>()
protected val elementLoader = mock<ElementLoader>()
protected open val page: JsonPage by lazy { pageSupplier(webInterface) }
protected val json by lazy { page.createJsonObject(freenetRequest) }
protected val elementLoader = mock<ElementLoader>()
protected open val page: JsonPage by lazy { pageSupplier(webInterface) }
protected val json by lazy { page.createJsonObject(freenetRequest) }
@@
-66,8
+71,10
@@
abstract class JsonPageTest(
private val localSones = mutableMapOf<String, Sone>()
private val remoteSones = mutableMapOf<String, Sone>()
private val posts = mutableMapOf<String, Post>()
private val localSones = mutableMapOf<String, Sone>()
private val remoteSones = mutableMapOf<String, Sone>()
private val posts = mutableMapOf<String, Post>()
+ private val postLikes = mutableMapOf<Post, Set<Sone>>()
private val newPosts = mutableMapOf<String, Post>()
private val replies = mutableMapOf<String, PostReply>()
private val newPosts = mutableMapOf<String, Post>()
private val replies = mutableMapOf<String, PostReply>()
+ private val replyLikes = mutableMapOf<PostReply, Set<Sone>>()
private val newReplies = mutableMapOf<String, PostReply>()
private val linkedElements = mutableMapOf<String, LinkedElement>()
private val notifications = mutableMapOf<String, Notification>()
private val newReplies = mutableMapOf<String, PostReply>()
private val linkedElements = mutableMapOf<String, LinkedElement>()
private val notifications = mutableMapOf<String, Notification>()
@@
-76,6
+83,7
@@
abstract class JsonPageTest(
@Before
fun setupWebInterface() {
@Before
fun setupWebInterface() {
+ whenever(webInterface.templateContextFactory).thenReturn(TemplateContextFactory())
whenever(webInterface.getCurrentSone(eq(toadletContext), anyBoolean())).thenReturn(currentSone)
whenever(webInterface.getCurrentSoneCreatingSession(toadletContext)).thenReturn(currentSone)
whenever(webInterface.getCurrentSoneWithoutCreatingSession(toadletContext)).thenReturn(currentSone)
whenever(webInterface.getCurrentSone(eq(toadletContext), anyBoolean())).thenReturn(currentSone)
whenever(webInterface.getCurrentSoneCreatingSession(toadletContext)).thenReturn(currentSone)
whenever(webInterface.getCurrentSoneWithoutCreatingSession(toadletContext)).thenReturn(currentSone)
@@
-89,9
+97,12
@@
abstract class JsonPageTest(
@Before
fun setupCore() {
whenever(core.preferences).thenReturn(preferences)
@Before
fun setupCore() {
whenever(core.preferences).thenReturn(preferences)
+ whenever(core.updateChecker).thenReturn(updateChecker)
whenever(core.getSone(anyString())).thenAnswer { (localSones + remoteSones)[it.getArgument(0)].asOptional() }
whenever(core.getLocalSone(anyString())).thenAnswer { localSones[it[0]] }
whenever(core.getPost(anyString())).thenAnswer { (posts + newPosts)[it[0]].asOptional() }
whenever(core.getSone(anyString())).thenAnswer { (localSones + remoteSones)[it.getArgument(0)].asOptional() }
whenever(core.getLocalSone(anyString())).thenAnswer { localSones[it[0]] }
whenever(core.getPost(anyString())).thenAnswer { (posts + newPosts)[it[0]].asOptional() }
+ whenever(core.getLikes(any<Post>())).then { postLikes[it[0]] ?: emptySet<Sone>() }
+ whenever(core.getLikes(any<PostReply>())).then { replyLikes[it[0]] ?: emptySet<Sone>() }
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.getPostReply(anyString())).then { replies[it[0]].asOptional() }
whenever(core.getAlbum(anyString())).then { albums[it[0]] }
whenever(core.getImage(anyString())).then { images[it[0]] }
@@
-107,6
+118,7
@@
abstract class JsonPageTest(
@Before
fun setupCurrentSone() {
@Before
fun setupCurrentSone() {
+ whenever(currentSone.options).thenReturn(DefaultSoneOptions())
currentSone.mock("soneId", "Sone_Id", true, 1000, idle)
}
currentSone.mock("soneId", "Sone_Id", true, 1000, idle)
}
@@
-182,6
+194,14
@@
abstract class JsonPageTest(
posts[id ?: post.id] = post
}
posts[id ?: post.id] = post
}
+ protected fun addLikes(post: Post, vararg sones: Sone) {
+ postLikes[post] = setOf(*sones)
+ }
+
+ protected fun addLikes(reply: PostReply, vararg sones: Sone) {
+ replyLikes[reply] = setOf(*sones)
+ }
+
protected fun addNewPost(id: String, soneId: String, time: Long, recipientId: String? = null) =
mock<Post>().apply {
whenever(this.id).thenReturn(id)
protected fun addNewPost(id: String, soneId: String, time: Long, recipientId: String? = null) =
mock<Post>().apply {
whenever(this.id).thenReturn(id)
@@
-191,8
+211,8
@@
abstract class JsonPageTest(
whenever(this.recipientId).thenReturn(recipientId.asOptional())
}.also { newPosts[id] = it }
whenever(this.recipientId).thenReturn(recipientId.asOptional())
}.also { newPosts[id] = it }
- protected fun addReply(
id: String, reply: PostReply
) {
- replies[id] = reply
+ protected fun addReply(
reply: PostReply, id: String? = null
) {
+ replies[id
?: reply.id
] = reply
}
protected fun addNewReply(id: String, soneId: String, postId: String, postSoneId: String) {
}
protected fun addNewReply(id: String, soneId: String, postId: String, postSoneId: String) {