From c6267fdc37f0015dd1135babff92ab43e97d60f5 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Fri, 31 Oct 2014 17:03:55 +0100 Subject: [PATCH] =str don't run streams test twice because of junit.RunWith annotation --- .../src/test/scala/akka/stream/DslConsistencySpec.scala | 1 - .../src/test/scala/akka/stream/DslFactoriesConsistencySpec.scala | 1 - .../src/test/scala/akka/stream/actor/ActorPublisherSpec.scala | 1 - .../src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala | 1 - .../akka/stream/impl/SynchronousPublisherFromIterableSpec.scala | 1 - .../src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala | 1 - .../src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala | 1 - .../src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala | 1 - .../test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala | 1 - .../src/test/scala/akka/stream/scaladsl/FlowIterableSpec.scala | 1 - .../src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala | 1 - .../src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala | 1 - .../src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala | 1 - .../src/test/scala/akka/stream/scaladsl/FlowSpec.scala | 1 - .../src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala | 1 - .../src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala | 1 - .../scala/akka/stream/scaladsl/FlowTimerTransformerSpec.scala | 1 - .../scala/akka/stream/scaladsl/FlowTransformRecoverSpec.scala | 1 - .../src/test/scala/akka/stream/scaladsl/FlowTransformSpec.scala | 1 - .../akka/stream/scaladsl/ImplicitFlowMaterializerSpec.scala | 1 - .../src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala | 1 - .../test/scala/akka/stream/scaladsl/TimerTransformerSpec.scala | 1 - 22 files changed, 22 deletions(-) diff --git a/akka-stream-tests/src/test/scala/akka/stream/DslConsistencySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/DslConsistencySpec.scala index c31d71e57d..eb1fe13830 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/DslConsistencySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/DslConsistencySpec.scala @@ -8,7 +8,6 @@ import java.lang.reflect.Modifier import org.scalatest.Matchers import org.scalatest.WordSpec -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class DslConsistencySpec extends WordSpec with Matchers { val sFlowClass = classOf[akka.stream.scaladsl.Flow[_, _]] diff --git a/akka-stream-tests/src/test/scala/akka/stream/DslFactoriesConsistencySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/DslFactoriesConsistencySpec.scala index ac21f82639..20f216fc75 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/DslFactoriesConsistencySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/DslFactoriesConsistencySpec.scala @@ -8,7 +8,6 @@ import java.lang.reflect.Method import org.scalatest.Matchers import org.scalatest.WordSpec -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class DslFactoriesConsistencySpec extends WordSpec with Matchers { // configuration // diff --git a/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala index c15c3e9dab..523852edc4 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala @@ -101,7 +101,6 @@ object ActorPublisherSpec { } -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class ActorPublisherSpec extends AkkaSpec with ImplicitSender { import akka.stream.actor.ActorPublisherSpec._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala index 7c2c6fd0b2..a9a57feec4 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala @@ -91,7 +91,6 @@ object ActorSubscriberSpec { } } -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class ActorSubscriberSpec extends AkkaSpec with ImplicitSender { import ActorSubscriberMessage._ import ActorSubscriberSpec._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/SynchronousPublisherFromIterableSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/SynchronousPublisherFromIterableSpec.scala index f08cbf31ee..04b1883367 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/SynchronousPublisherFromIterableSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/SynchronousPublisherFromIterableSpec.scala @@ -10,7 +10,6 @@ import akka.stream.testkit.StreamTestKit import akka.testkit.TestProbe import org.reactivestreams.{ Subscriber, Subscription } -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class SynchronousPublisherFromIterableSpec extends AkkaSpec { "A SynchronousPublisherFromIterable" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala index f3b5a96399..a077d97acd 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala @@ -7,7 +7,6 @@ import akka.testkit.TestProbe import akka.stream.testkit.AkkaSpec import akka.stream.FlowMaterializer -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowDispatcherSpec extends AkkaSpec { implicit val materializer = FlowMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala index cfc6b0e7e3..a5df9dcb0c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala @@ -9,7 +9,6 @@ import akka.stream.FlowMaterializer import akka.stream.testkit.AkkaSpec import akka.stream.testkit.StreamTestKit -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowDropWithinSpec extends AkkaSpec { implicit val materializer = FlowMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala index 1e8bbee842..2bd21611b3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala @@ -11,7 +11,6 @@ import akka.stream.MaterializerSettings import akka.stream.testkit._ import org.reactivestreams.Publisher -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowGroupBySpec extends AkkaSpec { val settings = MaterializerSettings(system) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala index 79391e0df9..6a1945e3f2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala @@ -13,7 +13,6 @@ import akka.stream.testkit.AkkaSpec import akka.stream.testkit.ScriptedTest import akka.stream.testkit.StreamTestKit -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowGroupedWithinSpec extends AkkaSpec with ScriptedTest { val settings = MaterializerSettings(system) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIterableSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIterableSpec.scala index d94a04d304..1c98a448ff 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIterableSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIterableSpec.scala @@ -11,7 +11,6 @@ import akka.stream.MaterializerSettings import akka.stream.testkit.{ AkkaSpec, StreamTestKit } import akka.stream.testkit.StreamTestKit.{ OnComplete, OnError, OnNext } -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowIterableSpec extends AkkaSpec { val settings = MaterializerSettings(system) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala index 33f7e78808..c821db9f3d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala @@ -13,7 +13,6 @@ import akka.stream.testkit.StreamTestKit.OnComplete import akka.stream.testkit.StreamTestKit.OnError import akka.stream.testkit.StreamTestKit.OnNext -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowIteratorSpec extends AkkaSpec { val settings = MaterializerSettings(system) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala index 18d5d757fd..6d2798210c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala @@ -15,7 +15,6 @@ import akka.stream.testkit.StreamTestKit import akka.testkit.TestLatch import akka.testkit.TestProbe -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowMapAsyncSpec extends AkkaSpec { implicit val materializer = FlowMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala index 44504bdb64..558adf3d2d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala @@ -14,7 +14,6 @@ import akka.stream.testkit.AkkaSpec import akka.stream.testkit.ScriptedTest import akka.testkit.TestProbe -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowOnCompleteSpec extends AkkaSpec with ScriptedTest { val settings = MaterializerSettings(system) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala index 3ef2b6213d..2623064d4a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala @@ -72,7 +72,6 @@ object FlowSpec { } } -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowSpec extends AkkaSpec(ConfigFactory.parseString("akka.actor.debug.receive=off\nakka.loglevel=INFO")) { import FlowSpec._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala index a838cd6052..99368be6d0 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala @@ -11,7 +11,6 @@ import akka.stream.testkit.AkkaSpec import akka.stream.testkit.StreamTestKit import org.reactivestreams.Publisher -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowSplitWhenSpec extends AkkaSpec { val settings = MaterializerSettings(system) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala index 858656ed81..264f774f1b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala @@ -9,7 +9,6 @@ import akka.stream.FlowMaterializer import akka.stream.testkit.AkkaSpec import akka.stream.testkit.StreamTestKit -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowTakeWithinSpec extends AkkaSpec { implicit val materializer = FlowMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTimerTransformerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTimerTransformerSpec.scala index e31b3a6d85..468811ce6c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTimerTransformerSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTimerTransformerSpec.scala @@ -11,7 +11,6 @@ import akka.stream.TimerTransformer import akka.stream.testkit.{ AkkaSpec, StreamTestKit } -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowTimerTransformerSpec extends AkkaSpec { implicit val materializer = FlowMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTransformRecoverSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTransformRecoverSpec.scala index 8b86135bf5..dc9d52b89c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTransformRecoverSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTransformRecoverSpec.scala @@ -30,7 +30,6 @@ object FlowTransformRecoverSpec { } } -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowTransformRecoverSpec extends AkkaSpec { import FlowTransformRecoverSpec._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTransformSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTransformSpec.scala index 86b55bb639..2282fece00 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTransformSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTransformSpec.scala @@ -14,7 +14,6 @@ import akka.stream.testkit.{ AkkaSpec, StreamTestKit } import akka.testkit.{ EventFilter, TestProbe } import com.typesafe.config.ConfigFactory -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FlowTransformSpec extends AkkaSpec(ConfigFactory.parseString("akka.actor.debug.receive=off\nakka.loglevel=INFO")) { val settings = MaterializerSettings(system) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ImplicitFlowMaterializerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ImplicitFlowMaterializerSpec.scala index 139998e1f6..512db80211 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ImplicitFlowMaterializerSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ImplicitFlowMaterializerSpec.scala @@ -27,7 +27,6 @@ object ImplicitFlowMaterializerSpec { } } -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class ImplicitFlowMaterializerSpec extends AkkaSpec with ImplicitSender { import ImplicitFlowMaterializerSpec._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala index 999f1322b8..212e5aea0f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala @@ -10,7 +10,6 @@ import akka.stream.FlowMaterializer import akka.stream.testkit.AkkaSpec import akka.stream.testkit.StreamTestKit -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class TickSourceSpec extends AkkaSpec { implicit val materializer = FlowMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TimerTransformerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TimerTransformerSpec.scala index 11285c1e9e..7b5dadb995 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TimerTransformerSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TimerTransformerSpec.scala @@ -76,7 +76,6 @@ object TimerTransformerSpec { } } -@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class TimerTransformerSpec extends AkkaSpec { import TimerTransformerSpec._