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=94af5da3459f99b270d229e20e72365b04c1d05b;hp=a77ffcce5cef5097f947925831c9ba029c3adbbc;hb=2dd40fba7031cffb35a5156435547a5d964535c9;hpb=e7319b53b914961d59b8fce999da75adfab54009

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 a77ffcc..94af5da 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
@@ -8,10 +8,10 @@ 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.asOptional
 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 org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.contains
 import org.hamcrest.Matchers.equalTo
@@ -22,26 +22,25 @@ import java.util.concurrent.atomic.AtomicInteger
 /**
  * Unit test for [SearchPage].
  */
-class SearchPageTest : WebPageTest() {
+class SearchPageTest: WebPageTest({ template, webInterface -> SearchPage(template, webInterface, ticker) }) {
 
-	private val ticker = mock<Ticker>()
-	private val page = SearchPage(template, webInterface, ticker)
-
-	override fun getPage() = page
+	companion object {
+		val ticker = mock<Ticker>()
+	}
 
 	@Test
 	fun `page returns correct path`() {
-	    assertThat(page.path, equalTo("search.html"))
+		assertThat(page.path, equalTo("search.html"))
 	}
 
 	@Test
 	fun `page does not require login`() {
-	    assertThat(page.requiresLogin(), equalTo(false))
+		assertThat(page.requiresLogin(), equalTo(false))
 	}
 
 	@Test
 	fun `page returns correct title`() {
-	    addTranslation("Page.Search.Title", "search page title")
+		addTranslation("Page.Search.Title", "search page title")
 		assertThat(page.getPageTitle(freenetRequest), equalTo("search page title"))
 	}
 
@@ -334,7 +333,7 @@ class SearchPageTest : WebPageTest() {
 		val post = createPost("with-match", "text")
 		val callCounter = AtomicInteger()
 		whenever(post.text).thenAnswer { callCounter.incrementAndGet(); "text" }
-	    val sone = createSoneWithPost(post)
+		val sone = createSoneWithPost(post)
 		addSone("sone", sone)
 		addHttpRequestParameter("query", "text")
 		verifyNoRedirect {
@@ -350,13 +349,13 @@ class SearchPageTest : WebPageTest() {
 		val post = createPost("with-match", "text")
 		val callCounter = AtomicInteger()
 		whenever(post.text).thenAnswer { callCounter.incrementAndGet(); "text" }
-	    val sone = createSoneWithPost(post)
+		val sone = createSoneWithPost(post)
 		addSone("sone", sone)
 		addHttpRequestParameter("query", "text")
 		verifyNoRedirect {
 			assertThat(this["postHits"], contains(post))
 		}
-		whenever(ticker.read()).thenReturn(TimeUnit.MINUTES.toNanos(5) + 1  )
+		whenever(ticker.read()).thenReturn(TimeUnit.MINUTES.toNanos(5) + 1)
 		verifyNoRedirect {
 			assertThat(callCounter.get(), equalTo(2))
 		}