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=5e32a7d8d38bc7c45015a7323c79ed67b9413ee1;hp=694f17070c73d512e8b1638e79471d7380fac8b1;hb=fc8e9ea5c978d2f5a00894e093364ae62f18934b;hpb=ba8cf4e471423d30701ddac7a1f29cde42906f8a

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 694f170..5e32a7d 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageBaseTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonPageBaseTest.kt
@@ -25,7 +25,7 @@ class JsonPageBaseTest : TestObjects() {
 
 	private val page = object : JsonPage("path.html", webInterface) {
 
-		override fun needsFormPassword() = this@JsonPageBaseTest.needsFormPassword
+		override val needsFormPassword get() = this@JsonPageBaseTest.needsFormPassword
 
 		override fun createJsonObject(request: FreenetRequest) =
 				pageResponse().also { pageCallCounter.incrementAndGet() }
@@ -49,12 +49,12 @@ class JsonPageBaseTest : TestObjects() {
 
 	@Test
 	fun `page returns 403 is full access is required but request is not full access`() {
-		core.preferences.isRequireFullAccess = true
+		core.preferences.newRequireFullAccess = true
 		page.handleRequest(freenetRequest, response)
 		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>
+
 }