projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove dependency on web page test base from reloading page test
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
SearchPageTest.kt
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
540b8b5
..
c93ac0c
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
@@
-22,26
+22,25
@@
import java.util.concurrent.atomic.AtomicInteger
/**
* Unit test for [SearchPage].
*/
/**
* Unit test for [SearchPage].
*/
-class SearchPageTest
: WebPageTest(
) {
+class SearchPageTest
: WebPageTest2({ 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`() {
@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`() {
}
@Test
fun `page does not require login`() {
- assertThat(page.requiresLogin(), equalTo(false))
+
assertThat(page.requiresLogin(), equalTo(false))
}
@Test
fun `page returns correct title`() {
}
@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"))
}
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 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 {
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 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))
}
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))
}
verifyNoRedirect {
assertThat(callCounter.get(), equalTo(2))
}