X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPageTest.kt;h=9576c7c46116512ef73da07fec876b7142f5cbfa;hb=aefada2a6f469577c522c54b23d00ee735daa019;hp=2be420d77d012041f437c01aa3839b14b4195e30;hpb=40998dc856efb0df91f669c6dff1b829d573a54a;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPageTest.kt
index 2be420d..9576c7c 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPageTest.kt
@@ -28,7 +28,7 @@ import java.util.TimeZone
 /**
  * Unit test for [GetStatusAjaxPage].
  */
-class GetStatusAjaxPageTest: JsonPageTest() {
+class GetStatusAjaxPageTest: JsonPageTest("getStatus.ajax", requiresLogin = false, needsFormPassword = false) {
 
 	private val timeTextConverter = mock<TimeTextConverter>()
 	private val l10nFilter = mock<L10nFilter>()
@@ -41,37 +41,22 @@ class GetStatusAjaxPageTest: JsonPageTest() {
 	}
 
 	@Test
-	fun `page returns correct path`() {
-		assertThat(page.path, equalTo("getStatus.ajax"))
-	}
-
-	@Test
-	fun `page does not require form password`() {
-		assertThat(page.needsFormPassword(), equalTo(false))
-	}
-
-	@Test
-	fun `page does not require login`() {
-		assertThat(page.requiresLogin(), equalTo(false))
-	}
-
-	@Test
 	fun `page returns correct attribute “loggedIn” if sone is logged in`() {
-		assertThat(json.get("loggedIn").asText(), equalTo("true"))
+		assertThat(json.get("loggedIn")?.asText(), equalTo("true"))
 	}
 
 	@Test
 	fun `page returns correct attribute “loggedIn” if sone is not logged in`() {
 		unsetCurrentSone()
-		assertThat(json.get("loggedIn").asText(), equalTo("false"))
+		assertThat(json.get("loggedIn")?.asText(), equalTo("false"))
 	}
 
 	@Test
 	fun `page returns options for sone if sone is logged in`() {
-		assertThat(json.get("options").toMap(), allOf(
-				hasEntry("ShowNotification/NewSones", "false"),
-				hasEntry("ShowNotification/NewPosts", "false"),
-				hasEntry("ShowNotification/NewReplies", "false")
+		assertThat(json.get("options")?.toMap(), allOf(
+				hasEntry("ShowNotification/NewSones", "true"),
+				hasEntry("ShowNotification/NewPosts", "true"),
+				hasEntry("ShowNotification/NewReplies", "true")
 		))
 	}
 
@@ -89,7 +74,7 @@ class GetStatusAjaxPageTest: JsonPageTest() {
 
 	@Test
 	fun `page returns a sones object with the current sone if not other sones parameter is given`() {
-		assertThat(json.get("sones").elements().asSequence().map { it.toMap() }.toList(), containsInAnyOrder(
+		assertThat(json.get("sones")!!.elements().asSequence().map { it.toMap() }.toList(), containsInAnyOrder(
 				mapOf<String, String?>("id" to "soneId", "name" to "Sone_Id", "local" to "true", "status" to "idle", "modified" to "false", "locked" to "false", "lastUpdatedUnknown" to "false", "lastUpdated" to "Jan 1, 1970, 00:00:01", "lastUpdatedText" to "1000")
 		))
 	}
@@ -99,7 +84,7 @@ class GetStatusAjaxPageTest: JsonPageTest() {
 		addSone(deepMock<Sone>().mock("sone1", "Sone 1", false, 2000, downloading))
 		addSone(deepMock<Sone>().mock("sone3", "Sone 3", true, 3000, inserting))
 		addRequestParameter("soneIds", "sone1,sone2,sone3")
-		assertThat(json.get("sones").elements().asSequence().map { it.toMap() }.toList(), containsInAnyOrder(
+		assertThat(json.get("sones")!!.elements().asSequence().map { it.toMap() }.toList(), containsInAnyOrder(
 				mapOf<String, String?>("id" to "soneId", "name" to "Sone_Id", "local" to "true", "status" to "idle", "modified" to "false", "locked" to "false", "lastUpdatedUnknown" to "false", "lastUpdated" to "Jan 1, 1970, 00:00:01", "lastUpdatedText" to "1000"),
 				mapOf("id" to "sone1", "name" to "Sone 1", "local" to "false", "status" to "downloading", "modified" to "false", "locked" to "false", "lastUpdatedUnknown" to "false", "lastUpdated" to "Jan 1, 1970, 00:00:02", "lastUpdatedText" to "2000"),
 				mapOf("id" to "sone3", "name" to "Sone 3", "local" to "true", "status" to "inserting", "modified" to "false", "locked" to "false", "lastUpdatedUnknown" to "false", "lastUpdated" to "Jan 1, 1970, 00:00:03", "lastUpdatedText" to "3000")
@@ -112,15 +97,15 @@ class GetStatusAjaxPageTest: JsonPageTest() {
 				mock<Notification>().apply { whenever(this.createdTime).thenReturn(2000) },
 				mock<Notification>().apply { whenever(this.createdTime).thenReturn(1000) }
 		)
-		addNotification(*notifications.toTypedArray())
-		assertThat(json.get("notificationHash").asInt(), equalTo(notifications.sortedBy { it.createdTime }.hashCode()))
+		notifications.forEachIndexed { index, notification -> addNotification(notification, "notification$index")}
+		assertThat(json.get("notificationHash")?.asInt(), equalTo(notifications.sortedBy { it.createdTime }.hashCode()))
 	}
 
 	@Test
 	fun `page returns new posts`() {
 		addNewPost("post1", "sone1", 1000)
 		addNewPost("post2", "sone2", 2000, "sone1")
-		assertThat(json.get("newPosts").elements().asSequence().map { it.toMap() }.toList(), containsInAnyOrder(
+		assertThat(json.get("newPosts")!!.elements().asSequence().map { it.toMap() }.toList(), containsInAnyOrder(
 				mapOf("id" to "post1", "sone" to "sone1", "time" to "1000", "recipient" to null),
 				mapOf("id" to "post2", "sone" to "sone2", "time" to "2000", "recipient" to "sone1")
 		))
@@ -130,7 +115,7 @@ class GetStatusAjaxPageTest: JsonPageTest() {
 	fun `page returns new replies`() {
 		addNewReply("reply1", "sone1", "post1", "sone11")
 		addNewReply("reply2", "sone2", "post2", "sone22")
-		assertThat(json.get("newReplies").elements().asSequence().map { it.toMap() }.toList(), containsInAnyOrder(
+		assertThat(json.get("newReplies")!!.elements().asSequence().map { it.toMap() }.toList(), containsInAnyOrder(
 				mapOf<String, String?>("id" to "reply1", "sone" to "sone1", "post" to "post1", "postSone" to "sone11"),
 				mapOf("id" to "reply2", "sone" to "sone2", "post" to "post2", "postSone" to "sone22")
 		))
@@ -142,7 +127,7 @@ class GetStatusAjaxPageTest: JsonPageTest() {
 		addLinkedElement("KSK@test.html", loading = true, failed = false)
 		addLinkedElement("KSK@test.jpeg", loading = false, failed = true)
 		addRequestParameter("elements", jsonArray("KSK@test.png", "KSK@test.html", "KSK@test.jpeg").toString())
-		assertThat(json.get("linkedElements").elements().asSequence().map { it.toMap() }.toList(), containsInAnyOrder(
+		assertThat(json.get("linkedElements")!!.elements().asSequence().map { it.toMap() }.toList(), containsInAnyOrder(
 				mapOf<String, String?>("link" to "KSK@test.png", "loading" to "false", "failed" to "false"),
 				mapOf("link" to "KSK@test.html", "loading" to "true", "failed" to "false"),
 				mapOf("link" to "KSK@test.jpeg", "loading" to "false", "failed" to "true")