X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FBookmarksPageTest.kt;h=04446a208f75485378e275da90a5a42b02ce4b42;hb=e409df7786c9d4556c8c754a447e494fbd95d32a;hp=327c3be8c474ae1533d9546b832548c9d7a2d39b;hpb=107af8767f5dce8c27fa4c91b3ff3bc951140cca;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarksPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarksPageTest.kt
index 327c3be..04446a2 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarksPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarksPageTest.kt
@@ -4,8 +4,6 @@ import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
 import net.pterodactylus.sone.utils.Pagination
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.BookmarksPage
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.contains
 import org.hamcrest.Matchers.equalTo
@@ -15,9 +13,8 @@ import org.junit.Test
 /**
  * Unit test for [BookmarksPage].
  */
-class BookmarksPageTest: WebPageTest() {
+class BookmarksPageTest: WebPageTest2(::BookmarksPage) {
 
-	private val page = BookmarksPage(template, webInterface)
 	private val post1 = createLoadedPost(1000)
 	private val post2 = createLoadedPost(3000)
 	private val post3 = createLoadedPost(2000)
@@ -41,20 +38,22 @@ class BookmarksPageTest: WebPageTest() {
 	@Test
 	@Suppress("UNCHECKED_CAST")
 	fun `page sets correct posts in template context`() {
-		page.processTemplate(freenetRequest, templateContext)
-		assertThat(templateContext["posts"] as Collection<Post>, contains(post2, post3, post1))
-		assertThat((templateContext["pagination"] as Pagination<Post>).items, contains(post2, post3, post1))
-		assertThat(templateContext["postsNotLoaded"], equalTo<Any>(false))
+		verifyNoRedirect {
+			assertThat(templateContext["posts"] as Collection<Post>, contains(post2, post3, post1))
+			assertThat((templateContext["pagination"] as Pagination<Post>).items, contains(post2, post3, post1))
+			assertThat(templateContext["postsNotLoaded"], equalTo<Any>(false))
+		}
 	}
 
 	@Test
 	@Suppress("UNCHECKED_CAST")
 	fun `page does not put unloaded posts in template context but sets a flag`() {
 		whenever(post3.isLoaded).thenReturn(false)
-		page.processTemplate(freenetRequest, templateContext)
-		assertThat(templateContext["posts"] as Collection<Post>, contains(post2, post1))
-		assertThat((templateContext["pagination"] as Pagination<Post>).items, contains(post2, post1))
-		assertThat(templateContext["postsNotLoaded"], equalTo<Any>(true))
+		verifyNoRedirect {
+			assertThat(templateContext["posts"] as Collection<Post>, contains(post2, post1))
+			assertThat((templateContext["pagination"] as Pagination<Post>).items, contains(post2, post1))
+			assertThat(templateContext["postsNotLoaded"], equalTo<Any>(true))
+		}
 	}
 
 }