Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions .evergreen/.evg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2507,23 +2507,14 @@ buildvariants:
tasks:
- name: ".ocsp"

- matrix_name: "scala-tests-2"
- matrix_name: "scala-tests"
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: [ "jdk8", "jdk17", "jdk21" ], version: [ "7.0" ], topology: "replicaset",
scala: ["2.11", "2.12", "2.13"] , os: "ubuntu" }
scala: "*" , os: "ubuntu" }
display_name: "${scala} ${jdk} ${version} ${topology} ${os}"
tags: [ "test-scala-variant" ]
tasks:
- name: "scala-test-task"

- matrix_name: "scala-tests-3"
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: [ "jdk17", "jdk21" ], version: [ "8.0" ], topology: "replicaset",
scala: "3", os: "ubuntu" }
display_name: "${scala} ${jdk} ${version} ${topology} ${os}"
tags: [ "test-scala-variant" ]
tasks:
- name: "scala-test-task"


- matrix_name: "kotlin-tests"
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: [ "jdk8", "jdk17", "jdk21" ], version: [ "7.0" ], topology: "replicaset", os: "ubuntu" }
display_name: "Kotlin: ${jdk} ${version} ${topology} ${os}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,16 @@ public class AfterBeforeParameterResolver implements BeforeEachMethodAdapter, Pa
public void invokeBeforeEachMethod(final ExtensionContext context, final ExtensionRegistry registry) {
Optional<ParameterResolver> resolverOptional = registry.getExtensions(ParameterResolver.class)
.stream()
.filter(parameterResolver -> parameterResolver.getClass().getName().contains("ParameterizedTestParameterResolver"))
.filter(parameterResolver -> {
String name = parameterResolver.getClass().getName();
// JUnit 5.14+: ParameterizedInvocationParameterResolver, ParameterizedTestMethodParameterResolver
return name.contains("ParameterizedInvocationParameterResolver")
|| name.contains("ParameterizedTestMethodParameterResolver");
})
.findFirst();
if (!resolverOptional.isPresent()) {
throw new IllegalStateException("ParameterizedTestParameterResolver missed in the registry. "
+ "Probably it's not a Parameterized Test");
throw new IllegalStateException("ParameterResolver not found. Confirm the test is a Parameterized test. "
+ "See `com.mongodb.test.AfterBeforeParameterResolver` for more details.");
} else {
parameterisedTestParameterResolver = resolverOptional.get();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

package org.mongodb.scala.unified

object ClientEncryptionTest extends UnifiedTest {
class ClientEncryptionTest extends UnifiedTest {
Copy link
Member Author

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 data method is no longer static.

val directory = "client-side-encryption/tests/unified"
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

package org.mongodb.scala.unified

object UnifiedCrudTest extends UnifiedTest {
class UnifiedCrudTest extends UnifiedTest {
val directory = "crud"
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,13 @@ abstract class UnifiedTest extends JUnifiedTest {
override def createClientEncryption(
keyVaultClient: JMongoClient,
clientEncryptionSettings: JClientEncryptionSettings
): JClientEncryption = {
Copy link
Member Author

Choose a reason for hiding this comment

The 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
Expand Down
5 changes: 3 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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" }
Copy link
Member Author

Choose a reason for hiding this comment

The 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" }
Expand Down Expand Up @@ -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"]

Expand Down