private val outputStream = ByteArrayOutputStream()
private val response = Response(outputStream)
- private val page = object : JsonPage("path.html", webInterface) {
+ private val page = object : JsonPage(webInterface) {
- override fun needsFormPassword() = this@JsonPageBaseTest.needsFormPassword
+ override val needsFormPassword get() = this@JsonPageBaseTest.needsFormPassword
override fun createJsonObject(request: FreenetRequest) =
pageResponse().also { pageCallCounter.incrementAndGet() }
@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
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
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
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
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
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
assertThat(page.isPrefixPage, equalTo(false))
}
+ private fun String.asJson() = objectMapper.readValue(this, Map::class.java) as Map<String, Any>
+
}