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

=htj #16436 add missing Java directives

Browse source
This commit is contained in:
Johannes Rudolph 2015-06-18 16:44:16 +02:00 • committed by Mathias
parent 10ea40b2f8
commit 83833ae4f8
59 changed files with 2595 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

7
akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/JUnitRouteTest.scala
View file

@ -4,6 +4,8 @@
package akka.http.javadsl.testkit
import akka.http.javadsl.server._
import Directives._
import org.junit.rules.ExternalResource
import org.junit.{ Rule, Assert }
import scala.concurrent.duration._
@ -35,6 +37,11 @@ abstract class JUnitRouteTestBase extends RouteTest {
throw new IllegalStateException("Assertion should have failed")
}
}
protected def completeWithValueToString[T](value: RequestVal[T]): Route =
handleWith(value, new Handler1[T] {
def handle(ctx: RequestContext, t: T): RouteResult = ctx.complete(t.toString)
})
}
abstract class JUnitRouteTest extends JUnitRouteTestBase {
private[this] val _systemResource = new ActorSystemResource

8
akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/RouteTest.scala
View file

@ -26,8 +26,12 @@ abstract class RouteTest extends AllDirectives {
protected def awaitDuration: FiniteDuration = 500.millis
def runRoute(route: Route, request: HttpRequest): TestResponse = {
val scalaRoute = ScalaRoute.seal(RouteImplementation(route))
def runRoute(route: Route, request: HttpRequest): TestResponse =
runScalaRoute(ScalaRoute.seal(RouteImplementation(route)), request)
def runRouteUnSealed(route: Route, request: HttpRequest): TestResponse =
runScalaRoute(RouteImplementation(route), request)
private def runScalaRoute(scalaRoute: ScalaRoute, request: HttpRequest): TestResponse = {
val result = scalaRoute(new server.RequestContextImpl(request.asScala, NoLogging, RoutingSettings(system)))
result.awaitResult(awaitDuration) match {