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

=doc fixed example compile errors either by fixing files or commenting them for now

Browse source
This commit is contained in:
Johannes Rudolph 2015-05-21 10:50:27 +02:00
parent 20759e1b34
commit 546936146b
16 changed files with 59 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-docs-dev/rst/scala/code/docs/http/scaladsl/HttpServerExampleSpec.scala
View file

@ -3,7 +3,7 @@
*/
package docs.http.scaladsl
/*
import scala.concurrent.Future
import org.scalatest.{ WordSpec, Matchers }
import akka.actor.ActorSystem
@ -254,3 +254,4 @@ class HttpServerExampleSpec extends WordSpec with Matchers {
def processOrderRequest(id: Int, complete: Order => Unit): Unit = ???
}
}
*/

14
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/CaseClassExtractionExamplesSpec.scala
View file

@ -4,9 +4,13 @@
package docs.http.scaladsl.server
/*
import org.scalatest.Inside
import akka.http.scaladsl.server._
class CaseClassExtractionExamplesSpec extends RoutingSpec {
class CaseClassExtractionExamplesSpec extends RoutingSpec with Inside {
// FIXME: investigate why it doesn't work without this import
import akka.http.scaladsl.server.directives.ParameterDirectives.ParamMagnet
// format: OFF
@ -68,9 +72,11 @@ class CaseClassExtractionExamplesSpec extends RoutingSpec {
responseAs[String] shouldEqual "Color(abc,1,2,3)"
}
Get("/color/abc?r=1&g=2&b=345") ~> route ~> check {
rejection must beLike {
case ValidationRejection("requirement failed: blue color component must be between 0 and 255", _) => ok
inside(rejection) {
case ValidationRejection("requirement failed: blue color component must be between 0 and 255", _) =>
}
}
}
}
def doSomethingWith(x: Any) = complete(x.toString)
}*/

2
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/FullTestKitExampleSpec.scala
View file

@ -31,7 +31,7 @@ class FullTestKitExampleSpec extends WordSpec with Matchers with ScalatestRouteT
"return a greeting for GET requests to the root path" in {
Get() ~> smallRoute ~> check {
responseAs[String] should contain("Captain on the bridge")
responseAs[String] shouldEqual "Captain on the bridge!"
}
}

4
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/FormFieldDirectivesExamplesSpec.scala
View file

@ -9,6 +9,8 @@ import akka.http.scaladsl.server.Route
import akka.http.scaladsl.model._
class FormFieldDirectivesExamplesSpec extends RoutingSpec {
// FIXME: investigate why it doesn't work without this import
import akka.http.scaladsl.server.directives.FormFieldDirectives.FieldMagnet
"formFields" in {
val route =
@ -16,7 +18,7 @@ class FormFieldDirectivesExamplesSpec extends RoutingSpec {
complete(s"The color is '$color' and the age ten years ago was ${age - 10}")
}
Post("/", FormData(Seq("color" -> "blue", "age" -> "68"))) ~> route ~> check {
Post("/", FormData("color" -> "blue", "age" -> "68")) ~> route ~> check {
responseAs[String] shouldEqual "The color is 'blue' and the age ten years ago was 58"
}

4
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/FutureDirectivesExamplesSpec.scala
View file

@ -80,12 +80,12 @@ class FutureDirectivesExamplesSpec extends RoutingSpec {
"example-3" in {
val route =
path("success") {
onFailure(Future { "Ok" }) { extraction =>
completeOrRecoverWith(Future { "Ok" }) { extraction =>
failWith(extraction) // not executed.
}
} ~
path("failure") {
onFailure(Future.failed[String](TestException)) { extraction =>
completeOrRecoverWith(Future.failed[String](TestException)) { extraction =>
failWith(extraction)
}
}

13
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/HeaderDirectivesExamplesSpec.scala
View file

@ -10,8 +10,9 @@ import akka.http.scaladsl.server.MissingHeaderRejection
import akka.http.scaladsl.server.Route
import headers._
import StatusCodes._
import org.scalatest.Inside
class HeaderDirectivesExamplesSpec extends RoutingSpec {
class HeaderDirectivesExamplesSpec extends RoutingSpec with Inside {
"headerValueByName-0" in {
val route =
headerValueByName("X-User-Id") { userId =>
@ -67,10 +68,10 @@ class HeaderDirectivesExamplesSpec extends RoutingSpec {
"headerValueByType-0" in {
val route =
headerValueByType[Origin]() { origin ⇒
complete(s"The first origin was ${origin.originList.head}")
complete(s"The first origin was ${origin.origins.head}")
}
val originHeader = Origin(Seq(HttpOrigin("http://localhost:8080")))
val originHeader = Origin(HttpOrigin("http://localhost:8080"))
// extract a header if the type is matching
Get("abc") ~> originHeader ~> route ~> check {
@ -79,17 +80,17 @@ class HeaderDirectivesExamplesSpec extends RoutingSpec {
// reject a request if no header of the given type is present
Get("abc") ~> route ~> check {
rejection must beLike { case MissingHeaderRejection("Origin") ⇒ ok }
inside(rejection) { case MissingHeaderRejection("Origin") ⇒ }
}
}
"optionalHeaderValueByType-0" in {
val route =
optionalHeaderValueByType[Origin]() {
case Some(origin) ⇒ complete(s"The first origin was ${origin.originList.head}")
case Some(origin) ⇒ complete(s"The first origin was ${origin.origins.head}")
case None ⇒ complete("No Origin header found.")
}
val originHeader = Origin(Seq(HttpOrigin("http://localhost:8080")))
val originHeader = Origin(HttpOrigin("http://localhost:8080"))
// extract Some(header) if the type is matching
Get("abc") ~> originHeader ~> route ~> check {
responseAs[String] shouldEqual "The first origin was http://localhost:8080"

6
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/HostDirectivesExamplesSpec.scala
View file

@ -13,7 +13,7 @@ class HostDirectivesExamplesSpec extends RoutingSpec {
"extract-hostname" in {
val route =
hostName { hn =>
extractHost { hn =>
complete(s"Hostname: $hn")
}
@ -78,11 +78,11 @@ class HostDirectivesExamplesSpec extends RoutingSpec {
}
"failing-regex" in {
{
an[IllegalArgumentException] should be thrownBy {
host("server-([0-9]).company.(com|net|org)".r) { target =>
complete("Will never complete :'(")
}
} must throwAn[IllegalArgumentException]
}
}
}

3
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/MarshallingDirectivesExamplesSpec.scala
View file

@ -4,7 +4,7 @@
package docs.http.scaladsl.server
package directives
/*
import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
import akka.http.scaladsl.model._
import spray.json.DefaultJsonProtocol
@ -82,3 +82,4 @@ class MarshallingDirectivesExamplesSpec extends RoutingSpec {
}
}
}
*/

1
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/MethodDirectivesExamplesSpec.scala
View file

@ -6,6 +6,7 @@ package docs.http.scaladsl.server
package directives
import akka.http.scaladsl.model._
import akka.http.scaladsl.server.Route
class MethodDirectivesExamplesSpec extends RoutingSpec {

3
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/MiscDirectivesExamplesSpec.scala
View file

@ -4,7 +4,7 @@
package docs.http.scaladsl.server
package directives
/*
import akka.http.scaladsl.model._
import akka.http.scaladsl.server._
import headers._
@ -197,3 +197,4 @@ class MiscDirectivesExamplesSpec extends RoutingSpec {
}
}
}
*/

8
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/ParameterDirectivesExamplesSpec.scala
View file

@ -5,9 +5,13 @@
package docs.http.scaladsl.server
package directives
import spray.http.StatusCodes
import akka.http.scaladsl.model._
import akka.http.scaladsl.server.Route
class ParameterDirectivesExamplesSpec extends RoutingSpec {
// FIXME: investigate why it doesn't work without this import
import akka.http.scaladsl.server.directives.ParameterDirectives.ParamMagnet
"example-1" in {
val route =
parameter('color) { color =>
@ -91,7 +95,7 @@ class ParameterDirectivesExamplesSpec extends RoutingSpec {
Get("/?color=blue&count=blub") ~> Route.seal(route) ~> check {
status shouldEqual StatusCodes.BadRequest
responseAs[String] shouldEqual "The query parameter 'count' was malformed:\n'blub' is not a valid 32-bit integer value"
responseAs[String] shouldEqual "The query parameter 'count' was malformed:\n'blub' is not a valid 32-bit signed integer value"
}
}
"parameterMap" in {

3
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/RangeDirectivesExamplesSpec.scala
View file

@ -4,7 +4,7 @@
package docs.http.scaladsl.server
package directives
/*
import akka.http.scaladsl.model._
import headers._
@ -34,3 +34,4 @@ class RangeDirectivesExamplesSpec extends RoutingSpec {
}
}
}
*/

9
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/RespondWithDirectivesExamplesSpec.scala
View file

@ -4,7 +4,7 @@
package docs.http.scaladsl.server
package directives
/*
import akka.http.scaladsl.server.UnacceptedResponseContentTypeRejection
import akka.http.scaladsl.model._
import headers._
@ -54,9 +54,9 @@ class RespondWithDirectivesExamplesSpec extends RoutingSpec {
mediaType shouldEqual `application/json`
responseAs[String] shouldEqual "[]"
}
Get("/foo") ~> Accept(MediaRanges.`text/*`) ~> route ~> check {
rejection shouldEqual UnacceptedResponseContentTypeRejection(ContentType(`application/json`) :: Nil)
*/
//Get("/foo") ~> Accept(MediaRanges.`text/*`) ~> route ~> check {
/* rejection shouldEqual UnacceptedResponseContentTypeRejection(ContentType(`application/json`) :: Nil)
}
}
@ -103,3 +103,4 @@ class RespondWithDirectivesExamplesSpec extends RoutingSpec {
}
}
}
*/

10
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/RouteDirectivesExamplesSpec.scala
View file

@ -5,8 +5,8 @@
package docs.http.scaladsl.server
package directives
import spray.http.{ RequestProcessingException, HttpResponse, StatusCodes }
import spray.routing.ValidationRejection
import akka.http.scaladsl.model._
import akka.http.scaladsl.server.{ Route, ValidationRejection }
class RouteDirectivesExamplesSpec extends RoutingSpec {
@ -83,12 +83,12 @@ class RouteDirectivesExamplesSpec extends RoutingSpec {
"failwith-examples" in {
val route =
path("foo") {
failWith(new RequestProcessingException(StatusCodes.BandwidthLimitExceeded))
failWith(new RuntimeException("Oops."))
}
Get("/foo") ~> Route.seal(route) ~> check {
status shouldEqual StatusCodes.BandwidthLimitExceeded
responseAs[String] shouldEqual "Bandwidth limit has been exceeded."
status shouldEqual StatusCodes.InternalServerError
responseAs[String] shouldEqual "There was an internal server error."
}
}

10
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/SchemeDirectivesExamplesSpec.scala
View file

@ -5,12 +5,10 @@
package docs.http.scaladsl.server
package directives
import akka.http.scaladsl.model._
class SchemeDirectivesExamplesSpec extends RoutingSpec {
"example-1" in {
val route =
schemeName { scheme =>
extractScheme { scheme =>
complete(s"The scheme is '${scheme}'")
}
@ -20,6 +18,10 @@ class SchemeDirectivesExamplesSpec extends RoutingSpec {
}
"example-2" in {
import akka.http.scaladsl.model._
import akka.http.scaladsl.model.headers.Location
import StatusCodes.MovedPermanently
val route =
scheme("http") {
extract(_.request.uri) { uri ⇒
@ -32,7 +34,7 @@ class SchemeDirectivesExamplesSpec extends RoutingSpec {
Get("http://www.example.com/hello") ~> route ~> check {
status shouldEqual MovedPermanently
header[headers.Location] shouldEqual Some(headers.Location(Uri("https://www.example.com/hello")))
header[Location] shouldEqual Some(Location(Uri("https://www.example.com/hello")))
}
Get("https://www.example.com/hello") ~> route ~> check {

3
akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/SecurityDirectivesExamplesSpec.scala
View file

@ -4,7 +4,7 @@
package docs.http.scaladsl.server
package directives
/*
import com.typesafe.config.ConfigFactory
import scala.concurrent.Future
import akka.http.scaladsl.model._
@ -118,3 +118,4 @@ class SecurityDirectivesExamplesSpec extends RoutingSpec {
}
}
}
*/