diff --git a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala b/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala index 891d15e60e..cb8dda8266 100644 --- a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala +++ b/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala @@ -69,11 +69,13 @@ class StatsSampleSpecMultiJvmNode3 extends StatsSampleSpec //#abstract-test import akka.remote.testkit.MultiNodeSpec import akka.testkit.ImplicitSender -import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpecLike } +import org.scalatest.BeforeAndAfterAll +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike abstract class StatsSampleSpec extends MultiNodeSpec(StatsSampleSpecConfig) - with WordSpecLike + with AnyWordSpecLike with Matchers with BeforeAndAfterAll with ImplicitSender { diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala index 8e1a92d6f9..cbc25b4dc4 100644 --- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala +++ b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala @@ -13,7 +13,8 @@ import akka.cluster.{ ClusterEvent, MemberStatus } import akka.remote.testconductor.RoleName import akka.remote.testkit.{ MultiNodeSpec, STMultiNodeSpec } import akka.testkit.WatchedByCoroner -import org.scalatest.{ Matchers, Suite } +import org.scalatest.Suite +import org.scalatest.matchers.should.Matchers import scala.concurrent.duration._ import scala.language.implicitConversions diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/STMultiNodeSpec.scala b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/STMultiNodeSpec.scala index ff4b640aea..605d0045fb 100644 --- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/STMultiNodeSpec.scala +++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/STMultiNodeSpec.scala @@ -5,14 +5,14 @@ package akka.cluster.ddata import akka.remote.testkit.MultiNodeSpecCallbacks - -import org.scalatest.{ BeforeAndAfterAll, WordSpecLike } -import org.scalatest.Matchers +import org.scalatest.BeforeAndAfterAll +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike /** * Hooks up MultiNodeSpec with ScalaTest */ -trait STMultiNodeSpec extends MultiNodeSpecCallbacks with WordSpecLike with Matchers with BeforeAndAfterAll { +trait STMultiNodeSpec extends MultiNodeSpecCallbacks with AnyWordSpecLike with Matchers with BeforeAndAfterAll { override def beforeAll() = multiNodeSpecBeforeAll()