X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FNewPageTest.kt;h=ecdb3db41987d8b7e3ef39b54c106b55350e5fa9;hp=5c71e5dc876e81385c4e3e96ac09dd2a0418f531;hb=a76956e389fcfe6282ad4ca7156bbf76327bb0c0;hpb=03c29a3838e23ed0b9731ca4d84cf58038c30dfe

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/NewPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/NewPageTest.kt
index 5c71e5d..ecdb3db 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/NewPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/NewPageTest.kt
@@ -1,21 +1,14 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.data.Post
-import net.pterodactylus.sone.data.PostReply
-import net.pterodactylus.sone.test.getInstance
-import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.utils.Pagination
-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.containsInAnyOrder
-import org.hamcrest.Matchers.equalTo
-import org.hamcrest.Matchers.notNullValue
-import org.junit.Before
-import org.junit.Test
-import java.util.Arrays.asList
+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.Arrays.*
 
 /**
  * Unit test for [NewPage].
@@ -24,7 +17,7 @@ class NewPageTest: WebPageTest(::NewPage) {
 
 	@Before
 	fun setupNumberOfPostsPerPage() {
-		webInterface.core.preferences.postsPerPage = 5
+		webInterface.core.preferences.newPostsPerPage = 5
 	}
 
 	@Test
@@ -40,7 +33,7 @@ class NewPageTest: WebPageTest(::NewPage) {
 	@Test
 	fun `page returns correct title`() {
 		addTranslation("Page.New.Title", "new page title")
-		assertThat(page.getPageTitle(freenetRequest), equalTo("new page title"))
+		assertThat(page.getPageTitle(soneRequest), equalTo("new page title"))
 	}
 
 	@Test
@@ -64,7 +57,7 @@ class NewPageTest: WebPageTest(::NewPage) {
 	@Test
 	@Suppress("UNCHECKED_CAST")
 	fun `posts are paginated properly`() {
-		webInterface.core.preferences.postsPerPage = 2
+		webInterface.core.preferences.newPostsPerPage = 2
 		val posts = listOf(mock<Post>().withTime(2000), mock<Post>().withTime(3000), mock<Post>().withTime(1000))
 		whenever(webInterface.getNewPosts(currentSone)).thenReturn(posts)
 		verifyNoRedirect {
@@ -75,7 +68,7 @@ class NewPageTest: WebPageTest(::NewPage) {
 	@Test
 	@Suppress("UNCHECKED_CAST")
 	fun `posts are paginated properly on second page`() {
-		webInterface.core.preferences.postsPerPage = 2
+		webInterface.core.preferences.newPostsPerPage = 2
 		addHttpRequestParameter("page", "1")
 		val posts = listOf(mock<Post>().withTime(2000), mock<Post>().withTime(3000), mock<Post>().withTime(1000))
 		whenever(webInterface.getNewPosts(currentSone)).thenReturn(posts)
@@ -89,4 +82,14 @@ class NewPageTest: WebPageTest(::NewPage) {
 	    assertThat(baseInjector.getInstance<NewPage>(), notNullValue())
 	}
 
+	@Test
+	fun `page is annotated with the correct menuname`() {
+	    assertThat(page.menuName, equalTo("New"))
+	}
+
+	@Test
+	fun `page is annotated with correct template path`() {
+	    assertThat(page.templatePath, equalTo("/templates/new.html"))
+	}
+
 }