Convert login page test to use new web page test base

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
index 274bdbf..e9fdb5c 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
@@ -19,14 +19,10 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [LoginPage].
  */
-class LoginPageTest : WebPageTest() {
-
-       private val page = LoginPage(template, webInterface)
+class LoginPageTest: WebPageTest2(::LoginPage) {
 
        private val sones = listOf(createSone("Sone", "Test"), createSone("Test"), createSone("Sone"))
 
-       override fun getPage() = page
-
        private fun createSone(vararg contexts: String) = mock<Sone>().apply {
                whenever(id).thenReturn(hashCode().toString())
                val identity = mock<OwnIdentity>().apply {

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest2.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest2.kt
index 08d00f9..bf328a7 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest2.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest2.kt
@@ -9,6 +9,7 @@ import net.pterodactylus.sone.data.Image
 import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.PostReply
 import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.freenet.wot.OwnIdentity
 import net.pterodactylus.sone.test.deepMock
 import net.pterodactylus.sone.test.get
 import net.pterodactylus.sone.test.mock
@@ -55,6 +56,7 @@ abstract class WebPageTest2(pageSupplier: (Template, WebInterface) -> SoneTempla
        private val requestHeaders = mutableMapOf<String, String>()
        private val getRequestParameters = mutableMapOf<String, MutableList<String>>()
        private val postRequestParameters = mutableMapOf<String, ByteArray>()
+       private val ownIdentities = mutableSetOf<OwnIdentity>()
        private val allSones = mutableMapOf<String, Sone>()
        private val localSones = mutableMapOf<String, Sone>()
        private val allPosts = mutableMapOf<String, Post>()
@@ -67,6 +69,7 @@ abstract class WebPageTest2(pageSupplier: (Template, WebInterface) -> SoneTempla
        @Before
        fun setupCore() {
                whenever(core.preferences).thenReturn(preferences)
+               whenever(core.identityManager.allOwnIdentities).then { ownIdentities }
                whenever(core.sones).then { allSones.values }
                whenever(core.getSone(anyString())).then { allSones[it[0]].asOptional() }
                whenever(core.localSones).then { localSones.values }
@@ -147,6 +150,10 @@ abstract class WebPageTest2(pageSupplier: (Template, WebInterface) -> SoneTempla
                whenever(webInterface.getCurrentSoneWithoutCreatingSession(eq(toadletContext))).thenReturn(null)
        }
 
+       fun addOwnIdentity(ownIdentity: OwnIdentity) {
+               ownIdentities += ownIdentity
+       }
+
        fun addSone(id: String, sone: Sone) {
                allSones[id] = sone
        }