diff options
| author | Mathias <mathias@spray.cc> | 2011-05-24 23:02:25 +0200 |
|---|---|---|
| committer | Mathias <mathias@spray.cc> | 2011-05-24 23:02:25 +0200 |
| commit | 57bc594e1daa7dff6013759d6fc65f183118aa33 (patch) | |
| tree | f8ad4c437284fb0583a556a98aba74126a988ea3 /src/test/scala | |
| parent | 854700927ca944d684c9e0758b5a52da4dde2609 (diff) | |
| download | spray-json-57bc594e1daa7dff6013759d6fc65f183118aa33.tar.gz spray-json-57bc594e1daa7dff6013759d6fc65f183118aa33.tar.bz2 spray-json-57bc594e1daa7dff6013759d6fc65f183118aa33.zip | |
Add JsonFormat for JsValues, some more helpers
Diffstat (limited to 'src/test/scala')
| -rw-r--r-- | src/test/scala/cc/spray/json/BasicFormatsSpec.scala | 2 | ||||
| -rw-r--r-- | src/test/scala/cc/spray/json/CollectionFormatsSpec.scala | 2 | ||||
| -rw-r--r-- | src/test/scala/cc/spray/json/ProductFormatsSpec.scala (renamed from src/test/scala/cc/spray/json/GenericFormatsSpec.scala) | 2 | ||||
| -rw-r--r-- | src/test/scala/cc/spray/json/StandardFormatsSpec.scala | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/test/scala/cc/spray/json/BasicFormatsSpec.scala b/src/test/scala/cc/spray/json/BasicFormatsSpec.scala index 7207db5..c26d302 100644 --- a/src/test/scala/cc/spray/json/BasicFormatsSpec.scala +++ b/src/test/scala/cc/spray/json/BasicFormatsSpec.scala @@ -2,7 +2,7 @@ package cc.spray.json import org.specs.Specification -class BasicFormatsSpec extends Specification with BasicFormats { +class BasicFormatsSpec extends Specification with DefaultJsonProtocol { "The IntJsonFormat" should { "convert an Int to a JsNumber" in { diff --git a/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala b/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala index 7a47fb7..ba792a3 100644 --- a/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala +++ b/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala @@ -3,7 +3,7 @@ package cc.spray.json import org.specs.Specification import java.util.Arrays -class CollectionFormatsSpec extends Specification with CollectionFormats with BasicFormats { +class CollectionFormatsSpec extends Specification with DefaultJsonProtocol { "The listFormat" should { val list = List(1, 2, 3) diff --git a/src/test/scala/cc/spray/json/GenericFormatsSpec.scala b/src/test/scala/cc/spray/json/ProductFormatsSpec.scala index b284d42..5f253c2 100644 --- a/src/test/scala/cc/spray/json/GenericFormatsSpec.scala +++ b/src/test/scala/cc/spray/json/ProductFormatsSpec.scala @@ -2,7 +2,7 @@ package cc.spray.json import org.specs.Specification -class GenericFormatsSpec extends Specification with GenericFormats with BasicFormats { +class ProductFormatsSpec extends Specification with DefaultJsonProtocol { case class Test2(a: Int, b: Double) implicit val test2Format = jsonFormat(Test2, "a", "b") diff --git a/src/test/scala/cc/spray/json/StandardFormatsSpec.scala b/src/test/scala/cc/spray/json/StandardFormatsSpec.scala index 7c454ac..8005c9f 100644 --- a/src/test/scala/cc/spray/json/StandardFormatsSpec.scala +++ b/src/test/scala/cc/spray/json/StandardFormatsSpec.scala @@ -3,7 +3,7 @@ package cc.spray.json import org.specs.Specification import scala.Right -class StandardFormatsSpec extends Specification with StandardFormats with BasicFormats { +class StandardFormatsSpec extends Specification with DefaultJsonProtocol { "The optionFormat" should { "convert None to JsNull" in { |