Remove unnecessary type parameters

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / web / pages / NewPageTest.kt

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/NewPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/NewPageTest.kt
index 2420e5b..5c71e5d 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/NewPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/NewPageTest.kt
@@ -2,15 +2,17 @@ package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.PostReply
-import net.pterodactylus.sone.test.asOptional
+import net.pterodactylus.sone.test.getInstance
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
 import net.pterodactylus.sone.utils.Pagination
-import net.pterodactylus.util.web.Method.GET
+import net.pterodactylus.sone.utils.asOptional
+import net.pterodactylus.sone.web.baseInjector
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.contains
 import org.hamcrest.Matchers.containsInAnyOrder
 import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.notNullValue
 import org.junit.Before
 import org.junit.Test
 import java.util.Arrays.asList
@@ -18,11 +20,7 @@ import java.util.Arrays.asList
 /**
  * Unit test for [NewPage].
  */
-class NewPageTest: WebPageTest() {
-
-       private val page = NewPage(template, webInterface)
-
-       override fun getPage() = page
+class NewPageTest: WebPageTest(::NewPage) {
 
        @Before
        fun setupNumberOfPostsPerPage() {
@@ -47,10 +45,9 @@ class NewPageTest: WebPageTest() {
 
        @Test
        fun `posts are not duplicated when they come from both new posts and new replies notifications`() {
-               setMethod(GET)
                val extraPost = mock<Post>().withTime(2000)
                val posts = asList(mock<Post>().withTime(1000), mock<Post>().withTime(3000))
-               val postReplies = asList(mock<PostReply>(), mock<PostReply>())
+               val postReplies = asList(mock<PostReply>(), mock())
                whenever(postReplies[0].post).thenReturn(posts[0].asOptional())
                whenever(postReplies[1].post).thenReturn(extraPost.asOptional())
                whenever(webInterface.getNewPosts(currentSone)).thenReturn(posts)
@@ -67,7 +64,6 @@ class NewPageTest: WebPageTest() {
        @Test
        @Suppress("UNCHECKED_CAST")
        fun `posts are paginated properly`() {
-               setMethod(GET)
                webInterface.core.preferences.postsPerPage = 2
                val posts = listOf(mock<Post>().withTime(2000), mock<Post>().withTime(3000), mock<Post>().withTime(1000))
                whenever(webInterface.getNewPosts(currentSone)).thenReturn(posts)
@@ -79,7 +75,6 @@ class NewPageTest: WebPageTest() {
        @Test
        @Suppress("UNCHECKED_CAST")
        fun `posts are paginated properly on second page`() {
-               setMethod(GET)
                webInterface.core.preferences.postsPerPage = 2
                addHttpRequestParameter("page", "1")
                val posts = listOf(mock<Post>().withTime(2000), mock<Post>().withTime(3000), mock<Post>().withTime(1000))
@@ -89,4 +84,9 @@ class NewPageTest: WebPageTest() {
                }
        }
 
+       @Test
+       fun `page can be created by dependency injection`() {
+           assertThat(baseInjector.getInstance<NewPage>(), notNullValue())
+       }
+
 }