X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPageBaseTest.kt;h=75a0cd43793736a593e25c5b85232316068e04d4;hp=2e0eda36e4c028b27be7e841b2c713dffe766e57;hb=ea7ad5e87074576d17b7df74365a726bd95d7665;hpb=4bf90851f9e7a8f31d4f58f4f74dc46d8e4ddec8

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageBaseTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageBaseTest.kt
index 2e0eda3..75a0cd4 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageBaseTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageBaseTest.kt
@@ -54,7 +54,7 @@ class JsonPageBaseTest : TestObjects() {
 		assertThat(response.statusCode, equalTo(403))
 		assertThat(response.statusText, equalTo("Forbidden"))
 		assertThat(response.contentType, equalTo("application/json"))
-		assertThat(outputStream.toString("UTF-8"), equalTo("{\"success\":false,\"error\":\"auth-required\"}"))
+		assertThat(outputStream.toString("UTF-8").asJson(), equalTo(mapOf("success" to false, "error" to "auth-required")))
 	}
 
 	@Test
@@ -64,7 +64,7 @@ class JsonPageBaseTest : TestObjects() {
 		assertThat(response.statusCode, equalTo(403))
 		assertThat(response.statusText, equalTo("Forbidden"))
 		assertThat(response.contentType, equalTo("application/json"))
-		assertThat(outputStream.toString("UTF-8"), equalTo("{\"success\":false,\"error\":\"auth-required\"}"))
+		assertThat(outputStream.toString("UTF-8").asJson(), equalTo(mapOf("success" to false, "error" to "auth-required")))
 	}
 
 	@Test
@@ -75,7 +75,7 @@ class JsonPageBaseTest : TestObjects() {
 		assertThat(response.statusCode, equalTo(403))
 		assertThat(response.statusText, equalTo("Forbidden"))
 		assertThat(response.contentType, equalTo("application/json"))
-		assertThat(outputStream.toString("UTF-8"), equalTo("{\"success\":false,\"error\":\"auth-required\"}"))
+		assertThat(outputStream.toString("UTF-8").asJson(), equalTo(mapOf("success" to false, "error" to "auth-required")))
 	}
 
 	@Test
@@ -86,7 +86,7 @@ class JsonPageBaseTest : TestObjects() {
 		assertThat(response.statusCode, equalTo(200))
 		assertThat(response.statusText, equalTo("OK"))
 		assertThat(response.contentType, equalTo("application/json"))
-		assertThat(outputStream.toString("UTF-8"), equalTo("{\"success\":true,\"foo\":\"bar\"}"))
+		assertThat(outputStream.toString("UTF-8").asJson(), equalTo(mapOf("success" to true, "foo" to "bar")))
 	}
 
 	@Test
@@ -96,7 +96,7 @@ class JsonPageBaseTest : TestObjects() {
 		assertThat(response.statusCode, equalTo(403))
 		assertThat(response.statusText, equalTo("Forbidden"))
 		assertThat(response.contentType, equalTo("application/json"))
-		assertThat(outputStream.toString("UTF-8"), equalTo("{\"success\":false,\"error\":\"auth-required\"}"))
+		assertThat(outputStream.toString("UTF-8").asJson(), equalTo(mapOf("success" to false, "error" to "auth-required")))
 	}
 
 	@Test
@@ -106,7 +106,7 @@ class JsonPageBaseTest : TestObjects() {
 		assertThat(response.statusCode, equalTo(200))
 		assertThat(response.statusText, equalTo("OK"))
 		assertThat(response.contentType, equalTo("application/json"))
-		assertThat(outputStream.toString("UTF-8"), equalTo("{\"success\":true,\"foo\":\"bar\"}"))
+		assertThat(outputStream.toString("UTF-8").asJson(), equalTo(mapOf("success" to true, "foo" to "bar")))
 	}
 
 	@Test
@@ -130,4 +130,6 @@ class JsonPageBaseTest : TestObjects() {
 	    assertThat(page.isPrefixPage, equalTo(false))
 	}
 
+	private fun String.asJson() = objectMapper.readValue(this, Map::class.java) as Map<String, Any>
+
 }