Tidy up Json Extractors

pawelkaczor · Jun 19, 2014 · 307dbd1 · 307dbd1
1 parent 47fe58b
commit 307dbd1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/main/scala/org/iainhull/resttest/JsonExtractors.scala b/src/main/scala/org/iainhull/resttest/JsonExtractors.scala
@@ -34,29 +34,31 @@ trait JsonExtractors {
   /**
    * Extract the response body as an object.
    */
-  def jsonBodyAs[T: Reads](implicit tag : reflect.ClassTag[T] ): Extractor[T] = jsonBodyAs(JsPath)
+  def jsonBodyAs[T: Reads : reflect.ClassTag]: Extractor[T] = jsonBodyAs(JsPath)
 
   /**
    * Extract a portion of the response body as an object.
    *
    * @param path the path for the portion of the response to use
    */
-  def jsonBodyAs[T: Reads](path: JsPath = JsPath)(implicit tag : reflect.ClassTag[T] ) = {
-    JsonBody andThen (jsonToValue(_, path)) as (s"JsonBodyAs[${tag.runtimeClass.getName}]")
+  def jsonBodyAs[T: Reads : reflect.ClassTag](path: JsPath) = {
+    val tag = implicitly[reflect.ClassTag[T]]
+    JsonBody andThen (jsonToValue(_, path)) as (s"jsonBodyAs[${tag.runtimeClass.getSimpleName}]")
   }
 
   /**
    * Extract the response body as a List of objects.
    */
-  def jsonBodyAsList[T: Reads](implicit tag : reflect.ClassTag[T] ): Extractor[Seq[T]] = jsonBodyAsList(JsPath)
+  def jsonBodyAsList[T: Reads](implicit tag : reflect.ClassTag[T]): Extractor[Seq[T]] = jsonBodyAsList(JsPath)
 
   /**
    * Extract a portion of the response body as a List of objects.
    *
    * @param path the path for the portion of the response to use
    */
-  def jsonBodyAsList[T: Reads](path: JsPath = JsPath)(implicit tag : reflect.ClassTag[T] ) = {
-    JsonBody andThen (jsonToList(_, path)) as (s"JsonBodyAsList[${tag.runtimeClass.getName}]")
+  def jsonBodyAsList[T: Reads : reflect.ClassTag](path: JsPath) = {
+    val tag = implicitly[reflect.ClassTag[T]]
+    JsonBody andThen (jsonToList(_, path)) as (s"jsonBodyAsList[${tag.runtimeClass.getSimpleName}]")
   }
 }
 

diff --git a/src/main/scala/org/iainhull/resttest/TestDriver.scala b/src/main/scala/org/iainhull/resttest/TestDriver.scala
@@ -44,4 +44,4 @@ trait TestDriver {
    * The default RequestBuilder, common to all tests
    */
   implicit def defBuilder: RequestBuilder
-}
+}
diff --git a/src/test/scala/org/iainhull/resttest/JsonExtractorsSpec.scala b/src/test/scala/org/iainhull/resttest/JsonExtractorsSpec.scala
@@ -43,8 +43,17 @@ class JsonExtractorsSpec extends FlatSpec with Matchers {
     evaluate(jsonBodyAsList[Int](__ \\ "age"), jsonList) should be(List(25, 20))
   }
 
+  it should "include the type in its name" in {
+    jsonBodyAsList[Person].name should be ("jsonBodyAsList[Person]")
+  }
+
+
   "jsonBodyAs" should "deserialise to scala types" in {
     evaluate(jsonBodyAs[Person], Json parse personJson) should be(Jason)
     evaluate(jsonBodyAs[String](__ \ "user" \ "name"), jsonDoc) should be("toto")
   }
+
+  it should "include the type in its name" in {
+    jsonBodyAs[Person].name should be ("jsonBodyAs[Person]")
+  }
 }