Bump ScalaTest to version 3.1

emlun · emlun · commit 59ee2c0df7ab · 2022-09-06T18:29:48.000+02:00
diff --git a/test-platform/build.gradle.kts b/test-platform/build.gradle.kts
@@ -9,7 +9,9 @@ dependencies {
     api("junit:junit:4.13.2")
     api("org.mockito:mockito-core:4.7.0")
     api("org.scalacheck:scalacheck_2.13:1.16.0")
-    api("org.scalatest:scalatest_2.13:3.0.9")
+    api("org.scalatest:scalatest_2.13:3.1.0")
+    api("org.scalatestplus:junit-4-13_2.13:3.2.13.0")
+    api("org.scalatestplus:scalacheck-1-16_2.13:3.2.13.0")
     api("uk.org.lidalia:slf4j-test:1.2.0")
   }
 }
diff --git a/webauthn-server-attestation/build.gradle.kts b/webauthn-server-attestation/build.gradle.kts
@@ -54,6 +54,8 @@ dependencies {
   testImplementation("org.scala-lang:scala-library")
   testImplementation("org.scalacheck:scalacheck_2.13")
   testImplementation("org.scalatest:scalatest_2.13")
+  testImplementation("org.scalatestplus:junit-4-13_2.13")
+  testImplementation("org.scalatestplus:scalacheck-1-16_2.13")
   testImplementation("uk.org.lidalia:slf4j-test")
 
   testImplementation("org.slf4j:slf4j-api") {
diff --git a/webauthn-server-attestation/src/test/scala/com/yubico/fido/metadata/FidoMds3Spec.scala b/webauthn-server-attestation/src/test/scala/com/yubico/fido/metadata/FidoMds3Spec.scala
@@ -22,8 +22,8 @@ import com.yubico.webauthn.test.Helpers
 import org.bouncycastle.asn1.x500.X500Name
 import org.bouncycastle.cert.jcajce.JcaX500NameUtil
 import org.junit.runner.RunWith
-import org.scalatest.FunSpec
-import org.scalatest.Matchers
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatest.tags.Network
 import org.scalatest.tags.Slow
 import org.scalatestplus.junit.JUnitRunner
@@ -49,7 +49,7 @@ import scala.jdk.OptionConverters.RichOptional
 @Slow
 @Network
 @RunWith(classOf[JUnitRunner])
-class FidoMds3Spec extends FunSpec with Matchers {
+class FidoMds3Spec extends AnyFunSpec with Matchers {
 
   private val CertValidFrom = Instant.parse("2022-02-15T17:00:00Z")
   private val CertValidTo = Instant.parse("2022-03-15T17:00:00Z")
diff --git a/webauthn-server-attestation/src/test/scala/com/yubico/fido/metadata/FidoMetadataDownloaderSpec.scala b/webauthn-server-attestation/src/test/scala/com/yubico/fido/metadata/FidoMetadataDownloaderSpec.scala
@@ -21,8 +21,8 @@ import org.eclipse.jetty.util.ssl.SslContextFactory
 import org.eclipse.jetty.util.thread.QueuedThreadPool
 import org.junit.runner.RunWith
 import org.scalatest.BeforeAndAfter
-import org.scalatest.FunSpec
-import org.scalatest.Matchers
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatest.tags.Network
 import org.scalatestplus.junit.JUnitRunner
 
@@ -55,7 +55,7 @@ import scala.util.Try
 @Network
 @RunWith(classOf[JUnitRunner])
 class FidoMetadataDownloaderSpec
-    extends FunSpec
+    extends AnyFunSpec
     with Matchers
     with BeforeAndAfter {
 
diff --git a/webauthn-server-attestation/src/test/scala/com/yubico/fido/metadata/JsonIoSpec.scala b/webauthn-server-attestation/src/test/scala/com/yubico/fido/metadata/JsonIoSpec.scala
@@ -29,14 +29,14 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.yubico.fido.metadata.Generators._
 import org.junit.runner.RunWith
 import org.scalacheck.Arbitrary
-import org.scalatest.FunSpec
-import org.scalatest.Matchers
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.junit.JUnitRunner
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 @RunWith(classOf[JUnitRunner])
 class JsonIoSpec
-    extends FunSpec
+    extends AnyFunSpec
     with Matchers
     with ScalaCheckDrivenPropertyChecks {
 
diff --git a/webauthn-server-attestation/src/test/scala/com/yubico/fido/metadata/MetadataBlobSpec.scala b/webauthn-server-attestation/src/test/scala/com/yubico/fido/metadata/MetadataBlobSpec.scala
@@ -2,12 +2,12 @@ package com.yubico.fido.metadata
 
 import com.yubico.internal.util.JacksonCodecs
 import com.yubico.webauthn.data.ByteArray
-import org.scalatest.FunSpec
-import org.scalatest.Matchers
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 class MetadataBlobSpec
-    extends FunSpec
+    extends AnyFunSpec
     with Matchers
     with ScalaCheckDrivenPropertyChecks {
 
diff --git a/webauthn-server-core/build.gradle.kts b/webauthn-server-core/build.gradle.kts
@@ -41,6 +41,8 @@ dependencies {
   testImplementation("org.scala-lang:scala-library")
   testImplementation("org.scalacheck:scalacheck_2.13")
   testImplementation("org.scalatest:scalatest_2.13")
+  testImplementation("org.scalatestplus:junit-4-13_2.13")
+  testImplementation("org.scalatestplus:scalacheck-1-16_2.13")
   testImplementation("uk.org.lidalia:slf4j-test")
 
   testImplementation("org.slf4j:slf4j-api") {
diff --git a/webauthn-server-core/src/test/scala/com/yubico/webauthn/AppleAttestationStatementVerifierSpec.scala b/webauthn-server-core/src/test/scala/com/yubico/webauthn/AppleAttestationStatementVerifierSpec.scala
@@ -30,14 +30,14 @@ import com.yubico.webauthn.data.ByteArray
 import com.yubico.webauthn.data.Generators.arbitraryByteArray
 import com.yubico.webauthn.test.RealExamples
 import org.junit.runner.RunWith
-import org.scalatest.FunSpec
-import org.scalatest.Matchers
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.junit.JUnitRunner
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 @RunWith(classOf[JUnitRunner])
 class AppleAttestationStatementVerifierSpec
-    extends FunSpec
+    extends AnyFunSpec
     with Matchers
     with TestWithEachProvider
     with ScalaCheckDrivenPropertyChecks {
diff --git a/webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyRegistrationSpec.scala b/webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyRegistrationSpec.scala
@@ -69,8 +69,8 @@ import org.bouncycastle.cert.jcajce.JcaX500NameUtil
 import org.junit.runner.RunWith
 import org.mockito.Mockito
 import org.scalacheck.Gen
-import org.scalatest.FunSpec
-import org.scalatest.Matchers
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.junit.JUnitRunner
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
@@ -103,7 +103,7 @@ import scala.util.Try
 
 @RunWith(classOf[JUnitRunner])
 class RelyingPartyRegistrationSpec
-    extends FunSpec
+    extends AnyFunSpec
     with Matchers
     with ScalaCheckDrivenPropertyChecks
     with TestWithEachProvider {
diff --git a/webauthn-server-core/src/test/scala/com/yubico/webauthn/data/JsonIoSpec.scala b/webauthn-server-core/src/test/scala/com/yubico/webauthn/data/JsonIoSpec.scala
@@ -42,14 +42,14 @@ import org.junit.runner.RunWith
 import org.scalacheck.Arbitrary
 import org.scalacheck.Arbitrary.arbitrary
 import org.scalacheck.Gen
-import org.scalatest.FunSpec
-import org.scalatest.Matchers
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.junit.JUnitRunner
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 @RunWith(classOf[JUnitRunner])
 class JsonIoSpec
-    extends FunSpec
+    extends AnyFunSpec
     with Matchers
     with ScalaCheckDrivenPropertyChecks {
 
diff --git a/webauthn-server-demo/build.gradle.kts b/webauthn-server-demo/build.gradle.kts
@@ -43,6 +43,8 @@ dependencies {
   testImplementation("org.scala-lang:scala-library")
   testImplementation("org.scalacheck:scalacheck_2.13")
   testImplementation("org.scalatest:scalatest_2.13")
+  testImplementation("org.scalatestplus:junit-4-13_2.13")
+  testImplementation("org.scalatestplus:scalacheck-1-16_2.13")
 
   modules {
     module("javax.servlet:servlet-api") {
diff --git a/webauthn-server-demo/src/test/scala/demo/webauthn/JsonSerializationSpec.scala b/webauthn-server-demo/src/test/scala/demo/webauthn/JsonSerializationSpec.scala
@@ -29,12 +29,12 @@ import com.yubico.webauthn.RegistrationTestData
 import com.yubico.webauthn.data.AuthenticatorAttestationResponse
 import demo.webauthn.data.RegistrationResponse
 import org.junit.runner.RunWith
-import org.scalatest.FunSpec
-import org.scalatest.Matchers
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-class JsonSerializationSpec extends FunSpec with Matchers {
+class JsonSerializationSpec extends AnyFunSpec with Matchers {
 
   private val jsonMapper = JacksonCodecs.json()
 
diff --git a/webauthn-server-demo/src/test/scala/demo/webauthn/WebAuthnServerSpec.scala b/webauthn-server-demo/src/test/scala/demo/webauthn/WebAuthnServerSpec.scala
@@ -42,8 +42,8 @@ import demo.webauthn.data.AssertionRequestWrapper
 import demo.webauthn.data.CredentialRegistration
 import demo.webauthn.data.RegistrationRequest
 import org.junit.runner.RunWith
-import org.scalatest.FunSpec
-import org.scalatest.Matchers
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.junit.JUnitRunner
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
@@ -58,7 +58,7 @@ import scala.jdk.OptionConverters.RichOptional
 
 @RunWith(classOf[JUnitRunner])
 class WebAuthnServerSpec
-    extends FunSpec
+    extends AnyFunSpec
     with Matchers
     with ScalaCheckDrivenPropertyChecks {
 
diff --git a/yubico-util/build.gradle.kts b/yubico-util/build.gradle.kts
@@ -35,6 +35,8 @@ dependencies {
   testImplementation("org.scala-lang:scala-library")
   testImplementation("org.scalacheck:scalacheck_2.13")
   testImplementation("org.scalatest:scalatest_2.13")
+  testImplementation("org.scalatestplus:junit-4-13_2.13")
+  testImplementation("org.scalatestplus:scalacheck-1-16_2.13")
 }
 
 
diff --git a/yubico-util/src/test/scala/com/yubico/internal/util/BinaryUtilSpec.scala b/yubico-util/src/test/scala/com/yubico/internal/util/BinaryUtilSpec.scala
@@ -26,14 +26,14 @@ package com.yubico.internal.util
 
 import org.junit.runner.RunWith
 import org.scalacheck.Gen
-import org.scalatest.FunSpec
-import org.scalatest.Matchers
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.junit.JUnitRunner
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 @RunWith(classOf[JUnitRunner])
 class BinaryUtilSpec
-    extends FunSpec
+    extends AnyFunSpec
     with Matchers
     with ScalaCheckDrivenPropertyChecks {
 
diff --git a/yubico-util/src/test/scala/com/yubico/internal/util/CollectionUtilSpec.scala b/yubico-util/src/test/scala/com/yubico/internal/util/CollectionUtilSpec.scala
@@ -2,14 +2,14 @@ package com.yubico.internal.util
 
 import com.yubico.scalacheck.gen.JavaGenerators._
 import org.junit.runner.RunWith
-import org.scalatest.FunSpec
-import org.scalatest.Matchers
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.junit.JUnitRunner
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 @RunWith(classOf[JUnitRunner])
 class CollectionUtilSpec
-    extends FunSpec
+    extends AnyFunSpec
     with Matchers
     with ScalaCheckDrivenPropertyChecks {
 
diff --git a/yubico-util/src/test/scala/com/yubico/internal/util/ComparableUtilSpec.scala b/yubico-util/src/test/scala/com/yubico/internal/util/ComparableUtilSpec.scala
@@ -4,14 +4,14 @@ import _root_.scala.jdk.CollectionConverters._
 import org.junit.runner.RunWith
 import org.scalacheck.Arbitrary.arbitrary
 import org.scalacheck.Gen
-import org.scalatest.FunSpec
-import org.scalatest.Matchers
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.junit.JUnitRunner
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 @RunWith(classOf[JUnitRunner])
 class ComparableUtilSpec
-    extends FunSpec
+    extends AnyFunSpec
     with Matchers
     with ScalaCheckDrivenPropertyChecks {
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@ dependencies {`
`9`	`9`	`api("junit:junit:4.13.2")`
`10`	`10`	`api("org.mockito:mockito-core:4.7.0")`
`11`	`11`	`api("org.scalacheck:scalacheck_2.13:1.16.0")`
`12`		`- api("org.scalatest:scalatest_2.13:3.0.9")`
	`12`	`+ api("org.scalatest:scalatest_2.13:3.1.0")`
	`13`	`+ api("org.scalatestplus:junit-4-13_2.13:3.2.13.0")`
	`14`	`+ api("org.scalatestplus:scalacheck-1-16_2.13:3.2.13.0")`
`13`	`15`	`api("uk.org.lidalia:slf4j-test:1.2.0")`
`14`	`16`	`}`
`15`	`17`	`}`