From ec3cecb896af5d408db3d936caf1b8dfebea79f2 Mon Sep 17 00:00:00 2001 From: Konrad 'ktoso' Malawski Date: Wed, 8 Oct 2014 13:39:55 +0200 Subject: [PATCH] =pro #15178 enable junit tests in akka-streams again The junit-interface is treating "anything it cannot understand" as a globbing pattern, thus when it didn't understand ScalaTest options, it used them for globbing, and of course none of our junit tests matched the "-oDF" pattern for example. Debugged this with Stefan and we've opened an issue to improve the integration in this respect: https://github.com/sbt/junit-interface/issues/60 Resolves #15178 --- .../src/test/java/akka/stream/actor/ActorPublisherTest.java | 2 ++ .../src/test/java/akka/stream/actor/ActorSubscriberTest.java | 2 ++ .../src/test/java/akka/stream/javadsl/DuctTest.java | 2 ++ .../src/test/java/akka/stream/javadsl/FlowTest.java | 2 ++ 4 files changed, 8 insertions(+) diff --git a/akka-stream-tests/src/test/java/akka/stream/actor/ActorPublisherTest.java b/akka-stream-tests/src/test/java/akka/stream/actor/ActorPublisherTest.java index beb6ceafbf..af558ba68d 100644 --- a/akka-stream-tests/src/test/java/akka/stream/actor/ActorPublisherTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/actor/ActorPublisherTest.java @@ -1,5 +1,6 @@ package akka.stream.actor; +import org.junit.Ignore; import org.reactivestreams.Publisher; import org.junit.ClassRule; import org.junit.Test; @@ -17,6 +18,7 @@ import akka.japi.Procedure; import static akka.stream.actor.ActorPublisherMessage.Request; +@Ignore public class ActorPublisherTest { @ClassRule diff --git a/akka-stream-tests/src/test/java/akka/stream/actor/ActorSubscriberTest.java b/akka-stream-tests/src/test/java/akka/stream/actor/ActorSubscriberTest.java index 7f98b37abc..94e324611f 100644 --- a/akka-stream-tests/src/test/java/akka/stream/actor/ActorSubscriberTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/actor/ActorSubscriberTest.java @@ -1,5 +1,6 @@ package akka.stream.actor; +import org.junit.Ignore; import org.reactivestreams.Subscriber; import org.junit.ClassRule; import org.junit.Test; @@ -19,6 +20,7 @@ import akka.japi.Procedure; import static akka.stream.actor.ActorSubscriberMessage.OnNext; import static akka.stream.actor.ActorSubscriberMessage.OnError; +@Ignore public class ActorSubscriberTest { @ClassRule diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/DuctTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/DuctTest.java index ce15cca961..b1e48c9971 100644 --- a/akka-stream-tests/src/test/java/akka/stream/javadsl/DuctTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/DuctTest.java @@ -3,6 +3,7 @@ package akka.stream.javadsl; import java.util.Arrays; import java.util.concurrent.TimeUnit; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Test; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; @@ -21,6 +22,7 @@ import akka.stream.MaterializerSettings; import akka.stream.testkit.AkkaSpec; import akka.testkit.JavaTestKit; +@Ignore public class DuctTest { @ClassRule diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowTest.java index 74baf70681..446bca3ac6 100644 --- a/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowTest.java @@ -9,6 +9,7 @@ import akka.stream.*; import akka.stream.testkit.AkkaSpec; import akka.testkit.JavaTestKit; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Test; import org.reactivestreams.Publisher; import scala.Option; @@ -22,6 +23,7 @@ import java.util.concurrent.TimeUnit; import static org.junit.Assert.assertEquals; +@Ignore public class FlowTest { @ClassRule