summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorMathias <mathias@spray.cc>2011-12-07 10:38:29 +0100
committerMathias <mathias@spray.cc>2011-12-07 10:38:29 +0100
commit6a5ccb2e6c37f7922db34f29c1f9cfd61a2397e8 (patch)
tree5b58cf9463bf300e92f6eedb5042f5e4c5b6e93a /src/test
parentfd80c9099d4d474a6080df11a5786bd7e9b5cb7f (diff)
downloadspray-json-6a5ccb2e6c37f7922db34f29c1f9cfd61a2397e8.tar.gz
spray-json-6a5ccb2e6c37f7922db34f29c1f9cfd61a2397e8.tar.bz2
spray-json-6a5ccb2e6c37f7922db34f29c1f9cfd61a2397e8.zip
Move exception into package.scala, simplify throwing of (De)SerializationExceptions
Diffstat (limited to 'src/test')
-rw-r--r--src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala2
-rw-r--r--src/test/scala/cc/spray/json/ReadmeSpec.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala b/src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala
index f40fa37..217ae4a 100644
--- a/src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala
+++ b/src/test/scala/cc/spray/json/AdditionalFormatsSpec.scala
@@ -27,7 +27,7 @@ class AdditionalFormatsSpec extends Specification {
new JsonReader[Container[T]] {
def read(value: JsValue) = value match {
case JsObject(fields) if fields.contains("content") => Container(Some(jsonReader[T].read(fields("content"))))
- case _ => throw new DeserializationException("Unexpected format: " + value.toString)
+ case _ => deserializationError("Unexpected format: " + value.toString)
}
}
}
diff --git a/src/test/scala/cc/spray/json/ReadmeSpec.scala b/src/test/scala/cc/spray/json/ReadmeSpec.scala
index 3514d41..7e1d246 100644
--- a/src/test/scala/cc/spray/json/ReadmeSpec.scala
+++ b/src/test/scala/cc/spray/json/ReadmeSpec.scala
@@ -66,7 +66,7 @@ class ReadmeSpec extends Specification {
case JsArray(JsString(name) :: JsNumber(red) :: JsNumber(green) :: JsNumber(blue) :: Nil) => {
new Color(name, red.toInt, green.toInt, blue.toInt)
}
- case _ => throw new DeserializationException("Color expected")
+ case _ => deserializationError("Color expected")
}
}
}