1 files changed, 22 insertions, 6 deletions
diff --git a/src/test/scala/cc/spray/json/StandardFormatsSpec.scala b/src/test/scala/cc/spray/json/StandardFormatsSpec.scala
index ad9485c..ed6283f 100644
--- a/src/test/scala/cc/spray/json/StandardFormatsSpec.scala
+++ b/src/test/scala/cc/spray/json/StandardFormatsSpec.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2011 Mathias Doenitz
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package cc.spray.json
 
 import org.specs2.mutable._
@@ -10,13 +26,13 @@ class StandardFormatsSpec extends Specification with DefaultJsonProtocol {
       None.asInstanceOf[Option[Int]].toJson mustEqual JsNull
     }
     "convert JsNull to None" in {
-      JsNull.fromJson[Option[Int]] mustEqual None
+      JsNull.convertTo[Option[Int]] mustEqual None
     } 
     "convert Some(Hello) to JsString(Hello)" in {
       Some("Hello").asInstanceOf[Option[String]].toJson mustEqual JsString("Hello")
     }
     "convert JsString(Hello) to Some(Hello)" in {
-      JsString("Hello").fromJson[Option[String]] mustEqual Some("Hello")
+      JsString("Hello").convertTo[Option[String]] mustEqual Some("Hello")
     } 
   }
 
@@ -31,10 +47,10 @@ class StandardFormatsSpec extends Specification with DefaultJsonProtocol {
       b.toJson mustEqual JsString("Hello")
     }
     "convert the left side of an Either value from Json" in {
-      JsNumber(42).fromJson[Either[Int, String]] mustEqual Left(42)
+      JsNumber(42).convertTo[Either[Int, String]] mustEqual Left(42)
     }
     "convert the right side of an Either value from Json" in {
-      JsString("Hello").fromJson[Either[Int, String]] mustEqual Right("Hello")
+      JsString("Hello").convertTo[Either[Int, String]] mustEqual Right("Hello")
     }
   }
   
@@ -43,7 +59,7 @@ class StandardFormatsSpec extends Specification with DefaultJsonProtocol {
       Tuple1(42).toJson mustEqual JsNumber(42)
     }
     "be able to convert a JsNumber to a Tuple1[Int]" in {
-      JsNumber(42).fromJson[Tuple1[Int]] mustEqual Tuple1(42) 
+      JsNumber(42).convertTo[Tuple1[Int]] mustEqual Tuple1(42)
     }
   }
   
@@ -53,7 +69,7 @@ class StandardFormatsSpec extends Specification with DefaultJsonProtocol {
       (42, 4.2).toJson mustEqual json
     }
     "be able to convert a JsArray to a (Int, Double)]" in {
-      json.fromJson[(Int, Double)] mustEqual (42, 4.2) 
+      json.convertTo[(Int, Double)] mustEqual (42, 4.2)
     }
   }