X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FMarkAsKnownAjaxPageTest.kt;h=9c37a3d10f0b95a6b271e693779a1346a1d59b25;hp=b2db4c1316111bab059e04ddec5fda7bd598ebb5;hb=d14188d87056cfd63490ef9f16f4aae0c1864864;hpb=592018740929068926a799d0b9398ed4488a8aab

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPageTest.kt
index b2db4c1..9c37a3d 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPageTest.kt
@@ -1,16 +1,12 @@
 package net.pterodactylus.sone.web.ajax
 
-import net.pterodactylus.sone.data.Post
-import net.pterodactylus.sone.data.PostReply
-import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.test.whenever
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.equalTo
-import org.junit.Test
-import org.mockito.Mockito.any
-import org.mockito.Mockito.never
-import org.mockito.Mockito.verify
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.test.*
+import net.pterodactylus.sone.web.*
+import org.hamcrest.MatcherAssert.*
+import org.hamcrest.Matchers.*
+import org.junit.*
+import org.mockito.Mockito.*
 
 /**
  * Unit test for [MarkAsKnownAjaxPage].
@@ -19,15 +15,14 @@ class MarkAsKnownAjaxPageTest : JsonPageTest("markAsKnown.ajax", requiresLogin =
 
 	@Test
 	fun `request without type results in invalid-type`() {
-		assertThat(json.isSuccess, equalTo(false))
-		assertThat(json.error, equalTo("invalid-type"))
+		assertThatJsonFailed("invalid-type")
 	}
 
 	@Test
 	fun `request with unknown sone returns successfully`() {
 		addRequestParameter("type", "sone")
-		addRequestParameter("sone", "invalid")
-		assertThat(json.isSuccess, equalTo(true))
+		addRequestParameter("id", "invalid")
+		assertThatJsonIsSuccessful()
 		verify(core, never()).markSoneKnown(any())
 	}
 
@@ -39,7 +34,7 @@ class MarkAsKnownAjaxPageTest : JsonPageTest("markAsKnown.ajax", requiresLogin =
 		val sone2 = mock<Sone>().apply { whenever(id).thenReturn("sone-id2") }
 		addSone(sone1)
 		addSone(sone2)
-		assertThat(json.isSuccess, equalTo(true))
+		assertThatJsonIsSuccessful()
 		verify(core).markSoneKnown(sone1)
 		verify(core).markSoneKnown(sone2)
 	}
@@ -52,7 +47,7 @@ class MarkAsKnownAjaxPageTest : JsonPageTest("markAsKnown.ajax", requiresLogin =
 		val post2 = mock<Post>()
 		addPost(post1, "post1")
 		addPost(post2, "post2")
-		assertThat(json.isSuccess, equalTo(true))
+		assertThatJsonIsSuccessful()
 		verify(core).markPostKnown(post1)
 		verify(core).markPostKnown(post2)
 	}
@@ -65,9 +60,14 @@ class MarkAsKnownAjaxPageTest : JsonPageTest("markAsKnown.ajax", requiresLogin =
 		val reply2 = mock<PostReply>()
 		addReply(reply1, "reply1")
 		addReply(reply2, "reply2")
-		assertThat(json.isSuccess, equalTo(true))
+		assertThatJsonIsSuccessful()
 		verify(core).markReplyKnown(reply1)
 		verify(core).markReplyKnown(reply2)
 	}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+	    assertThat(baseInjector.getInstance<MarkAsKnownAjaxPage>(), notNullValue())
+	}
+
 }