diff options
| author | Mathias <mathias@spray.cc> | 2012-01-19 16:48:46 +0100 |
|---|---|---|
| committer | Mathias <mathias@spray.cc> | 2012-02-01 11:01:18 +0100 |
| commit | c6b5edcb5665b0ef60b5108d8cff3431c0663927 (patch) | |
| tree | 3c5641f3a1c351364e068ba54692e1370697661e /src/test/scala | |
| parent | 8e6d79cfc3080c276890a2653c545dade6387cf8 (diff) | |
| download | spray-json-c6b5edcb5665b0ef60b5108d8cff3431c0663927.tar.gz spray-json-c6b5edcb5665b0ef60b5108d8cff3431c0663927.tar.bz2 spray-json-c6b5edcb5665b0ef60b5108d8cff3431c0663927.zip | |
Add jsonFormatX overloads providing automatic case class field name extraction
Conflicts:
src/main/scala/cc/spray/json/ProductFormats.scala
Diffstat (limited to 'src/test/scala')
| -rw-r--r-- | src/test/scala/cc/spray/json/ProductFormatsSpec.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/scala/cc/spray/json/ProductFormatsSpec.scala b/src/test/scala/cc/spray/json/ProductFormatsSpec.scala index 6ec1611..c34f491 100644 --- a/src/test/scala/cc/spray/json/ProductFormatsSpec.scala +++ b/src/test/scala/cc/spray/json/ProductFormatsSpec.scala @@ -25,8 +25,8 @@ class ProductFormatsSpec extends Specification { trait TestProtocol { this: DefaultJsonProtocol => - implicit val test2Format = jsonFormat(Test2, "a", "b") - implicit def test3Format[A: JsonFormat, B: JsonFormat] = jsonFormat(Test3.apply[A, B], "as", "bs") + implicit val test2Format = jsonFormat2(Test2) + implicit def test3Format[A: JsonFormat, B: JsonFormat] = jsonFormat2(Test3.apply[A, B]) } object TestProtocol1 extends DefaultJsonProtocol with TestProtocol object TestProtocol2 extends DefaultJsonProtocol with TestProtocol with NullOptions |