Skip to content

Commit 83a67ba

Browse files
emlunemlun
committed
Bump ScalaTest to version 3.2
1 parent 59ee2c0 commit 83a67ba

21 files changed

+65
-65
lines changed

‎test-platform/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
api("junit:junit:4.13.2")
1010
api("org.mockito:mockito-core:4.7.0")
1111
api("org.scalacheck:scalacheck_2.13:1.16.0")
12-
api("org.scalatest:scalatest_2.13:3.1.0")
12+
api("org.scalatest:scalatest_2.13:3.2.13")
1313
api("org.scalatestplus:junit-4-13_2.13:3.2.13.0")
1414
api("org.scalatestplus:scalacheck-1-16_2.13:3.2.13.0")
1515
api("uk.org.lidalia:slf4j-test:1.2.0")

‎webauthn-server-attestation/src/integrationTest/scala/com/yubico/fido/metadata/FidoMetadataDownloaderIntegrationTest.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.yubico.fido.metadata
22

33
import org.junit.runner.RunWith
44
import org.scalatest.BeforeAndAfter
5-
import org.scalatest.FunSpec
6-
import org.scalatest.Matchers
5+
import org.scalatest.funspec.AnyFunSpec
6+
import org.scalatest.matchers.should.Matchers
77
import org.scalatest.tags.Network
88
import org.scalatest.tags.Slow
99
import org.scalatestplus.junit.JUnitRunner
@@ -16,7 +16,7 @@ import scala.util.Try
1616
@Network
1717
@RunWith(classOf[JUnitRunner])
1818
class FidoMetadataDownloaderIntegrationTest
19-
extends FunSpec
19+
extends AnyFunSpec
2020
with Matchers
2121
with BeforeAndAfter {
2222

‎webauthn-server-attestation/src/integrationTest/scala/com/yubico/fido/metadata/FidoMetadataServiceIntegrationTest.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import com.yubico.webauthn.data.AttestationObject
1010
import com.yubico.webauthn.test.RealExamples
1111
import org.junit.runner.RunWith
1212
import org.scalatest.BeforeAndAfter
13-
import org.scalatest.FunSpec
14-
import org.scalatest.Matchers
13+
import org.scalatest.funspec.AnyFunSpec
14+
import org.scalatest.matchers.should.Matchers
1515
import org.scalatest.tags.Network
1616
import org.scalatest.tags.Slow
1717
import org.scalatestplus.junit.JUnitRunner
@@ -30,7 +30,7 @@ import scala.util.Try
3030
@Network
3131
@RunWith(classOf[JUnitRunner])
3232
class FidoMetadataServiceIntegrationTest
33-
extends FunSpec
33+
extends AnyFunSpec
3434
with Matchers
3535
with BeforeAndAfter {
3636

‎webauthn-server-core/src/test/scala/com/yubico/webauthn/OriginMatcherSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import org.junit.runner.RunWith
2828
import org.scalacheck.Arbitrary
2929
import org.scalacheck.Arbitrary.arbitrary
3030
import org.scalacheck.Gen
31-
import org.scalatest.FunSpec
32-
import org.scalatest.Matchers
31+
import org.scalatest.funspec.AnyFunSpec
32+
import org.scalatest.matchers.should.Matchers
3333
import org.scalatestplus.junit.JUnitRunner
3434
import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
3535

@@ -38,7 +38,7 @@ import scala.jdk.CollectionConverters._
3838

3939
@RunWith(classOf[JUnitRunner])
4040
class OriginMatcherSpec
41-
extends FunSpec
41+
extends AnyFunSpec
4242
with Matchers
4343
with ScalaCheckDrivenPropertyChecks {
4444

‎webauthn-server-core/src/test/scala/com/yubico/webauthn/PackedAttestationStatementVerifierSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import com.yubico.webauthn.TestAuthenticator.AttestationMaker
3232
import com.yubico.webauthn.data.ByteArray
3333
import com.yubico.webauthn.data.COSEAlgorithmIdentifier
3434
import org.junit.runner.RunWith
35-
import org.scalatest.FunSpec
36-
import org.scalatest.Matchers
35+
import org.scalatest.funspec.AnyFunSpec
36+
import org.scalatest.matchers.should.Matchers
3737
import org.scalatestplus.junit.JUnitRunner
3838

3939
import java.nio.charset.StandardCharsets
@@ -43,7 +43,7 @@ import scala.util.Try
4343

4444
@RunWith(classOf[JUnitRunner])
4545
class PackedAttestationStatementVerifierSpec
46-
extends FunSpec
46+
extends AnyFunSpec
4747
with Matchers
4848
with TestWithEachProvider {
4949

‎webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyAssertionSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ import com.yubico.webauthn.test.Util.toStepWithUtilities
5858
import org.junit.runner.RunWith
5959
import org.scalacheck.Arbitrary.arbitrary
6060
import org.scalacheck.Gen
61-
import org.scalatest.FunSpec
62-
import org.scalatest.Matchers
61+
import org.scalatest.funspec.AnyFunSpec
62+
import org.scalatest.matchers.should.Matchers
6363
import org.scalatestplus.junit.JUnitRunner
6464
import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
6565

@@ -78,7 +78,7 @@ import scala.util.Try
7878

7979
@RunWith(classOf[JUnitRunner])
8080
class RelyingPartyAssertionSpec
81-
extends FunSpec
81+
extends AnyFunSpec
8282
with Matchers
8383
with ScalaCheckDrivenPropertyChecks
8484
with TestWithEachProvider {

‎webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyCeremoniesSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ import com.yubico.webauthn.data.PublicKeyCredentialRequestOptions
2929
import com.yubico.webauthn.test.Helpers
3030
import com.yubico.webauthn.test.RealExamples
3131
import org.junit.runner.RunWith
32-
import org.scalatest.FunSpec
33-
import org.scalatest.Matchers
32+
import org.scalatest.funspec.AnyFunSpec
33+
import org.scalatest.matchers.should.Matchers
3434
import org.scalatestplus.junit.JUnitRunner
3535

3636
import scala.jdk.CollectionConverters._
3737

3838
@RunWith(classOf[JUnitRunner])
3939
class RelyingPartyCeremoniesSpec
40-
extends FunSpec
40+
extends AnyFunSpec
4141
with Matchers
4242
with TestWithEachProvider {
4343

‎webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyStartOperationSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ import com.yubico.webauthn.extension.appid.Generators._
4444
import org.junit.runner.RunWith
4545
import org.scalacheck.Arbitrary.arbitrary
4646
import org.scalacheck.Gen
47-
import org.scalatest.FunSpec
48-
import org.scalatest.Matchers
47+
import org.scalatest.funspec.AnyFunSpec
48+
import org.scalatest.matchers.should.Matchers
4949
import org.scalatestplus.junit.JUnitRunner
5050
import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
5151

@@ -56,7 +56,7 @@ import scala.jdk.OptionConverters.RichOptional
5656

5757
@RunWith(classOf[JUnitRunner])
5858
class RelyingPartyStartOperationSpec
59-
extends FunSpec
59+
extends AnyFunSpec
6060
with Matchers
6161
with ScalaCheckDrivenPropertyChecks {
6262

‎webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyUserIdentificationSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import com.yubico.webauthn.data.PublicKeyCredential
3333
import com.yubico.webauthn.data.PublicKeyCredentialDescriptor
3434
import com.yubico.webauthn.data.RelyingPartyIdentity
3535
import org.junit.runner.RunWith
36-
import org.scalatest.FunSpec
37-
import org.scalatest.Matchers
36+
import org.scalatest.funspec.AnyFunSpec
37+
import org.scalatest.matchers.should.Matchers
3838
import org.scalatestplus.junit.JUnitRunner
3939

4040
import java.security.KeyPair
@@ -47,7 +47,7 @@ import scala.util.Success
4747
import scala.util.Try
4848

4949
@RunWith(classOf[JUnitRunner])
50-
class RelyingPartyUserIdentificationSpec extends FunSpec with Matchers {
50+
class RelyingPartyUserIdentificationSpec extends AnyFunSpec with Matchers {
5151

5252
private object Defaults {
5353

‎webauthn-server-core/src/test/scala/com/yubico/webauthn/TestWithEachProvider.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
package com.yubico.webauthn
22

33
import org.bouncycastle.jce.provider.BouncyCastleProvider
4-
import org.scalatest.FunSpec
5-
import org.scalatest.Matchers
4+
import org.scalatest.funspec.AnyFunSpec
5+
import org.scalatest.matchers.should.Matchers
66

77
import java.security.Provider
88
import java.security.Security
99

1010
trait TestWithEachProvider extends Matchers {
11-
this: FunSpec =>
11+
this: AnyFunSpec =>
1212

1313
def wrapItFunctionWithProviderContext(
1414
providerSetName: String,
1515
providers: List[Provider],
1616
testSetupFun: (String => (=> Any) => Unit) => Any,
1717
): Any = {
1818

19-
/** Wrapper around the standard [[FunSpec#it]] that sets the JCA
19+
/** Wrapper around the standard [[AnyFunSpec#it]] that sets the JCA
2020
* [[Security]] providers before running the test, and then resets the
2121
* providers to the original state after the test.
2222
*
2323
* This is needed because ScalaTest shared tests work by taking fixture
2424
* parameters as lexical context, but JCA providers are set in the dynamic
25-
* context. The [[FunSpec#it]] call does not immediately run the test,
25+
* context. The [[AnyFunSpec#it]] call does not immediately run the test,
2626
* instead it registers a test to be run later. This helper ensures that
2727
* the dynamic context matches the lexical context at the time the test
2828
* runs.
@@ -58,11 +58,11 @@ trait TestWithEachProvider extends Matchers {
5858
* and then reset the providers to the original state after the test.
5959
*
6060
* The caller SHOULD name the callback parameter `it`, in order to shadow the
61-
* standard [[FunSpec#it]] from ScalaTest.
61+
* standard [[AnyFunSpec#it]] from ScalaTest.
6262
*
6363
* This is needed because ScalaTest shared tests work by taking fixture
6464
* parameters as lexical context, but JCA providers are set in the dynamic
65-
* context. The [[FunSpec#it]] call does not immediately run the test,
65+
* context. The [[AnyFunSpec#it]] call does not immediately run the test,
6666
* instead it registers a test to be run later. This helper ensures that the
6767
* dynamic context matches the lexical context at the time the test runs.
6868
*/

0 commit comments

Comments
 (0)