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=440fe1db8acd1fb63c0d33e99d20a47a24112734;hp=7fab8d6b7e821a0d21018c42c85a4f1ff0433f2e;hb=6a3f1fede0cda5cd6ed56204aa1dd37a19813cb9;hpb=db8c77f40b82bf516255318f20a824d676b4fa53 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 7fab8d6..440fe1d 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt @@ -8,13 +8,16 @@ 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 @@ -22,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger /** * Unit test for [SearchPage]. */ -class SearchPageTest: WebPageTest2({ template, webInterface -> SearchPage(template, webInterface, ticker) }) { +class SearchPageTest: WebPageTest({ template, webInterface, loaders -> SearchPage(template, webInterface, loaders, ticker) }) { companion object { val ticker = mock() @@ -30,18 +33,18 @@ class SearchPageTest: WebPageTest2({ template, webInterface -> SearchPage(templa @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") - assertThat(page.getPageTitle(freenetRequest), equalTo("search page title")) + addTranslation("Page.Search.Title", "search page title") + assertThat(page.getPageTitle(soneRequest), equalTo("search page title")) } @Test @@ -63,28 +66,28 @@ class SearchPageTest: WebPageTest2({ template, webInterface -> SearchPage(templa @Test fun `searching for sone link redirects to view sone page`() { - addSone("sone-id", mock()) - addHttpRequestParameter("query", "sone://sone-id") - verifyRedirect("viewSone.html?sone=sone-id") + addSone("Sone-ID", mock()) + addHttpRequestParameter("query", "sone://Sone-ID") + verifyRedirect("viewSone.html?sone=Sone-ID") } @Test fun `searching for sone link without prefix redirects to view sone page`() { - addSone("sone-id", mock()) + addSone("sone-id", mock()) addHttpRequestParameter("query", "sone-id") verifyRedirect("viewSone.html?sone=sone-id") } @Test fun `searching for a post link redirects to post page`() { - addPost("post-id", mock()) - addHttpRequestParameter("query", "post://post-id") - verifyRedirect("viewPost.html?post=post-id") + addPost("Post-id", mock()) + addHttpRequestParameter("query", "post://Post-id") + verifyRedirect("viewPost.html?post=Post-id") } @Test fun `searching for a post ID without prefix redirects to post page`() { - addPost("post-id", mock()) + addPost("post-id", mock()) addHttpRequestParameter("query", "post-id") verifyRedirect("viewPost.html?post=post-id") } @@ -92,8 +95,8 @@ class SearchPageTest: WebPageTest2({ template, webInterface -> SearchPage(templa @Test fun `searching for a reply link redirects to the post page`() { val postReply = mock().apply { whenever(postId).thenReturn("post-id") } - addPostReply("reply-id", postReply) - addHttpRequestParameter("query", "reply://reply-id") + addPostReply("Reply-id", postReply) + addHttpRequestParameter("query", "reply://Reply-id") verifyRedirect("viewPost.html?post=post-id") } @@ -107,28 +110,28 @@ class SearchPageTest: WebPageTest2({ template, webInterface -> SearchPage(templa @Test fun `searching for an album link redirects to the image browser`() { - addAlbum("album-id", mock()) + addAlbum("album-id", mock()) addHttpRequestParameter("query", "album://album-id") verifyRedirect("imageBrowser.html?album=album-id") } @Test fun `searching for an album ID redirects to the image browser`() { - addAlbum("album-id", mock()) + addAlbum("album-id", mock()) addHttpRequestParameter("query", "album-id") verifyRedirect("imageBrowser.html?album=album-id") } @Test fun `searching for an image link redirects to the image browser`() { - addImage("image-id", mock()) + addImage("image-id", mock()) addHttpRequestParameter("query", "image://image-id") verifyRedirect("imageBrowser.html?image=image-id") } @Test fun `searching for an image ID redirects to the image browser`() { - addImage("image-id", mock()) + addImage("image-id", mock()) addHttpRequestParameter("query", "image-id") verifyRedirect("imageBrowser.html?image=image-id") } @@ -282,7 +285,7 @@ class SearchPageTest: WebPageTest2({ template, webInterface -> SearchPage(templa @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") @@ -294,7 +297,7 @@ class SearchPageTest: WebPageTest2({ template, webInterface -> SearchPage(templa @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") @@ -307,7 +310,7 @@ class SearchPageTest: WebPageTest2({ template, webInterface -> SearchPage(templa @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 { @@ -318,7 +321,7 @@ class SearchPageTest: WebPageTest2({ template, webInterface -> SearchPage(templa @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") @@ -333,7 +336,7 @@ class SearchPageTest: WebPageTest2({ template, webInterface -> SearchPage(templa 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 { @@ -349,13 +352,13 @@ class SearchPageTest: WebPageTest2({ template, webInterface -> SearchPage(templa 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)) } @@ -364,4 +367,9 @@ class SearchPageTest: WebPageTest2({ template, webInterface -> SearchPage(templa @Suppress("UNCHECKED_CAST") private operator fun get(key: String): T? = templateContext[key] as? T + @Test + fun `page can be created by dependency injection`() { + assertThat(baseInjector.getInstance(), notNullValue()) + } + }