X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FTestObjects.kt;h=e8e660d9c7606384e8ddfb761c345d26f5c2bf9b;hb=fe880bd95f2f1bb155e890a9ffd2dc2abc86cb37;hp=96474edd6e5100fea66df011011e3bff8948dda4;hpb=8e313509a42a8c638fcac018dd73dd975bf9cb68;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/TestObjects.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/TestObjects.kt
index 96474ed..e8e660d 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/TestObjects.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/TestObjects.kt
@@ -3,7 +3,6 @@ package net.pterodactylus.sone.web.ajax
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.common.eventbus.EventBus
 import freenet.clients.http.ToadletContext
-import freenet.l10n.BaseL10n
 import freenet.support.SimpleReadOnlyArrayBucket
 import freenet.support.api.HTTPRequest
 import net.pterodactylus.sone.core.Core
@@ -20,11 +19,13 @@ 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.freenet.*
 import net.pterodactylus.sone.test.deepMock
 import net.pterodactylus.sone.test.get
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
 import net.pterodactylus.sone.utils.asOptional
+import net.pterodactylus.sone.web.NewElements
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
 import net.pterodactylus.util.notify.Notification
@@ -32,7 +33,7 @@ import net.pterodactylus.util.template.TemplateContextFactory
 import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.mockito.ArgumentMatchers
-import java.util.NoSuchElementException
+import java.util.*
 import javax.naming.SizeLimitExceededException
 
 /**
@@ -44,12 +45,12 @@ open class TestObjects {
 
 	val webInterface = mock<WebInterface>()
 	var formPassword = "form-password"
-	val l10n = mock<BaseL10n>()
 	val core = mock<Core>()
 	val eventBus = mock<EventBus>()
 	val preferences = Preferences(eventBus)
 	val updateChecker = mock<UpdateChecker>()
 	val elementLoader = mock<ElementLoader>()
+	val newElements = mock<NewElements>()
 
 	val toadletContext = mock<ToadletContext>()
 	val freenetRequest = mock<FreenetRequest>()
@@ -74,29 +75,28 @@ open class TestObjects {
 	val images = mutableMapOf<String, Image>()
 	val translations = mutableMapOf<String, String>()
 
+	private val translation = object : Translation {
+		override val currentLocale = Locale.ENGLISH
+		override fun translate(key: String) = translations[key] ?: ""
+	}
+
 	init {
 		whenever(webInterface.templateContextFactory).thenReturn(TemplateContextFactory())
-		whenever(webInterface.getCurrentSone(ArgumentMatchers.eq(toadletContext), ArgumentMatchers.anyBoolean())).thenReturn(currentSone)
-		whenever(webInterface.getCurrentSoneCreatingSession(toadletContext)).thenReturn(currentSone)
-		whenever(webInterface.getCurrentSoneWithoutCreatingSession(toadletContext)).thenReturn(currentSone)
+		whenever(webInterface.getCurrentSone(ArgumentMatchers.eq(toadletContext))).thenReturn(currentSone)
 		whenever(webInterface.core).thenReturn(core)
 		whenever(webInterface.formPassword).then { formPassword }
 		whenever(webInterface.getNotifications(currentSone)).thenAnswer { notifications.values }
 		whenever(webInterface.getNotification(ArgumentMatchers.anyString())).then { notifications[it[0]].asOptional() }
-		whenever(webInterface.getNewPosts(currentSone)).thenAnswer { newPosts.values }
-		whenever(webInterface.getNewReplies(currentSone)).thenAnswer { newReplies.values }
-		whenever(webInterface.l10n).thenReturn(l10n)
-
-		whenever(l10n.getString(ArgumentMatchers.anyString())).then { translations[it[0]] }
+		whenever(webInterface.translation).thenReturn(translation)
 
 		whenever(core.preferences).thenReturn(preferences)
 		whenever(core.updateChecker).thenReturn(updateChecker)
 		whenever(core.getSone(ArgumentMatchers.anyString())).thenAnswer { (localSones + remoteSones)[it.getArgument(0)] }
 		whenever(core.getLocalSone(ArgumentMatchers.anyString())).thenAnswer { localSones[it[0]] }
-		whenever(core.getPost(ArgumentMatchers.anyString())).thenAnswer { (posts + newPosts)[it[0]].asOptional() }
+		whenever(core.getPost(ArgumentMatchers.anyString())).thenAnswer { (posts + newPosts)[it[0]] }
 		whenever(core.getLikes(ArgumentMatchers.any<Post>())).then { postLikes[it[0]] ?: emptySet<Sone>() }
 		whenever(core.getLikes(ArgumentMatchers.any<PostReply>())).then { replyLikes[it[0]] ?: emptySet<Sone>() }
-		whenever(core.getPostReply(ArgumentMatchers.anyString())).then { replies[it[0]].asOptional() }
+		whenever(core.getPostReply(ArgumentMatchers.anyString())).then { replies[it[0]] }
 		whenever(core.getAlbum(ArgumentMatchers.anyString())).then { albums[it[0]] }
 		whenever(core.getImage(ArgumentMatchers.anyString())).then { images[it[0]] }
 		whenever(core.getImage(ArgumentMatchers.anyString(), ArgumentMatchers.anyBoolean())).then { images[it[0]] }
@@ -105,6 +105,9 @@ open class TestObjects {
 			linkedElements[it.getArgument(0)] ?: LinkedElement(it.getArgument(0), loading = true)
 		}
 
+		whenever(newElements.newPosts).then { newPosts.values }
+		whenever(newElements.newReplies).then { newReplies.values }
+
 		whenever(currentSone.options).thenReturn(DefaultSoneOptions())
 		currentSone.mock("soneId", "Sone_Id", true, 1000, idle)
 
@@ -137,9 +140,7 @@ open class TestObjects {
 	}
 
 	protected fun unsetCurrentSone() {
-		whenever(webInterface.getCurrentSone(ArgumentMatchers.eq(toadletContext), ArgumentMatchers.anyBoolean())).thenReturn(null)
-		whenever(webInterface.getCurrentSoneWithoutCreatingSession(toadletContext)).thenReturn(null)
-		whenever(webInterface.getCurrentSoneCreatingSession(toadletContext)).thenReturn(null)
+		whenever(webInterface.getCurrentSone(ArgumentMatchers.eq(toadletContext))).thenReturn(null)
 	}
 
 	protected fun postRequest() {