impove formatting and tests

CHANGELOG.md

@@ -2,6 +2,7 @@
 * jdbc: DB_READONLY=true env var can be used to make the whole app read-only (e.g. when migrating the DB, instead of Heroku maintenance mode)
 * jdbc: CrudRepository.get() now has optional forUpdate parameter
 * HttpExchange.fileName() added for setting of Content-Disposition
+* json: json within json (and '\') are now properly escaped
 * csv: new module for CSV parsing/generation
 
 # 1.5.5

json/src/JsonRenderer.kt

@@ -29,7 +29,7 @@ class JsonRenderer(private val out: Writer, private val opts: JsonMapper): AutoC
   private fun writeString(s: String) {
     write('\"')
     s.forEach { when(it) {
-      '\n' -> write("\\n");'\\' -> write("\\\\"); '\r' -> write("\\r"); '\t' -> write("\\t"); '"' -> write("\\\"")
+      '\n' -> write("\\n"); '\r' -> write("\\r"); '\t' -> write("\\t"); '"' -> write("\\\""); '\\' -> write("\\\\")
       in '\u0000'..'\u001F' -> { write("\\u"); write(it.code.toString(16).padStart(4, '0')) }
       else -> write(it)
     } }

json/test/JsonRendererTest.kt

@@ -23,7 +23,7 @@ class JsonRendererTest {
 
   @Test fun string() {
     expect(mapper.render("Hello")).toEqual("\"Hello\"")
-    expect(mapper.render("Hello\n\t\"World\"\u001F")).toEqual("\"Hello\\n\\t\\\"World\\\"\\u001f\"")
+    expect(mapper.render("Hello\n\t\"World\"\u001F\\")).toEqual("\"Hello\\n\\t\\\"World\\\"\\u001f\\\\\"")
   }
 
   @Test fun converter() {
@@ -46,8 +46,7 @@ class JsonRendererTest {
     expect(mapper.render(mapOf(1 to mapOf(2 to arrayOf(1, 2, 3))))).toEqual("""{"1":{"2":[1,2,3]}}""")
   }
 
-  @Test
-  fun escaped() {
+  @Test fun `json in json`() {
     val value = mapper.render(mapOf("a" to "\"foo\""))
     expect(mapper.render(mapOf("x" to value))).toEqual("""{"x":"{\"a\":\"\\\"foo\\\"\"}"}""")
   }