Update to ScalaTest 3.1.0, fix #28289.

This commit is contained in:
Mike Limansky 2020-01-11 15:14:21 +03:00
parent 4749b11be8
commit d9ed927df0
305 changed files with 702 additions and 656 deletions

View file

@ -4,7 +4,7 @@
package jdocs;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
/** Base class for all runnable example tests written in Java */
public abstract class AbstractJavaTest extends JUnitSuite {}

View file

@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.runner.RunWith;
import org.scalatest.junit.JUnitRunner;
import org.scalatestplus.junit.JUnitRunner;
import scala.concurrent.Future;
import java.util.function.Consumer;
import org.iq80.leveldb.util.FileUtils;

View file

@ -8,7 +8,7 @@ import akka.actor.typed.PreRestart;
import akka.actor.typed.SupervisorStrategy;
import org.junit.ClassRule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
import akka.actor.typed.PostStop;

View file

@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals;
public class DeviceTest {
//#device-read-test
*/
public class DeviceTest extends org.scalatest.junit.JUnitSuite {
public class DeviceTest extends org.scalatestplus.junit.JUnitSuite {
// #device-read-test
@ClassRule public static final TestKitJunitResource testKit = new TestKitJunitResource();

View file

@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe;
import akka.actor.typed.ActorRef;
import org.junit.ClassRule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.util.stream.Collectors;
import java.util.stream.Stream;

View file

@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe;
import akka.actor.typed.ActorRef;
import org.junit.ClassRule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import static org.junit.Assert.assertNotEquals;

View file

@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe;
import akka.actor.typed.ActorRef;
import org.junit.ClassRule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.util.Optional;

View file

@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe;
import akka.actor.typed.ActorRef;
import org.junit.ClassRule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.time.Duration;
import java.util.HashMap;

View file

@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe;
import akka.actor.typed.ActorRef;
import org.junit.ClassRule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.util.HashMap;
import java.util.Map;

View file

@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe;
import akka.actor.typed.ActorRef;
import org.junit.ClassRule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import static org.junit.Assert.assertNotEquals;

View file

@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe;
import akka.actor.typed.ActorRef;
import org.junit.ClassRule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.util.Optional;

View file

@ -6,14 +6,10 @@ package docs.dispatcher
import language.postfixOps
import org.scalatest.{ BeforeAndAfterAll, WordSpec }
import org.scalatest.Matchers
import akka.testkit.AkkaSpec
import akka.event.Logging
import akka.event.LoggingAdapter
import akka.actor._
import docs.dispatcher.DispatcherDocSpec.MyBoundedActor
import akka.dispatch.RequiresMessageQueue
object DispatcherDocSpec {
val javaConfig = """