X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreateReplyAjaxPageTest.kt;h=6931b69555b923a6abd58ca800b1f7e27d40966b;hb=d58ef344b43543fdcfca13c07df87e194f004376;hp=ff48460e0bc1d7934788d695a3d66fa82a3658f0;hpb=a57c17c9a431eeb5925cc8a4e7500c53c9b3f412;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPageTest.kt
index ff48460..6931b69 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPageTest.kt
@@ -23,43 +23,43 @@ class CreateReplyAjaxPageTest : JsonPageTest("createReply.ajax", pageSupplier =
 	@Test
 	fun `valid post ID results in created reply`() {
 		val post = mock<Post>()
-		addPost("post-id", post)
+		addPost(post, "post-id")
 		val reply = mock<PostReply>().apply { whenever(id).thenReturn("reply-id") }
 		whenever(core.createReply(currentSone, post, "")).thenReturn(reply)
 	    addRequestParameter("post", "post-id")
 		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["reply"].asText(), equalTo("reply-id"))
-		assertThat(json["sone"].asText(), equalTo("soneId"))
+		assertThat(json["reply"]?.asText(), equalTo("reply-id"))
+		assertThat(json["sone"]?.asText(), equalTo("soneId"))
 	}
 
 	@Test
 	fun `text is filtered when creating reply`() {
 		val post = mock<Post>()
-		addPost("post-id", post)
+		addPost(post, "post-id")
 		val reply = mock<PostReply>().apply { whenever(id).thenReturn("reply-id") }
 		whenever(core.createReply(currentSone, post, "Text with KSK@foo.bar link")).thenReturn(reply)
 		addRequestParameter("post", "post-id")
 		addRequestParameter("text", "Text with http://127.0.0.1:8888/KSK@foo.bar link")
 		addRequestHeader("Host", "127.0.0.1:8888")
 		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["reply"].asText(), equalTo("reply-id"))
-		assertThat(json["sone"].asText(), equalTo("soneId"))
+		assertThat(json["reply"]?.asText(), equalTo("reply-id"))
+		assertThat(json["sone"]?.asText(), equalTo("soneId"))
 	}
 
 	@Test
 	fun `sender can be chosen from local sones`() {
 	    val sone = mock<Sone>().apply { whenever(id).thenReturn("local-sone") }
-		addLocalSone("local-sone", sone)
+		addLocalSone(sone)
 		val post = mock<Post>()
-		addPost("post-id", post)
+		addPost(post, "post-id")
 		val reply = mock<PostReply>().apply { whenever(id).thenReturn("reply-id") }
 		whenever(core.createReply(sone, post, "Text")).thenReturn(reply)
 		addRequestParameter("post", "post-id")
 		addRequestParameter("text", "Text")
 		addRequestParameter("sender", "local-sone")
 		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["reply"].asText(), equalTo("reply-id"))
-		assertThat(json["sone"].asText(), equalTo("local-sone"))
+		assertThat(json["reply"]?.asText(), equalTo("reply-id"))
+		assertThat(json["sone"]?.asText(), equalTo("local-sone"))
 	}
 
 }