X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSearchPageTest.kt;h=329f45856ab164519198816c30ba5fcffd97b5aa;hp=2da2b24925ce98cc5a39658de3f872a92d50cb78;hb=2e6be6f2fb6afede009dacc48b8e3318e30e5057;hpb=03c29a3838e23ed0b9731ca4d84cf58038c30dfe

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
index 2da2b24..329f458 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
@@ -1,31 +1,22 @@
 package net.pterodactylus.sone.web.pages
 
-import com.google.common.base.Optional.absent
-import com.google.common.base.Ticker
-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
-import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.test.getInstance
-import net.pterodactylus.sone.test.isOnPage
-import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.test.whenever
-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.equalTo
-import org.hamcrest.Matchers.notNullValue
-import org.junit.Test
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.atomic.AtomicInteger
+import com.google.common.base.*
+import com.google.common.base.Optional.*
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.test.*
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.web.*
+import net.pterodactylus.sone.web.page.*
+import org.hamcrest.MatcherAssert.*
+import org.hamcrest.Matchers.*
+import org.junit.*
+import java.util.concurrent.*
+import java.util.concurrent.atomic.*
 
 /**
  * Unit test for [SearchPage].
  */
-class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(template, webInterface, ticker) }) {
+class SearchPageTest : WebPageTest({ webInterface, loaders, templateRenderer -> SearchPage(webInterface, loaders, templateRenderer, ticker) }) {
 
 	companion object {
 		val ticker = mock<Ticker>()
@@ -44,7 +35,7 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
 	@Test
 	fun `page returns correct title`() {
 		addTranslation("Page.Search.Title", "search page title")
-		assertThat(page.getPageTitle(freenetRequest), equalTo("search page title"))
+		assertThat(page.getPageTitle(soneRequest), equalTo("search page title"))
 	}
 
 	@Test
@@ -285,7 +276,7 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
 
 	@Test
 	fun `sone hits are paginated correctly`() {
-		core.preferences.postsPerPage = 2
+		core.preferences.newPostsPerPage = 2
 		val sones = listOf(createSone("1Sone"), createSone("Other1"), createSone("22Sone"), createSone("333Sone"), createSone("Other2"))
 				.onEach { addSone(it.id, it) }
 		addHttpRequestParameter("query", "sone")
@@ -297,7 +288,7 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
 
 	@Test
 	fun `sone hits page 2 is shown correctly`() {
-		core.preferences.postsPerPage = 2
+		core.preferences.newPostsPerPage = 2
 		val sones = listOf(createSone("1Sone"), createSone("Other1"), createSone("22Sone"), createSone("333Sone"), createSone("Other2"))
 				.onEach { addSone(it.id, it) }
 		addHttpRequestParameter("query", "sone")
@@ -310,7 +301,7 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
 
 	@Test
 	fun `post hits are paginated correctly`() {
-		core.preferences.postsPerPage = 2
+		core.preferences.newPostsPerPage = 2
 		val sones = listOf(createSoneWithPost("match1", "1Sone"), createSoneWithPost("no-match1", "Other1"), createSoneWithPost("match2", "22Sone"), createSoneWithPost("match3", "333Sone"), createSoneWithPost("no-match2", "Other2"))
 		addHttpRequestParameter("query", "sone")
 		verifyNoRedirect {
@@ -321,7 +312,7 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
 
 	@Test
 	fun `post hits page 2 is shown correctly`() {
-		core.preferences.postsPerPage = 2
+		core.preferences.newPostsPerPage = 2
 		val sones = listOf(createSoneWithPost("match1", "1Sone"), createSoneWithPost("no-match1", "Other1"), createSoneWithPost("match2", "22Sone"), createSoneWithPost("match3", "333Sone"), createSoneWithPost("no-match2", "Other2"))
 		addHttpRequestParameter("query", "sone")
 		addHttpRequestParameter("postPage", "1")
@@ -369,7 +360,12 @@ class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(templat
 
 	@Test
 	fun `page can be created by dependency injection`() {
-	    assertThat(baseInjector.getInstance<SearchPage>(), notNullValue())
+		assertThat(baseInjector.getInstance<SearchPage>(), notNullValue())
+	}
+
+	@Test
+	fun `page is annotated with correct template path`() {
+		assertThat(page.templatePath, equalTo("/templates/search.html"))
 	}
 
 }