Merge pull request #168 from pasieronen/master

Allow JsonParser to optionally parse multiple values (see #137)

1 files changed, 13 insertions, 0 deletions

diff --git a/src/test/scala/spray/json/JsonParserSpec.scala b/src/test/scala/spray/json/JsonParserSpec.scala
index d7db026..a97f021 100644
--- a/src/test/scala/spray/json/JsonParserSpec.scala
+++ b/src/test/scala/spray/json/JsonParserSpec.scala
@@ -108,5 +108,18 @@ class JsonParserSpec extends Specification {
           |  ^
           |""".stripMargin
     }
+
+    "parse multiple values when allowTrailingInput" in {
+      val parser = new JsonParser("""{"key":1}{"key":2}""")
+      parser.parseJsValue(true) === JsObject("key" -> JsNumber(1))
+      parser.parseJsValue(true) === JsObject("key" -> JsNumber(2))
+    }
+    "reject trailing input when !allowTrailingInput" in {
+      def parser = JsonParser("""{"key":1}x""")
+      parser must throwA[JsonParser.ParsingException].like {
+        case e: JsonParser.ParsingException => e.getMessage must contain("expected end-of-input")
+      }
+    }
+
   }
 }