upgrade to latest ScalaTest (#26387)
stuff moved to a new package. you wouldn't expect that in a point release, but they put type aliases in place so Scala users wouldn't notice. but the change is visible to Java code. the upgrade is not strictly necessary, but it would be convenient for the Scala 2.13 community build to have this merged, so I don't have to maintain these changes in our Akka fork
This commit is contained in:
parent
fe073f08ee
commit
fc23f03031
86 changed files with 86 additions and 86 deletions
|
|
@ -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 {}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import akka.testkit.javadsl.TestKit;
|
|||
import org.junit.AfterClass;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
import org.scalatest.junit.JUnitSuite;
|
||||
import org.scalatestplus.junit.JUnitSuite;
|
||||
|
||||
// #print-refs
|
||||
import akka.actor.AbstractActor;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import org.junit.BeforeClass;
|
|||
import org.junit.Test;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import org.scalatest.junit.JUnitSuite;
|
||||
import org.scalatestplus.junit.JUnitSuite;
|
||||
|
||||
import akka.actor.ActorSystem;
|
||||
import akka.actor.ActorRef;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import org.junit.Test;
|
|||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotEquals;
|
||||
|
||||
import org.scalatest.junit.JUnitSuite;
|
||||
import org.scalatestplus.junit.JUnitSuite;
|
||||
|
||||
public class DeviceGroupTest extends JUnitSuite {
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import org.junit.BeforeClass;
|
|||
import org.junit.Test;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import org.scalatest.junit.JUnitSuite;
|
||||
import org.scalatestplus.junit.JUnitSuite;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import org.junit.Test;
|
|||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
|
||||
import org.scalatest.junit.JUnitSuite;
|
||||
import org.scalatestplus.junit.JUnitSuite;
|
||||
import scala.concurrent.duration.FiniteDuration;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ import org.junit.Test;
|
|||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotEquals;
|
||||
|
||||
import org.scalatest.junit.JUnitSuite;
|
||||
import org.scalatestplus.junit.JUnitSuite;
|
||||
|
||||
public class DeviceGroupTest extends JUnitSuite {
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import org.junit.BeforeClass;
|
|||
import org.junit.Test;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import org.scalatest.junit.JUnitSuite;
|
||||
import org.scalatestplus.junit.JUnitSuite;
|
||||
|
||||
public class DeviceTest extends JUnitSuite {
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import static com.lightbend.akka.sample.DeviceProtocol.*;
|
|||
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();
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 jdocs.typed.tutorial_4.DeviceManagerProtocol.*;
|
||||
import static org.junit.Assert.assertNotEquals;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 jdocs.typed.tutorial_5.DeviceManagerProtocol.*;
|
||||
import static org.junit.Assert.assertNotEquals;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue