X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetTimesAjaxPageTest.kt;h=62a34d1680b967e0ea0e7e94185d3e1fae91fa11;hb=c0776d261e552e1361bca845be0f47e4c26b5e9d;hp=5bffe094e78518aaa74c6eba613747aaad64c93a;hpb=f339996e95e45359e14becbe62d49863cf26acfd;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPageTest.kt
index 5bffe09..62a34d1 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPageTest.kt
@@ -6,19 +6,23 @@ import net.pterodactylus.sone.data.PostReply
 import net.pterodactylus.sone.freenet.L10nFilter
 import net.pterodactylus.sone.freenet.L10nText
 import net.pterodactylus.sone.test.get
+import net.pterodactylus.sone.test.getInstance
+import net.pterodactylus.sone.test.isProvidedByMock
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
 import net.pterodactylus.sone.text.TimeText
 import net.pterodactylus.sone.text.TimeTextConverter
 import net.pterodactylus.sone.utils.jsonObject
+import net.pterodactylus.sone.web.baseInjector
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.containsInAnyOrder
 import org.hamcrest.Matchers.emptyIterable
-import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.notNullValue
 import org.junit.Before
 import org.junit.Test
 import org.mockito.ArgumentMatchers.any
 import org.mockito.ArgumentMatchers.anyLong
+import java.util.TimeZone
 import java.util.TimeZone.getTimeZone
 
 /**
@@ -54,29 +58,29 @@ class GetTimesAjaxPageTest : JsonPageTest("getTimes.ajax", needsFormPassword = f
 
 	@Test
 	fun `request without any parameters responds with empty post and reply times`() {
-		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["postTimes"].toList(), emptyIterable())
-		assertThat(json["replyTimes"].toList(), emptyIterable())
+		assertThatJsonIsSuccessful()
+		assertThat(json["postTimes"]?.toList(), emptyIterable())
+		assertThat(json["replyTimes"]?.toList(), emptyIterable())
 	}
 
 	@Test
 	fun `request with single post parameter responds with post times and empty reply times`() {
 		addPost(testPosts[0])
 		addRequestParameter("posts", "post1")
-		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["postTimes"].fields().asSequence().map { it.key to it.value }.toList(), containsInAnyOrder<Pair<String, JsonNode>>(
+		assertThatJsonIsSuccessful()
+		assertThat(json["postTimes"]!!.fields().asSequence().map { it.key to it.value }.toList(), containsInAnyOrder<Pair<String, JsonNode>>(
 				"post1" to jsonObject("timeText" to "1000", "refreshTime" to 2L, "tooltip" to "Jan 1, 1970, 00:00:01")
 		))
-		assertThat(json["replyTimes"].toList(), emptyIterable())
+		assertThat(json["replyTimes"]?.toList(), emptyIterable())
 	}
 
 	@Test
 	fun `request with single reply parameter responds with reply times and empty post times`() {
 		addReply(testReplies[0])
 		addRequestParameter("replies", "reply1")
-		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["postTimes"].toList(), emptyIterable())
-		assertThat(json["replyTimes"].fields().asSequence().map { it.key to it.value }.toList(), containsInAnyOrder<Pair<String, JsonNode>>(
+		assertThatJsonIsSuccessful()
+		assertThat(json["postTimes"]?.toList(), emptyIterable())
+		assertThat(json["replyTimes"]!!.fields().asSequence().map { it.key to it.value }.toList(), containsInAnyOrder<Pair<String, JsonNode>>(
 				"reply1" to jsonObject("timeText" to "1000", "refreshTime" to 2L, "tooltip" to "Jan 1, 1970, 00:00:01")
 		))
 	}
@@ -86,12 +90,12 @@ class GetTimesAjaxPageTest : JsonPageTest("getTimes.ajax", needsFormPassword = f
 		addPost(testPosts[0])
 		addPost(testPosts[1])
 		addRequestParameter("posts", "post1,post2,post3")
-		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["postTimes"].fields().asSequence().map { it.key to it.value }.toList(), containsInAnyOrder<Pair<String, JsonNode>>(
+		assertThatJsonIsSuccessful()
+		assertThat(json["postTimes"]!!.fields().asSequence().map { it.key to it.value }.toList(), containsInAnyOrder<Pair<String, JsonNode>>(
 				"post1" to jsonObject("timeText" to "1000", "refreshTime" to 2L, "tooltip" to "Jan 1, 1970, 00:00:01"),
 				"post2" to jsonObject("timeText" to "2000", "refreshTime" to 4L, "tooltip" to "Jan 1, 1970, 00:00:02")
 		))
-		assertThat(json["replyTimes"].toList(), emptyIterable())
+		assertThat(json["replyTimes"]?.toList(), emptyIterable())
 	}
 
 	@Test
@@ -99,12 +103,21 @@ class GetTimesAjaxPageTest : JsonPageTest("getTimes.ajax", needsFormPassword = f
 		addReply(testReplies[0])
 		addReply(testReplies[1])
 		addRequestParameter("replies", "reply1,reply2,reply3")
-		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["postTimes"].toList(), emptyIterable())
-		assertThat(json["replyTimes"].fields().asSequence().map { it.key to it.value }.toList(), containsInAnyOrder<Pair<String, JsonNode>>(
+		assertThatJsonIsSuccessful()
+		assertThat(json["postTimes"]?.toList(), emptyIterable())
+		assertThat(json["replyTimes"]!!.fields().asSequence().map { it.key to it.value }.toList(), containsInAnyOrder<Pair<String, JsonNode>>(
 				"reply1" to jsonObject("timeText" to "1000", "refreshTime" to 2L, "tooltip" to "Jan 1, 1970, 00:00:01"),
 				"reply2" to jsonObject("timeText" to "2000", "refreshTime" to 4L, "tooltip" to "Jan 1, 1970, 00:00:02")
 		))
 	}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+		assertThat(baseInjector.createChildInjector(
+				TimeTextConverter::class.isProvidedByMock(),
+				L10nFilter::class.isProvidedByMock(),
+				TimeZone::class.isProvidedByMock()
+		).getInstance<GetTimesAjaxPage>(), notNullValue())
+	}
+
 }