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

=htp small style cleanup in tests

Browse source
This commit is contained in:
Mathias 2015-11-11 21:40:59 +01:00
parent 83dd1a1c4e
commit ad9d698209
3 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

98
akka-http-core/src/test/scala/akka/http/impl/engine/server/HttpServerSpec.scala
View file

@ -33,7 +33,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|""")
expectRequest shouldEqual HttpRequest(uri = "http://example.com/", headers = List(Host("example.com")))
expectRequest() shouldEqual HttpRequest(uri = "http://example.com/", headers = List(Host("example.com")))
}
"deliver a request as soon as all headers are received" in new TestSetup {
@ -43,7 +43,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, HttpEntity.Default(_, 12, data), _) ⇒
val dataProbe = TestSubscriber.manualProbe[ByteString]
data.to(Sink(dataProbe)).run()
@ -86,7 +86,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|abcdef
|""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, HttpEntity.Chunked(_, data), _) ⇒
val dataProbe = TestSubscriber.manualProbe[ChunkStreamPart]
data.to(Sink(dataProbe)).run()
@ -122,7 +122,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|abcdefghijkl""")
expectRequest shouldEqual
expectRequest() shouldEqual
HttpRequest(
method = POST,
uri = "http://example.com/strict",
@ -137,7 +137,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|abcdef""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, HttpEntity.Default(_, 12, data), _) ⇒
val dataProbe = TestSubscriber.manualProbe[ByteString]
data.to(Sink(dataProbe)).run()
@ -160,7 +160,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|abcdef
|""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, HttpEntity.Chunked(_, data), _) ⇒
val dataProbe = TestSubscriber.manualProbe[ChunkStreamPart]
data.to(Sink(dataProbe)).run()
@ -181,7 +181,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|abcdefghijkl""")
expectRequest shouldEqual
expectRequest() shouldEqual
HttpRequest(
method = POST,
uri = "http://example.com/strict",
@ -194,7 +194,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|mnopqrstuvwx""")
expectRequest shouldEqual
expectRequest() shouldEqual
HttpRequest(
method = POST,
uri = "http://example.com/next-strict",
@ -209,7 +209,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|abcdef""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, HttpEntity.Default(_, 12, data), _) ⇒
val dataProbe = TestSubscriber.manualProbe[ByteString]
data.to(Sink(dataProbe)).run()
@ -231,7 +231,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|abcde""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, HttpEntity.Strict(_, data), _) ⇒
data shouldEqual ByteString("abcde")
}
@ -246,7 +246,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|abcdef
|""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, HttpEntity.Chunked(_, data), _) ⇒
val dataProbe = TestSubscriber.manualProbe[ChunkStreamPart]
data.to(Sink(dataProbe)).run()
@ -269,7 +269,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|abcde""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, HttpEntity.Strict(_, data), _) ⇒
data shouldEqual ByteString("abcde")
}
@ -282,7 +282,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|abcdef""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, HttpEntity.Default(_, 12, data), _) ⇒
val dataProbe = TestSubscriber.manualProbe[ByteString]
data.to(Sink(dataProbe)).run()
@ -305,7 +305,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|abcdef
|""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, HttpEntity.Chunked(_, data), _) ⇒
val dataProbe = TestSubscriber.manualProbe[ChunkStreamPart]
data.to(Sink(dataProbe)).run()
@ -326,7 +326,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|Content-Length: 12
|
|abcdef""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, HttpEntity.Default(_, 12, data), _) ⇒
val dataProbe = TestSubscriber.manualProbe[ByteString]
data.to(Sink(dataProbe)).run()
@ -347,7 +347,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|6
|abcdef
|""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, HttpEntity.Chunked(_, data), _) ⇒
val dataProbe = TestSubscriber.manualProbe[ChunkStreamPart]
data.to(Sink(dataProbe)).run()
@ -366,7 +366,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|Host: example.com
|
|""")
expectRequest shouldEqual HttpRequest(GET, uri = "http://example.com/", headers = List(Host("example.com")))
expectRequest() shouldEqual HttpRequest(GET, uri = "http://example.com/", headers = List(Host("example.com")))
}
"keep HEAD request when transparent-head-requests are disabled" in new TestSetup {
@ -375,7 +375,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|Host: example.com
|
|""")
expectRequest shouldEqual HttpRequest(HEAD, uri = "http://example.com/", headers = List(Host("example.com")))
expectRequest() shouldEqual HttpRequest(HEAD, uri = "http://example.com/", headers = List(Host("example.com")))
}
"not emit entities when responding to HEAD requests if transparent-head-requests is enabled (with Strict)" in new TestSetup {
@ -383,7 +383,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|Host: example.com
|
|""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(GET, _, _, _, _) ⇒
responses.sendNext(HttpResponse(entity = HttpEntity.Strict(ContentTypes.`text/plain`, ByteString("abcd"))))
expectResponseWithWipedDate(
@ -403,7 +403,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|""")
val data = TestPublisher.manualProbe[ByteString]()
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(GET, _, _, _, _) ⇒
responses.sendNext(HttpResponse(entity = HttpEntity.Default(ContentTypes.`text/plain`, 4, Source(data))))
val dataSub = data.expectSubscription()
@ -425,7 +425,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|""")
val data = TestPublisher.manualProbe[ByteString]()
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(GET, _, _, _, _) ⇒
responses.sendNext(HttpResponse(entity = HttpEntity.CloseDelimited(ContentTypes.`text/plain`, Source(data))))
val dataSub = data.expectSubscription()
@ -448,7 +448,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|""")
val data = TestPublisher.manualProbe[ChunkStreamPart]()
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(GET, _, _, _, _) ⇒
responses.sendNext(HttpResponse(entity = HttpEntity.Chunked(ContentTypes.`text/plain`, Source(data))))
val dataSub = data.expectSubscription()
@ -471,7 +471,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|""")
val data = TestPublisher.manualProbe[ByteString]()
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(GET, _, _, _, _) ⇒
responses.sendNext(HttpResponse(entity = CloseDelimited(ContentTypes.`text/plain`, Source(data))))
val dataSub = data.expectSubscription()
@ -488,7 +488,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|Content-Length: 16
|
|""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, Default(ContentType(`application/octet-stream`, None), 16, data), _) ⇒
val dataProbe = TestSubscriber.manualProbe[ByteString]
data.to(Sink(dataProbe)).run()
@ -524,7 +524,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|Transfer-Encoding: chunked
|
|""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, Chunked(ContentType(`application/octet-stream`, None), data), _) ⇒
val dataProbe = TestSubscriber.manualProbe[ChunkStreamPart]
data.to(Sink(dataProbe)).run()
@ -565,7 +565,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|Content-Length: 16
|
|""")
inside(expectRequest) {
inside(expectRequest()) {
case HttpRequest(POST, _, _, Default(ContentType(`application/octet-stream`, None), 16, data), _) ⇒
responses.sendNext(HttpResponse(entity = "Yeah"))
expectResponseWithWipedDate(
@ -586,7 +586,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|""".stripMarginWithNewline("\r\n"))
expectRequest shouldEqual HttpRequest(uri = "http://example.com/", headers = List(Host("example.com")))
expectRequest() shouldEqual HttpRequest(uri = "http://example.com/", headers = List(Host("example.com")))
responses.expectRequest()
responses.sendError(new RuntimeException("CRASH BOOM BANG"))
@ -608,7 +608,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|""")
val HttpRequest(POST, _, _, entity, _) = expectRequest
val HttpRequest(POST, _, _, entity, _) = expectRequest()
responses.sendNext(HttpResponse(entity = entity))
responses.sendComplete()
@ -643,7 +643,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|""")
expectRequest shouldEqual HttpRequest(uri = "http://example.com//foo", headers = List(Host("example.com")))
expectRequest() shouldEqual HttpRequest(uri = "http://example.com//foo", headers = List(Host("example.com")))
}
"use default-host-header for HTTP/1.0 requests" in new TestSetup {
@ -651,7 +651,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|""")
expectRequest shouldEqual HttpRequest(uri = "http://example.com/abc", protocol = HttpProtocols.`HTTP/1.0`)
expectRequest() shouldEqual HttpRequest(uri = "http://example.com/abc", protocol = HttpProtocols.`HTTP/1.0`)
override def settings: ServerSettings = super.settings.copy(defaultHostHeader = Host("example.com"))
}
@ -686,7 +686,7 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
|
|""".stripMarginWithNewline("\r\n"))
val request = expectRequest
val request = expectRequest()
request.headers should contain(`Remote-Address`(RemoteAddress(theAddress, Some(8080))))
}
@ -780,80 +780,80 @@ class HttpServerSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF")
"the config setting (strict entity)" in new LengthVerificationTest(maxContentLength = 10) {
sendStrictRequestWithLength(10)
expectRequest.expectEntity[HttpEntity.Strict](10)
expectRequest().expectEntity[HttpEntity.Strict](10)
// entities that would be strict but have a Content-Length > the configured maximum are delivered
// as single element Default entities!
sendStrictRequestWithLength(11)
expectRequest.expectDefaultEntityWithSizeError(limit = 10, actualSize = 11)
expectRequest().expectDefaultEntityWithSizeError(limit = 10, actualSize = 11)
}
"the config setting (default entity)" in new LengthVerificationTest(maxContentLength = 10) {
sendDefaultRequestWithLength(10)
expectRequest.expectEntity[HttpEntity.Default](10)
expectRequest().expectEntity[HttpEntity.Default](10)
sendDefaultRequestWithLength(11)
expectRequest.expectDefaultEntityWithSizeError(limit = 10, actualSize = 11)
expectRequest().expectDefaultEntityWithSizeError(limit = 10, actualSize = 11)
}
"the config setting (chunked entity)" in new LengthVerificationTest(maxContentLength = 10) {
sendChunkedRequestWithLength(10)
expectRequest.expectEntity[HttpEntity.Chunked](10)
expectRequest().expectEntity[HttpEntity.Chunked](10)
sendChunkedRequestWithLength(11)
expectRequest.expectChunkedEntityWithSizeError(limit = 10)
expectRequest().expectChunkedEntityWithSizeError(limit = 10)
}
"a smaller programmatically-set limit (strict entity)" in new LengthVerificationTest(maxContentLength = 12) {
sendStrictRequestWithLength(10)
expectRequest.mapEntity(_ withSizeLimit 10).expectEntity[HttpEntity.Strict](10)
expectRequest().mapEntity(_ withSizeLimit 10).expectEntity[HttpEntity.Strict](10)
// entities that would be strict but have a Content-Length > the configured maximum are delivered
// as single element Default entities!
sendStrictRequestWithLength(11)
expectRequest.mapEntity(_ withSizeLimit 10).expectDefaultEntityWithSizeError(limit = 10, actualSize = 11)
expectRequest().mapEntity(_ withSizeLimit 10).expectDefaultEntityWithSizeError(limit = 10, actualSize = 11)
}
"a smaller programmatically-set limit (default entity)" in new LengthVerificationTest(maxContentLength = 12) {
sendDefaultRequestWithLength(10)
expectRequest.mapEntity(_ withSizeLimit 10).expectEntity[HttpEntity.Default](10)
expectRequest().mapEntity(_ withSizeLimit 10).expectEntity[HttpEntity.Default](10)
sendDefaultRequestWithLength(11)
expectRequest.mapEntity(_ withSizeLimit 10).expectDefaultEntityWithSizeError(limit = 10, actualSize = 11)
expectRequest().mapEntity(_ withSizeLimit 10).expectDefaultEntityWithSizeError(limit = 10, actualSize = 11)
}
"a smaller programmatically-set limit (chunked entity)" in new LengthVerificationTest(maxContentLength = 12) {
sendChunkedRequestWithLength(10)
expectRequest.mapEntity(_ withSizeLimit 10).expectEntity[HttpEntity.Chunked](10)
expectRequest().mapEntity(_ withSizeLimit 10).expectEntity[HttpEntity.Chunked](10)
sendChunkedRequestWithLength(11)
expectRequest.mapEntity(_ withSizeLimit 10).expectChunkedEntityWithSizeError(limit = 10)
expectRequest().mapEntity(_ withSizeLimit 10).expectChunkedEntityWithSizeError(limit = 10)
}
"a larger programmatically-set limit (strict entity)" in new LengthVerificationTest(maxContentLength = 8) {
// entities that would be strict but have a Content-Length > the configured maximum are delivered
// as single element Default entities!
sendStrictRequestWithLength(10)
expectRequest.mapEntity(_ withSizeLimit 10).expectEntity[HttpEntity.Default](10)
expectRequest().mapEntity(_ withSizeLimit 10).expectEntity[HttpEntity.Default](10)
sendStrictRequestWithLength(11)
expectRequest.mapEntity(_ withSizeLimit 10).expectDefaultEntityWithSizeError(limit = 10, actualSize = 11)
expectRequest().mapEntity(_ withSizeLimit 10).expectDefaultEntityWithSizeError(limit = 10, actualSize = 11)
}
"a larger programmatically-set limit (default entity)" in new LengthVerificationTest(maxContentLength = 8) {
sendDefaultRequestWithLength(10)
expectRequest.mapEntity(_ withSizeLimit 10).expectEntity[HttpEntity.Default](10)
expectRequest().mapEntity(_ withSizeLimit 10).expectEntity[HttpEntity.Default](10)
sendDefaultRequestWithLength(11)
expectRequest.mapEntity(_ withSizeLimit 10).expectDefaultEntityWithSizeError(limit = 10, actualSize = 11)
expectRequest().mapEntity(_ withSizeLimit 10).expectDefaultEntityWithSizeError(limit = 10, actualSize = 11)
}
"a larger programmatically-set limit (chunked entity)" in new LengthVerificationTest(maxContentLength = 8) {
sendChunkedRequestWithLength(10)
expectRequest.mapEntity(_ withSizeLimit 10).expectEntity[HttpEntity.Chunked](10)
expectRequest().mapEntity(_ withSizeLimit 10).expectEntity[HttpEntity.Chunked](10)
sendChunkedRequestWithLength(11)
expectRequest.mapEntity(_ withSizeLimit 10).expectChunkedEntityWithSizeError(limit = 10)
expectRequest().mapEntity(_ withSizeLimit 10).expectChunkedEntityWithSizeError(limit = 10)
}
"the config setting applied before another attribute (default entity)" in new LengthVerificationTest(maxContentLength = 10) {

2
akka-http-core/src/test/scala/akka/http/impl/engine/server/HttpServerTestSetupBase.scala
View file

@ -61,7 +61,7 @@ abstract class HttpServerTestSetupBase {
case s ⇒ s
}.mkString("\n")
def expectRequest: HttpRequest = requests.requestNext()
def expectRequest(): HttpRequest = requests.requestNext()
def expectNoRequest(max: FiniteDuration): Unit = requests.expectNoMsg(max)
def expectSubscribe(): Unit = netOut.expectComplete()
def expectSubscribeAndNetworkClose(): Unit = netOut.expectSubscriptionAndComplete()

4
akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebsocketServerSpec.scala
View file

@ -32,7 +32,7 @@ class WebsocketServerSpec extends FreeSpec with Matchers with WithMaterializerSp
|
|""")
val request = expectRequest
val request = expectRequest()
val upgrade = request.header[UpgradeToWebsocket]
upgrade.isDefined shouldBe true
@ -78,7 +78,7 @@ class WebsocketServerSpec extends FreeSpec with Matchers with WithMaterializerSp
|
|""")
val request = expectRequest
val request = expectRequest()
val upgrade = request.header[UpgradeToWebsocket]
upgrade.isDefined shouldBe true