!htp #15656 split out scala-xml support into its own subproject

akka-http-testkit/src/main/scala/akka/http/testkit/MarshallingTestUtils.scala

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
+ */
+
+package akka.http.testkit
+
+import akka.http.unmarshalling.{ Unmarshal, FromEntityUnmarshaller }
+
+import scala.concurrent.duration._
+import scala.concurrent.{ ExecutionContext, Await }
+
+import akka.http.marshalling._
+import akka.http.model.HttpEntity
+import akka.stream.FlowMaterializer
+
+import scala.util.Try
+
+trait MarshallingTestUtils {
+  def marshal[T: ToEntityMarshallers](value: T)(implicit ec: ExecutionContext, mat: FlowMaterializer): HttpEntity.Strict =
+    Await.result(Marshal(value).to[HttpEntity].flatMap(_.toStrict(1.second)), 1.second)
+
+  def unmarshalValue[T: FromEntityUnmarshaller](entity: HttpEntity)(implicit ec: ExecutionContext, mat: FlowMaterializer): T =
+    unmarshal(entity).get
+
+  def unmarshal[T: FromEntityUnmarshaller](entity: HttpEntity)(implicit ec: ExecutionContext, mat: FlowMaterializer): Try[T] = {
+    val fut = Unmarshal(entity).to[T]
+    Await.ready(fut, 1.second)
+    fut.value.get
+  }
+}
+

akka-http-testkit/src/main/scala/akka/http/testkit/RouteTest.scala

@@ -10,7 +10,6 @@ import scala.concurrent.{ Await, Future }
 import scala.concurrent.duration._
 import scala.util.DynamicVariable
 import scala.reflect.ClassTag
-import org.scalatest.Suite
 import akka.actor.ActorSystem
 import akka.stream.FlowMaterializer
 import akka.http.client.RequestBuilding
@@ -21,7 +20,7 @@ import akka.http.model._
 import headers.Host
 import FastFuture._
 
-trait RouteTest extends RequestBuilding with RouteTestResultComponent {
+trait RouteTest extends RequestBuilding with RouteTestResultComponent with MarshallingTestUtils {
   this: TestFrameworkInterface ⇒
 
   /** Override to supply a custom ActorSystem */
@@ -142,6 +141,4 @@ trait RouteTest extends RequestBuilding with RouteTestResultComponent {
   }
 }
 
-trait ScalatestRouteTest extends RouteTest with TestFrameworkInterface.Scalatest { this: Suite ⇒ }
-
 //FIXME: trait Specs2RouteTest extends RouteTest with Specs2Interface

akka-http-testkit/src/main/scala/akka/http/testkit/ScalatestUtils.scala

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
+ */
+
+package akka.http.testkit
+
+import akka.http.model.HttpEntity
+import akka.http.unmarshalling.FromEntityUnmarshaller
+import akka.stream.FlowMaterializer
+import org.scalatest.Suite
+import org.scalatest.matchers.Matcher
+
+import scala.concurrent.duration._
+import scala.concurrent.{ ExecutionContext, Future, Await }
+import scala.util.Try
+
+trait ScalatestUtils extends MarshallingTestUtils {
+  import org.scalatest.Matchers._
+  def evaluateTo[T](value: T): Matcher[Future[T]] =
+    equal(value).matcher[T] compose (x ⇒ Await.result(x, 1.second))
+
+  def haveFailedWith(t: Throwable): Matcher[Future[_]] =
+    equal(t).matcher[Throwable] compose (x ⇒ Await.result(x.failed, 1.second))
+
+  def unmarshalToValue[T: FromEntityUnmarshaller](value: T)(implicit ec: ExecutionContext, mat: FlowMaterializer): Matcher[HttpEntity] =
+    equal(value).matcher[T] compose (unmarshalValue(_))
+
+  def unmarshalTo[T: FromEntityUnmarshaller](value: Try[T])(implicit ec: ExecutionContext, mat: FlowMaterializer): Matcher[HttpEntity] =
+    equal(value).matcher[Try[T]] compose (unmarshal(_))
+}
+
+trait ScalatestRouteTest extends RouteTest with TestFrameworkInterface.Scalatest with ScalatestUtils { this: Suite ⇒ }