=htp #20915 fix too small timing issue in DirectivesSpec (#20916)

* =htp #20915 fix too small timing issue in DirectivesSpec

* applying scalariform reformatting that keeps popping up
This commit is contained in:
Konrad Malawski 2016-07-08 10:33:32 +02:00 committed by GitHub
parent b4cd30cf94
commit 54ecf32d2b
7 changed files with 119 additions and 113 deletions

View file

@ -14,6 +14,9 @@ import akka.stream.javadsl.Source;
import akka.util.ByteString; import akka.util.ByteString;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import scala.concurrent.duration.Duration;
import scala.concurrent.duration.FiniteDuration;
import java.io.File; import java.io.File;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.file.Files; import java.nio.file.Files;
@ -21,6 +24,7 @@ import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CompletionStage; import java.util.concurrent.CompletionStage;
import java.util.concurrent.TimeUnit;
import java.util.function.BiFunction; import java.util.function.BiFunction;
public class FileUploadDirectivesExamplesTest extends JUnitRouteTest { public class FileUploadDirectivesExamplesTest extends JUnitRouteTest {
@ -48,8 +52,10 @@ public class FileUploadDirectivesExamplesTest extends JUnitRouteTest {
"1,5,7\n11,13,17"), filenameMapping)); "1,5,7\n11,13,17"), filenameMapping));
// test: // test:
testRoute(route).run(HttpRequest.POST("/").withEntity( testRoute(route).run(HttpRequest.POST("/")
multipartForm.toEntity(HttpCharsets.UTF_8, BodyPartRenderer .withEntity(
multipartForm.toEntity(HttpCharsets.UTF_8,
BodyPartRenderer
.randomBoundaryWithDefaults()))) .randomBoundaryWithDefaults())))
.assertStatusCode(StatusCodes.OK); .assertStatusCode(StatusCodes.OK);
//# //#

View file

@ -53,7 +53,7 @@ class ActorWithArgs(arg: String) extends Actor {
//#actor-with-value-class-argument //#actor-with-value-class-argument
class Argument(val value: String) extends AnyVal class Argument(val value: String) extends AnyVal
class ValueClassActor(arg: Argument) extends Actor { class ValueClassActor(arg: Argument) extends Actor {
def receive = {case _ => () } def receive = { case _ => () }
} }
object ValueClassActor { object ValueClassActor {

View file

@ -34,7 +34,7 @@ abstract class RouteTest extends AllDirectives {
implicit def materializer: Materializer implicit def materializer: Materializer
implicit def executionContext: ExecutionContextExecutor = system.dispatcher implicit def executionContext: ExecutionContextExecutor = system.dispatcher
protected def awaitDuration: FiniteDuration = 500.millis protected def awaitDuration: FiniteDuration = 3.seconds
protected def defaultHostInfo: DefaultHostInfo = DefaultHostInfo(Host.create("example.com"), false) protected def defaultHostInfo: DefaultHostInfo = DefaultHostInfo(Host.create("example.com"), false)

View file

@ -40,7 +40,7 @@ class MethodDirectivesSpec extends RoutingSpec {
Head() ~> headRoute ~> check { Head() ~> headRoute ~> check {
status shouldEqual StatusCodes.OK status shouldEqual StatusCodes.OK
val lengthF = response._3.dataBytes.runFold(0)((c, _) => c+1) val lengthF = response._3.dataBytes.runFold(0)((c, _) c + 1)
val length = Await.result(lengthF, Duration(100, "millis")) val length = Await.result(lengthF, Duration(100, "millis"))
length shouldEqual 0 length shouldEqual 0
} }

View file

@ -280,7 +280,7 @@ object Credentials {
* *
* See also [[EnhancedString#secure_==]], for more information. * See also [[EnhancedString#secure_==]], for more information.
*/ */
def verify(secret: String): Boolean = verify(secret, x => x) def verify(secret: String): Boolean = verify(secret, x x)
} }
def apply(cred: Option[HttpCredentials]): Credentials = { def apply(cred: Option[HttpCredentials]): Credentials = {