-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Update Junit 5 to latest #1909
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Update Junit 5 to latest #1909
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,15 +49,13 @@ abstract class UnifiedTest extends JUnifiedTest { | |
| override def createClientEncryption( | ||
| keyVaultClient: JMongoClient, | ||
| clientEncryptionSettings: JClientEncryptionSettings | ||
| ): JClientEncryption = { | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. spotless automatic changes |
||
| keyVaultClient match { | ||
| case client: SyncMongoClient => | ||
| SyncClientEncryption(ClientEncryption(new ClientEncryptionImpl( | ||
| client.wrapped.wrapped, | ||
| clientEncryptionSettings | ||
| ))) | ||
| case _ => throw new IllegalArgumentException(s"Invalid keyVaultClient type: ${keyVaultClient.getClass}") | ||
| } | ||
| ): JClientEncryption = keyVaultClient match { | ||
| case client: SyncMongoClient => | ||
| SyncClientEncryption(ClientEncryption(new ClientEncryptionImpl( | ||
| client.wrapped.wrapped, | ||
| clientEncryptionSettings | ||
| ))) | ||
| case _ => throw new IllegalArgumentException(s"Invalid keyVaultClient type: ${keyVaultClient.getClass}") | ||
| } | ||
|
|
||
| override protected def isReactive: Boolean = true | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,7 +47,7 @@ findbugs-jsr = "1.3.9" | |
| groovy = "3.0.9" | ||
| hamcrest = "1.3" | ||
| jmh = "1.37" | ||
| junit-bom = "5.10.2" | ||
| junit-bom = "5.14.3" | ||
| logback = "1.3.14" | ||
| mockito = "5.11.0" | ||
| mockito-java8 = "4.6.1" | ||
|
|
@@ -131,6 +131,7 @@ jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess" | |
| junit-bom = { module = "org.junit:junit-bom", version.ref = "junit-bom" } | ||
| junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" } | ||
| junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params" } | ||
| junit-jupiter-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" } | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The platform launcher was needed to be explicit - otherwise the knockon effect was kotlin tests failing due to junit version disparities |
||
| junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" } | ||
| junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine" } | ||
| junit-kotlin = { module = "org.jetbrains.kotlin:kotlin-test-junit5" } | ||
|
|
@@ -197,7 +198,7 @@ scala-v2-v12 = ["scala-library-v2-v12", "scala-reflect-v2-v12"] | |
| scala-v2-v11 = ["scala-library-v2-v11", "scala-reflect-v2-v11"] | ||
|
|
||
| # Test | ||
| junit = ["junit-jupiter", "junit-jupiter-params", "junit-jupiter-engine", "logback-classic", "hamcrest-all"] | ||
| junit = ["junit-jupiter", "junit-jupiter-params", "junit-jupiter-engine", "junit-jupiter-platform-launcher", "logback-classic", "hamcrest-all"] | ||
| junit-vintage = ["junit-vintage-engine", "junit-jupiter-params", "junit-jupiter-engine", "logback-classic", "hamcrest-all"] | ||
| spock = ["spock-core", "spock-junit4"] | ||
|
|
||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Had to change so the
datamethod is no longer static.