raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

=htp small simplification in tests

Browse source
This commit is contained in:
Mathias 2014-10-06 10:38:24 +02:00
parent 9347bf57e7
commit 27c5167e73
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
akka-http-tests/src/test/scala/akka/http/marshalling/MarshallingSpec.scala
View file

@ -9,7 +9,7 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import org.scalatest.{ BeforeAndAfterAll, FreeSpec, Matchers }
import akka.actor.ActorSystem
import akka.stream.{ FlowMaterializer, MaterializerSettings }
import akka.stream.FlowMaterializer
import akka.http.util._
import akka.http.model._
import headers._
@ -18,12 +18,9 @@ import MediaTypes._
class MarshallingSpec extends FreeSpec with Matchers with BeforeAndAfterAll with MultipartMarshallers {
implicit val system = ActorSystem(getClass.getSimpleName)
implicit val materializer = FlowMaterializer()
import system.dispatcher
val materializerSettings = MaterializerSettings(system)
implicit val materializer = FlowMaterializer(materializerSettings)
"The PredefinedToEntityMarshallers." - {
"StringMarshaller should marshal strings to `text/plain` content in UTF-8" in {
marshal("Ha“llo") shouldEqual HttpEntity("Ha“llo")

8
akka-http-tests/src/test/scala/akka/http/unmarshalling/UnmarshallingSpec.scala
View file

@ -11,7 +11,7 @@ import org.scalatest.matchers.Matcher
import org.scalatest.{ BeforeAndAfterAll, FreeSpec, Matchers }
import akka.actor.ActorSystem
import akka.stream.scaladsl.Flow
import akka.stream.{ FlowMaterializer, MaterializerSettings }
import akka.stream.FlowMaterializer
import akka.http.model._
import akka.http.util._
import headers._
@ -20,13 +20,9 @@ import FastFuture._
class UnmarshallingSpec extends FreeSpec with Matchers with BeforeAndAfterAll {
implicit val system = ActorSystem(getClass.getSimpleName)
implicit val materializer = FlowMaterializer()
import system.dispatcher
val materializerSettings = MaterializerSettings(system)
implicit val materializer = FlowMaterializer(materializerSettings)
"The PredefinedFromEntityUnmarshallers." - {
"stringUnmarshaller should unmarshal `text/plain` content in UTF-8 to Strings" in {
Unmarshal(HttpEntity("Hällö")).to[String] should evaluateTo("Hällö")