From 695861afd76ea7a5e375c43ae3de12d52a4f8d64 Mon Sep 17 00:00:00 2001 From: Konrad `ktoso` Malawski Date: Mon, 10 Jul 2017 21:40:12 +0900 Subject: [PATCH] =pro,str Upgrade to Reactive Streams 1.0.1, unlocks #20241 --- .../akka/stream/tck/AkkaIdentityProcessorVerification.scala | 2 +- .../scala/akka/stream/tck/AkkaPublisherVerification.scala | 2 +- .../scala/akka/stream/tck/AkkaSubscriberVerification.scala | 4 ++-- .../src/test/scala/akka/stream/tck/Timeouts.scala | 2 ++ project/Dependencies.scala | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala index 6482135c7d..d67c4f16af 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala @@ -18,7 +18,7 @@ abstract class AkkaIdentityProcessorVerification[T](env: TestEnvironment, publis with TestNGSuiteLike with ActorSystemLifecycle { def this(printlnDebug: Boolean) = - this(new TestEnvironment(Timeouts.defaultTimeoutMillis, printlnDebug), Timeouts.publisherShutdownTimeoutMillis) + this(new TestEnvironment(Timeouts.defaultTimeoutMillis, Timeouts.defaultNoSignalsTimeoutMillis, printlnDebug), Timeouts.publisherShutdownTimeoutMillis) def this() = this(false) diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala index 5c5d3a6edd..da43e483f5 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala @@ -16,7 +16,7 @@ abstract class AkkaPublisherVerification[T](val env: TestEnvironment, publisherS with TestNGSuiteLike with ActorSystemLifecycle { def this(printlnDebug: Boolean) = - this(new TestEnvironment(Timeouts.defaultTimeoutMillis, printlnDebug), Timeouts.publisherShutdownTimeoutMillis) + this(new TestEnvironment(Timeouts.defaultTimeoutMillis, Timeouts.defaultNoSignalsTimeoutMillis, printlnDebug), Timeouts.publisherShutdownTimeoutMillis) def this() = this(false) diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala index ea541236bd..d7345362d0 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala @@ -16,7 +16,7 @@ abstract class AkkaSubscriberBlackboxVerification[T](env: TestEnvironment) with AkkaSubscriberVerificationLike with ActorSystemLifecycle { def this(printlnDebug: Boolean) = - this(new TestEnvironment(Timeouts.defaultTimeoutMillis, printlnDebug)) + this(new TestEnvironment(Timeouts.defaultTimeoutMillis, Timeouts.defaultNoSignalsTimeoutMillis, printlnDebug)) def this() = this(false) } @@ -26,7 +26,7 @@ abstract class AkkaSubscriberWhiteboxVerification[T](env: TestEnvironment) with AkkaSubscriberVerificationLike { def this(printlnDebug: Boolean) = - this(new TestEnvironment(Timeouts.defaultTimeoutMillis, printlnDebug)) + this(new TestEnvironment(Timeouts.defaultTimeoutMillis, Timeouts.defaultNoSignalsTimeoutMillis, printlnDebug)) def this() = this(false) } diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/Timeouts.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/Timeouts.scala index c9582c8354..a5baa7d393 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/Timeouts.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/Timeouts.scala @@ -12,4 +12,6 @@ object Timeouts { def defaultTimeoutMillis: Int = 800 + def defaultNoSignalsTimeoutMillis: Int = 200 + } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f0b27cd551..f56ae94de7 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -60,7 +60,7 @@ object Dependencies { val sigar = "org.fusesource" % "sigar" % "1.6.4" // ApacheV2 // reactive streams - val reactiveStreams = "org.reactivestreams" % "reactive-streams" % "1.0.0" // CC0 + val reactiveStreams = "org.reactivestreams" % "reactive-streams" % "1.0.0" // CC0 // TODO update to 1.0.1 once it's released, we don't want to ship artifacts depending on RCs // ssl-config val sslConfigCore = "com.typesafe" %% "ssl-config-core" % sslConfigVersion // ApacheV2 @@ -111,7 +111,7 @@ object Dependencies { val slf4jLog4j = "org.slf4j" % "log4j-over-slf4j" % slf4jVersion % "test" // MIT // reactive streams tck - val reactiveStreamsTck = "org.reactivestreams" % "reactive-streams-tck" % "1.0.0" % "test" // CC0 + val reactiveStreamsTck = "org.reactivestreams" % "reactive-streams-tck" % "1.0.1-RC1" % "test" // CC0 } object Provided {