From 33e263e731095249964863e9c5c279606da20115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Mon, 12 Jul 2021 19:22:58 +0200 Subject: [PATCH] Akka Stream TCK tests on Scala 3.0 (#30360) Co-authored-by: Renato Cavalcanti --- .travis.yml | 2 +- .../testkit/scaladsl/StreamTestKit.scala | 2 +- .../impl/fusing/GraphInterpreterSpecKit.scala | 26 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index de8ec3ba90..e615e59db8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ jobs: - stage: scala3 name: scala3 # separate job since only a few modules compile with Scala 3 yet - script: jabba install adopt@1.11-0 && jabba use adopt@1.11-0 && sbt -Dakka.build.scalaVersion=3.0 "akka-actor-tests/test:compile" akka-actor-typed/compile akka-pki/test:compile akka-protobuf/test:compile akka-protobuf-v3/test:compile akka-slf4j/test:compile akka-stream/compile + script: jabba install adopt@1.11-0 && jabba use adopt@1.11-0 && sbt -Dakka.build.scalaVersion=3.0 "akka-actor-tests/test:compile" akka-actor-typed/compile akka-pki/test:compile akka-protobuf/test:compile akka-protobuf-v3/test:compile akka-slf4j/test:compile akka-stream/compile akka-stream-tests-tck/test stages: - name: whitesource diff --git a/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/StreamTestKit.scala b/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/StreamTestKit.scala index c631897feb..324d1de6af 100644 --- a/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/StreamTestKit.scala +++ b/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/StreamTestKit.scala @@ -150,7 +150,7 @@ object StreamTestKit { builder.append(s"[label=shouldPush, color=red, dir=back];") case ConnectionSnapshot.Closed => builder.append("[style=dotted, label=closed, dir=both];") - case _ => + case null => } builder.append("\n") } diff --git a/akka-stream-testkit/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala b/akka-stream-testkit/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala index 1a090f1ba0..6fcdb7f4ff 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala @@ -451,28 +451,28 @@ trait GraphInterpreterSpecKit extends StreamSpec { override def step(): Unit = interpreter.execute(eventLimit = if (!chasing) 1 else 2) class UpstreamPortProbe[T] extends UpstreamProbe[T]("upstreamPort") { - def isAvailable: Boolean = isAvailable(out) - def isClosed: Boolean = isClosed(out) + def isAvailable: Boolean = isAvailable(this.out) + def isClosed: Boolean = isClosed(this.out) - def push(elem: T): Unit = push(out, elem) - def complete(): Unit = complete(out) - def fail(ex: Throwable): Unit = fail(out, ex) + def push(elem: T): Unit = push(this.out, elem) + def complete(): Unit = complete(this.out) + def fail(ex: Throwable): Unit = fail(this.out, ex) } class DownstreamPortProbe[T] extends DownstreamProbe[T]("upstreamPort") { - def isAvailable: Boolean = isAvailable(in) - def hasBeenPulled: Boolean = hasBeenPulled(in) - def isClosed: Boolean = isClosed(in) + def isAvailable: Boolean = isAvailable(this.in) + def hasBeenPulled: Boolean = hasBeenPulled(this.in) + def isClosed: Boolean = isClosed(this.in) - def pull(): Unit = pull(in) - def cancel(): Unit = cancel(in) - def grab(): T = grab(in) + def pull(): Unit = pull(this.in) + def cancel(): Unit = cancel(this.in) + def grab(): T = grab(this.in) - setHandler(in, new InHandler { + setHandler(this.in, new InHandler { // Modified onPush that does not grab() automatically the element. This accesses some internals. override def onPush(): Unit = { - val internalEvent = portToConn(in.id).slot + val internalEvent = portToConn(DownstreamPortProbe.this.in.id).slot internalEvent match { case Failed(_, elem) => lastEvent += OnNext(DownstreamPortProbe.this, elem)