From 73e87a28294fd4db778d83f39868be9e1f25f05c Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Tue, 31 Mar 2015 11:34:30 +0200 Subject: [PATCH] =str #17109 update reactive streams to RC4 --- .../akka/stream/tck/AkkaIdentityProcessorVerification.scala | 2 +- .../test/scala/akka/stream/tck/AkkaPublisherVerification.scala | 2 +- .../src/test/scala/akka/stream/tck/ConcatTest.scala | 2 -- .../src/test/scala/akka/stream/tck/FlattenTest.scala | 2 -- .../src/test/scala/akka/stream/tck/GroupByTest.scala | 2 -- .../src/test/scala/akka/stream/tck/IterablePublisherTest.scala | 3 --- 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/akka-stream-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala index 36188fde76..62a5bda3c0 100644 --- a/akka-stream-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala +++ b/akka-stream-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala @@ -25,7 +25,7 @@ abstract class AkkaIdentityProcessorVerification[T](env: TestEnvironment, publis def this() = this(false) - override def createErrorStatePublisher(): Publisher[T] = + override def createFailedPublisher(): Publisher[T] = StreamTestKit.errorPublisher(new Exception("Unable to serve subscribers right now!")) def processorFromFlow(flow: Flow[T, T, _])(implicit mat: ActorFlowMaterializer): Processor[T, T] = { diff --git a/akka-stream-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala index bca718232c..f0a949ac19 100644 --- a/akka-stream-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala +++ b/akka-stream-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala @@ -29,7 +29,7 @@ abstract class AkkaPublisherVerification[T](val env: TestEnvironment, publisherS implicit lazy val materializer = ActorFlowMaterializer(ActorFlowMaterializerSettings(system).copy(maxInputBufferSize = 512))(system) - override def createErrorStatePublisher(): Publisher[T] = + override def createFailedPublisher(): Publisher[T] = StreamTestKit.errorPublisher(new Exception("Unable to serve subscribers right now!")) def iterable(elements: Long): immutable.Iterable[Int] = diff --git a/akka-stream-tck/src/test/scala/akka/stream/tck/ConcatTest.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/ConcatTest.scala index 505a0a1c0b..a9e578f56f 100644 --- a/akka-stream-tck/src/test/scala/akka/stream/tck/ConcatTest.scala +++ b/akka-stream-tck/src/test/scala/akka/stream/tck/ConcatTest.scala @@ -13,6 +13,4 @@ class ConcatTest extends AkkaPublisherVerification[Int] { Source(iterable(elements / 2)).concat(Source(iterable((elements + 1) / 2))).runWith(Sink.publisher) } - // FIXME verifyNoAsyncErrors() without delay is wrong in TCK, enable again in RC4 - override def optional_spec111_maySupportMultiSubscribe(): Unit = () } diff --git a/akka-stream-tck/src/test/scala/akka/stream/tck/FlattenTest.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/FlattenTest.scala index 6660dfa3ac..72a7600065 100644 --- a/akka-stream-tck/src/test/scala/akka/stream/tck/FlattenTest.scala +++ b/akka-stream-tck/src/test/scala/akka/stream/tck/FlattenTest.scala @@ -16,6 +16,4 @@ class FlattenTest extends AkkaPublisherVerification[Int] { Source(List(s1, s2)).flatten(FlattenStrategy.concat).runWith(Sink.publisher) } - // FIXME verifyNoAsyncErrors() without delay is wrong in TCK, enable again in RC4 - override def optional_spec111_maySupportMultiSubscribe(): Unit = () } diff --git a/akka-stream-tck/src/test/scala/akka/stream/tck/GroupByTest.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/GroupByTest.scala index 8127e45849..f576f32dd7 100644 --- a/akka-stream-tck/src/test/scala/akka/stream/tck/GroupByTest.scala +++ b/akka-stream-tck/src/test/scala/akka/stream/tck/GroupByTest.scala @@ -23,6 +23,4 @@ class GroupByTest extends AkkaPublisherVerification[Int] { } - // FIXME verifyNoAsyncErrors() without delay is wrong in TCK, enable again in RC4 - override def optional_spec111_maySupportMultiSubscribe(): Unit = () } diff --git a/akka-stream-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala index db9cc276d9..c939fd5b26 100644 --- a/akka-stream-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala +++ b/akka-stream-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala @@ -14,7 +14,4 @@ class IterablePublisherTest extends AkkaPublisherVerification[Int] { Source(iterable(elements)).runWith(Sink.publisher) } - // FIXME #16983 - override def required_spec317_mustNotSignalOnErrorWhenPendingAboveLongMaxValue(): Unit = () - }