From 3fbe73696080f8a57722d40399fffc584eb28938 Mon Sep 17 00:00:00 2001 From: Mathias Date: Wed, 15 Oct 2014 14:48:02 +0200 Subject: [PATCH] =htp enable tests that were erroneously disabled due to specs2 -> scalatest copy-pasta --- .../src/test/scala/akka/http/coding/DecoderSpec.scala | 6 +++--- .../src/test/scala/akka/http/coding/EncoderSpec.scala | 6 +++--- .../scala/akka/http/unmarshalling/UnmarshallingSpec.scala | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/akka-http-tests/src/test/scala/akka/http/coding/DecoderSpec.scala b/akka-http-tests/src/test/scala/akka/http/coding/DecoderSpec.scala index ae65cfc2b1..cbbf3a056e 100644 --- a/akka-http-tests/src/test/scala/akka/http/coding/DecoderSpec.scala +++ b/akka-http-tests/src/test/scala/akka/http/coding/DecoderSpec.scala @@ -15,13 +15,13 @@ class DecoderSpec extends WordSpec with CodecSpecSupport { "A Decoder" should { "not transform the message if it doesn't contain a Content-Encoding header" in { val request = HttpRequest(POST, entity = HttpEntity(smallText)) - DummyDecoder.decode(request) === request + DummyDecoder.decode(request) shouldEqual request } "correctly transform the message if it contains a Content-Encoding header" in { val request = HttpRequest(POST, entity = HttpEntity(smallText), headers = List(`Content-Encoding`(DummyDecoder.encoding))) val decoded = DummyDecoder.decode(request) - decoded.headers === Nil - decoded.entity === HttpEntity(dummyDecompress(smallText)) + decoded.headers shouldEqual Nil + decoded.entity shouldEqual HttpEntity(dummyDecompress(smallText)) } } diff --git a/akka-http-tests/src/test/scala/akka/http/coding/EncoderSpec.scala b/akka-http-tests/src/test/scala/akka/http/coding/EncoderSpec.scala index 2d99c618ce..23f842bac6 100644 --- a/akka-http-tests/src/test/scala/akka/http/coding/EncoderSpec.scala +++ b/akka-http-tests/src/test/scala/akka/http/coding/EncoderSpec.scala @@ -15,13 +15,13 @@ class EncoderSpec extends WordSpec with CodecSpecSupport { "An Encoder" should { "not transform the message if messageFilter returns false" in { val request = HttpRequest(POST, entity = HttpEntity(smallText.getBytes("UTF8"))) - DummyEncoder.encode(request) === request + DummyEncoder.encode(request) shouldEqual request } "correctly transform the HttpMessage if messageFilter returns true" in { val request = HttpRequest(POST, entity = HttpEntity(smallText)) val encoded = DummyEncoder.encode(request) - encoded.headers === List(`Content-Encoding`(DummyEncoder.encoding)) - encoded.entity === HttpEntity(dummyCompress(smallText)) + encoded.headers shouldEqual List(`Content-Encoding`(DummyEncoder.encoding)) + encoded.entity shouldEqual HttpEntity(dummyCompress(smallText)) } } diff --git a/akka-http-tests/src/test/scala/akka/http/unmarshalling/UnmarshallingSpec.scala b/akka-http-tests/src/test/scala/akka/http/unmarshalling/UnmarshallingSpec.scala index 7d793272a1..3d349723d6 100644 --- a/akka-http-tests/src/test/scala/akka/http/unmarshalling/UnmarshallingSpec.scala +++ b/akka-http-tests/src/test/scala/akka/http/unmarshalling/UnmarshallingSpec.scala @@ -151,7 +151,7 @@ class UnmarshallingSpec extends FreeSpec with Matchers with BeforeAndAfterAll { // // "reject illegal multipart content" in { // val Left(MalformedContent(msg, _)) = HttpEntity(`multipart/form-data` withBoundary "XYZABC", "--noboundary--").as[MultipartFormData] - // msg === "Missing start boundary" + // msg shouldEqual "Missing start boundary" // } // "reject illegal form-data content" in { // val Left(MalformedContent(msg, _)) = HttpEntity(`multipart/form-data` withBoundary "XYZABC", @@ -160,7 +160,7 @@ class UnmarshallingSpec extends FreeSpec with Matchers with BeforeAndAfterAll { // | // |test@there.com // |--XYZABC--""".stripMargin).as[MultipartFormData] - // msg === "Illegal multipart/form-data content: unnamed body part (no Content-Disposition header or no 'name' parameter)" + // msg shouldEqual "Illegal multipart/form-data content: unnamed body part (no Content-Disposition header or no 'name' parameter)" // } } }