summaryrefslogtreecommitdiff
path: root/src/test/scala/spray
diff options
context:
space:
mode:
authorJohannes Rudolph <johannes.rudolph@gmail.com>2014-03-12 14:35:24 +0100
committerJohannes Rudolph <johannes.rudolph@gmail.com>2014-03-12 14:36:48 +0100
commitdf6863a973b1a2ded68e07eddbb9a2baa8daf169 (patch)
treee0a99df5e9b7015e924e50f4c7c13550727e476d /src/test/scala/spray
parent43d37d7cc08bb25957e6692baae0856ca1f522d4 (diff)
downloadspray-json-df6863a973b1a2ded68e07eddbb9a2baa8daf169.tar.gz
spray-json-df6863a973b1a2ded68e07eddbb9a2baa8daf169.tar.bz2
spray-json-df6863a973b1a2ded68e07eddbb9a2baa8daf169.zip
rename asJson => parseJson, fixes #89
Diffstat (limited to 'src/test/scala/spray')
-rw-r--r--src/test/scala/spray/json/AdditionalFormatsSpec.scala2
-rw-r--r--src/test/scala/spray/json/CustomFormatSpec.scala2
-rw-r--r--src/test/scala/spray/json/ReadmeSpec.scala2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/scala/spray/json/AdditionalFormatsSpec.scala b/src/test/scala/spray/json/AdditionalFormatsSpec.scala
index 7129fdf..eafceb2 100644
--- a/src/test/scala/spray/json/AdditionalFormatsSpec.scala
+++ b/src/test/scala/spray/json/AdditionalFormatsSpec.scala
@@ -51,7 +51,7 @@ class AdditionalFormatsSpec extends Specification {
"properly read a Container[Container[List[Int]]] from JSON" in {
import ReaderProtocol._
- """{"content":{"content":[1,2,3]}}""".asJson.convertTo[Container[Container[List[Int]]]] mustEqual obj
+ """{"content":{"content":[1,2,3]}}""".parseJson.convertTo[Container[Container[List[Int]]]] mustEqual obj
}
}
diff --git a/src/test/scala/spray/json/CustomFormatSpec.scala b/src/test/scala/spray/json/CustomFormatSpec.scala
index dcea4f2..2397abc 100644
--- a/src/test/scala/spray/json/CustomFormatSpec.scala
+++ b/src/test/scala/spray/json/CustomFormatSpec.scala
@@ -35,7 +35,7 @@ class CustomFormatSpec extends Specification with DefaultJsonProtocol {
"A custom JsonFormat built with 'asJsonObject'" should {
val value = MyType("bob", 42)
"correctly deserialize valid JSON content" in {
- """{ "name": "bob", "value": 42 }""".asJson.convertTo[MyType] mustEqual value
+ """{ "name": "bob", "value": 42 }""".parseJson.convertTo[MyType] mustEqual value
}
"support full round-trip (de)serialization" in {
value.toJson.convertTo[MyType] mustEqual value
diff --git a/src/test/scala/spray/json/ReadmeSpec.scala b/src/test/scala/spray/json/ReadmeSpec.scala
index 89d3dbc..51a1ec5 100644
--- a/src/test/scala/spray/json/ReadmeSpec.scala
+++ b/src/test/scala/spray/json/ReadmeSpec.scala
@@ -25,7 +25,7 @@ class ReadmeSpec extends Specification {
import DefaultJsonProtocol._
val source = """{ "some": "JSON source" }"""
- val jsonAst = source.asJson
+ val jsonAst = source.parseJson
jsonAst mustEqual JsObject("some" -> JsString("JSON source"))
val json2 = jsonAst.prettyPrint