raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Update multi-jmv tests for ScalaTest 3.1.0

Browse source
This commit is contained in:
Mikhail Limansky 2020-01-15 12:13:03 +03:00
parent 3abce05e79
commit 3fccda9f4c
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala
View file

@ -69,11 +69,13 @@ class StatsSampleSpecMultiJvmNode3 extends StatsSampleSpec
//#abstract-test //#abstract-test
import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.MultiNodeSpec
import akka.testkit.ImplicitSender 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 abstract class StatsSampleSpec
extends MultiNodeSpec(StatsSampleSpecConfig) extends MultiNodeSpec(StatsSampleSpecConfig)
with WordSpecLike with AnyWordSpecLike
with Matchers with Matchers
with BeforeAndAfterAll with BeforeAndAfterAll
with ImplicitSender { with ImplicitSender {

3
akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala
View file

@ -13,7 +13,8 @@ import akka.cluster.{ ClusterEvent, MemberStatus }
import akka.remote.testconductor.RoleName import akka.remote.testconductor.RoleName
import akka.remote.testkit.{ MultiNodeSpec, STMultiNodeSpec } import akka.remote.testkit.{ MultiNodeSpec, STMultiNodeSpec }
import akka.testkit.WatchedByCoroner 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.concurrent.duration._
import scala.language.implicitConversions import scala.language.implicitConversions

8
akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/STMultiNodeSpec.scala
View file

@ -5,14 +5,14 @@
package akka.cluster.ddata package akka.cluster.ddata
import akka.remote.testkit.MultiNodeSpecCallbacks import akka.remote.testkit.MultiNodeSpecCallbacks
import org.scalatest.BeforeAndAfterAll
import org.scalatest.{ BeforeAndAfterAll, WordSpecLike } import org.scalatest.matchers.should.Matchers
import org.scalatest.Matchers import org.scalatest.wordspec.AnyWordSpecLike
/** /**
* Hooks up MultiNodeSpec with ScalaTest * 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() override def beforeAll() = multiNodeSpecBeforeAll()