summaryrefslogtreecommitdiff
path: root/src/test/scala/spray/json
diff options
context:
space:
mode:
authorMathias <mathias@spray.io>2014-10-28 12:23:29 +0100
committerMathias <mathias@spray.io>2014-10-28 12:26:49 +0100
commitc3bd8fe437f422e1314a1a2ecd45c1d8f16facaa (patch)
treeb906ed4399a1ed5663c5363b2d37935df84c268f /src/test/scala/spray/json
parente694cd7861266265bf69cb26c262f15ae2bab99c (diff)
downloadspray-json-c3bd8fe437f422e1314a1a2ecd45c1d8f16facaa.tar.gz
spray-json-c3bd8fe437f422e1314a1a2ecd45c1d8f16facaa.tar.bz2
spray-json-c3bd8fe437f422e1314a1a2ecd45c1d8f16facaa.zip
Fix OOE when parsing unterminated JSON strings, fixes #122
Diffstat (limited to 'src/test/scala/spray/json')
-rw-r--r--src/test/scala/spray/json/JsonParserSpec.scala6
-rw-r--r--src/test/scala/spray/json/RoundTripSpecs.scala2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/test/scala/spray/json/JsonParserSpec.scala b/src/test/scala/spray/json/JsonParserSpec.scala
index 4968eee..7d527b1 100644
--- a/src/test/scala/spray/json/JsonParserSpec.scala
+++ b/src/test/scala/spray/json/JsonParserSpec.scala
@@ -89,6 +89,12 @@ class JsonParserSpec extends Specification {
|[null, 1.23, { key":true } ]
| ^
|""".stripMargin
+
+ errorMessage("""{"a}""") ===
+ """Unexpected end-of-input at input index 4 (line 1, position 5), expected '"':
+ |{"a}
+ | ^
+ |""".stripMargin
}
}
} \ No newline at end of file
diff --git a/src/test/scala/spray/json/RoundTripSpecs.scala b/src/test/scala/spray/json/RoundTripSpecs.scala
index 7609a53..c4f7764 100644
--- a/src/test/scala/spray/json/RoundTripSpecs.scala
+++ b/src/test/scala/spray/json/RoundTripSpecs.scala
@@ -8,7 +8,7 @@ object JsValueGenerators {
import Gen._
import Arbitrary.arbitrary
- val parseableString: Gen[String] = arbitrary[String]
+ val parseableString: Gen[String] = Gen.someOf(('\u0020' to '\u007E').toVector).map(_.mkString)
val genString: Gen[JsString] = parseableString.map(JsString(_))
val genBoolean: Gen[JsBoolean] = oneOf(JsFalse, JsTrue)
val genLongNumber: Gen[JsNumber] = arbitrary[Long].map(JsNumber(_))