This is an automated email from the ASF dual-hosted git repository.
hepin pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-pekko-persistence-dynamodb.git
The following commit(s) were added to refs/heads/main by this push:
new 95a6f4f upgrade scalatest
95a6f4f is described below
commit 95a6f4fbe8269ea1a5a7380dade471917203d7da
Author: PJ Fanning <[email protected]>
AuthorDate: Fri Apr 21 12:16:06 2023 +0200
upgrade scalatest
---
.github/workflows/format.yml | 2 +-
.scalafmt.conf | 2 +-
build.sbt | 2 +-
.../persistence/dynamodb/journal/BackwardsCompatibilityV1Spec.scala | 6 ++++--
.../apache/pekko/persistence/dynamodb/journal/DeletionSpec.scala | 6 ++++--
.../persistence/dynamodb/journal/DynamoDBIntegrationLoadSpec.scala | 6 ++++--
.../persistence/dynamodb/journal/DynamoPartitionGroupedSpec.scala | 6 +++---
.../pekko/persistence/dynamodb/journal/FailureReportingSpec.scala | 6 ++++--
.../dynamodb/journal/PartialAsyncSerializationSpec.scala | 6 ++++--
.../persistence/dynamodb/journal/PersistAllConsistencySpec.scala | 6 ++++--
.../persistence/dynamodb/journal/RecoveryConsistencySpec.scala | 6 ++++--
.../persistence/dynamodb/query/CurrentPersistenceIdsSpec.scala | 6 ++++--
12 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 502401a..9d330b6 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -20,5 +20,5 @@ jobs:
- name: Check project is formatted
uses: jrouly/scalafmt-native-action@v2
with:
- version: '3.6.1'
+ version: '3.7.1'
arguments: '--list --mode diff-ref=origin/main'
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 2ca4ece..8bb7238 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.6.1
+version = 3.7.1
runner.dialect = scala213
project.git = true
style = defaultWithAlign
diff --git a/build.sbt b/build.sbt
index 8d7275a..3b14e95 100644
--- a/build.sbt
+++ b/build.sbt
@@ -24,7 +24,7 @@ libraryDependencies ++= Seq(
"org.apache.pekko" %% "pekko-persistence-tck" % pekkoVersion % "test",
"org.apache.pekko" %% "pekko-testkit" % pekkoVersion % "test",
"org.apache.pekko" %% "pekko-stream-testkit" % pekkoVersion % "test",
- "org.scalatest" %% "scalatest" % "3.1.4" % "test",
+ "org.scalatest" %% "scalatest" % "3.2.15" % "test",
"commons-io" % "commons-io" % "2.11.0" % "test",
"org.hdrhistogram" % "HdrHistogram" % "2.1.8" % "test",
"com.dimafeng" %% "testcontainers-scala-scalatest" %
testcontainersScalaVersion % "test")
diff --git
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/BackwardsCompatibilityV1Spec.scala
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/BackwardsCompatibilityV1Spec.scala
index d38586f..c98d139 100644
---
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/BackwardsCompatibilityV1Spec.scala
+++
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/BackwardsCompatibilityV1Spec.scala
@@ -24,15 +24,17 @@ import com.amazonaws.services.dynamodbv2.document.{
DynamoDB, Item }
import com.amazonaws.services.dynamodbv2.{ AmazonDynamoDB,
AmazonDynamoDBClient }
import com.typesafe.config.ConfigFactory
import org.scalactic.TypeCheckedTripleEquals
-import org.scalatest._
+import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
import java.util.Base64
class BackwardsCompatibilityV1Spec
extends TestKit(ActorSystem("BackwardsCompatibilityV1Spec"))
with ImplicitSender
- with WordSpecLike
+ with AnyWordSpecLike
with BeforeAndAfterAll
with Matchers
with ScalaFutures
diff --git
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DeletionSpec.scala
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DeletionSpec.scala
index 839de23..4ebb3f7 100644
---
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DeletionSpec.scala
+++
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DeletionSpec.scala
@@ -23,13 +23,15 @@ import org.apache.pekko.stream.scaladsl.Sink
import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
import org.apache.pekko.testkit._
import org.scalactic.TypeCheckedTripleEquals
-import org.scalatest._
+import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
class DeletionSpec
extends TestKit(ActorSystem("DeletionSpec"))
with ImplicitSender
- with WordSpecLike
+ with AnyWordSpecLike
with BeforeAndAfterAll
with Matchers
with ScalaFutures
diff --git
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBIntegrationLoadSpec.scala
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBIntegrationLoadSpec.scala
index 25a547a..8a0b1b8 100644
---
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBIntegrationLoadSpec.scala
+++
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBIntegrationLoadSpec.scala
@@ -18,7 +18,9 @@ import org.apache.pekko.persistence._
import org.apache.pekko.persistence.dynamodb.IntegSpec
import org.apache.pekko.testkit._
import com.typesafe.config.ConfigFactory
-import org.scalatest._
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
import java.util.UUID
@@ -129,7 +131,7 @@ import
org.apache.pekko.persistence.dynamodb.journal.DynamoDBIntegrationLoadSpec
class DynamoDBIntegrationLoadSpec
extends TestKit(ActorSystem("test", config))
with ImplicitSender
- with WordSpecLike
+ with AnyWordSpecLike
with Matchers
with BeforeAndAfterAll
with DynamoDBUtils
diff --git
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoPartitionGroupedSpec.scala
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoPartitionGroupedSpec.scala
index 610c8fa..ce99807 100644
---
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoPartitionGroupedSpec.scala
+++
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoPartitionGroupedSpec.scala
@@ -10,13 +10,13 @@
package org.apache.pekko.persistence.dynamodb.journal
import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.stream.{ ActorMaterializer, Materializer,
SystemMaterializer }
+import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
import org.apache.pekko.stream.scaladsl.Source
import org.apache.pekko.stream.testkit.scaladsl.TestSink
import org.apache.pekko.testkit.TestKit
-import org.scalatest.WordSpecLike
+import org.scalatest.wordspec.AnyWordSpecLike
-class DynamoPartitionGroupedSpec extends
TestKit(ActorSystem("DynamoPartitionGroupedSpec")) with WordSpecLike {
+class DynamoPartitionGroupedSpec extends
TestKit(ActorSystem("DynamoPartitionGroupedSpec")) with AnyWordSpecLike {
implicit val materializer: Materializer =
SystemMaterializer(system).materializer
assert(PartitionSize == 100, "This test is only valid with PartitionSize ==
100")
diff --git
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/FailureReportingSpec.scala
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/FailureReportingSpec.scala
index 148c3a6..a788b64 100644
---
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/FailureReportingSpec.scala
+++
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/FailureReportingSpec.scala
@@ -22,8 +22,10 @@ import org.apache.pekko.testkit._
import com.amazonaws.services.dynamodbv2.model._
import com.typesafe.config.ConfigFactory
import org.scalactic.TypeCheckedTripleEquals
-import org.scalatest._
+import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
import scala.collection.JavaConverters._
import scala.concurrent.duration._
@@ -31,7 +33,7 @@ import scala.concurrent.duration._
class FailureReportingSpec
extends TestKit(ActorSystem("FailureReportingSpec"))
with ImplicitSender
- with WordSpecLike
+ with AnyWordSpecLike
with BeforeAndAfterAll
with Matchers
with ScalaFutures
diff --git
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PartialAsyncSerializationSpec.scala
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PartialAsyncSerializationSpec.scala
index 9a8aafa..3044d78 100644
---
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PartialAsyncSerializationSpec.scala
+++
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PartialAsyncSerializationSpec.scala
@@ -20,8 +20,10 @@ import org.apache.pekko.persistence.dynamodb.IntegSpec
import org.apache.pekko.testkit._
import com.typesafe.config.ConfigFactory
import org.scalactic.TypeCheckedTripleEquals
-import org.scalatest._
+import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
trait SerializeAsync
@@ -46,7 +48,7 @@ object PartialAsyncSerializationSpec {
class PartialAsyncSerializationSpec
extends TestKit(ActorSystem("PartialAsyncSerializationSpec",
PartialAsyncSerializationSpec.config))
with ImplicitSender
- with WordSpecLike
+ with AnyWordSpecLike
with BeforeAndAfterAll
with Matchers
with ScalaFutures
diff --git
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PersistAllConsistencySpec.scala
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PersistAllConsistencySpec.scala
index 31076d5..b2cdced 100644
---
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PersistAllConsistencySpec.scala
+++
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PersistAllConsistencySpec.scala
@@ -19,13 +19,15 @@ import org.apache.pekko.persistence._
import org.apache.pekko.persistence.dynamodb.IntegSpec
import org.apache.pekko.testkit._
import org.scalactic.TypeCheckedTripleEquals
-import org.scalatest._
+import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
class PersistAllConsistencySpec
extends TestKit(ActorSystem("PersistAllConsistencySpec"))
with ImplicitSender
- with WordSpecLike
+ with AnyWordSpecLike
with BeforeAndAfterAll
with Matchers
with ScalaFutures
diff --git
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/RecoveryConsistencySpec.scala
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/RecoveryConsistencySpec.scala
index a22156d..0b1034c 100644
---
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/RecoveryConsistencySpec.scala
+++
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/RecoveryConsistencySpec.scala
@@ -24,8 +24,10 @@ import org.apache.pekko.stream.{ Materializer,
SystemMaterializer }
import org.apache.pekko.testkit._
import com.amazonaws.services.dynamodbv2.model._
import org.scalactic.TypeCheckedTripleEquals
-import org.scalatest._
+import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
import java.util.{ HashMap => JHMap }
import scala.concurrent.duration.DurationInt
@@ -33,7 +35,7 @@ import scala.concurrent.duration.DurationInt
class RecoveryConsistencySpec
extends TestKit(ActorSystem("RecoveryConsistencySpec"))
with ImplicitSender
- with WordSpecLike
+ with AnyWordSpecLike
with BeforeAndAfterAll
with Matchers
with ScalaFutures
diff --git
a/src/test/scala/org/apache/pekko/persistence/dynamodb/query/CurrentPersistenceIdsSpec.scala
b/src/test/scala/org/apache/pekko/persistence/dynamodb/query/CurrentPersistenceIdsSpec.scala
index 92ba314..fed711e 100644
---
a/src/test/scala/org/apache/pekko/persistence/dynamodb/query/CurrentPersistenceIdsSpec.scala
+++
b/src/test/scala/org/apache/pekko/persistence/dynamodb/query/CurrentPersistenceIdsSpec.scala
@@ -20,8 +20,10 @@ import org.apache.pekko.stream.scaladsl.Sink
import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
import org.apache.pekko.testkit._
import org.scalactic.TypeCheckedTripleEquals
-import org.scalatest._
+import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
import java.util.UUID
import scala.concurrent.duration.DurationInt
@@ -30,7 +32,7 @@ import CurrentPersistenceIdsSpec.{ toPersistenceId, RichSeq }
class CurrentPersistenceIdsSpec
extends TestKit(ActorSystem("CurrentPersistenceIdsSpec"))
with ImplicitSender
- with WordSpecLike
+ with AnyWordSpecLike
with BeforeAndAfterAll
with Matchers
with ScalaFutures
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
