Merge pull request #5261 from kwvanderlinde/refactor/5215-mockito-age…

…nt-fix Register mockito as a java agent
RPTools · Feb 14, 2025 · 5c84544 · 5c84544
2 parents d7e2785 + 55b1bd8
commit 5c84544
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -420,11 +420,6 @@ dependencies {
     implementation(libs.rptools.maptool.addons)
     implementation(libs.rptools.dice.roller)
     implementation(libs.noiselib)
-
-    testRuntimeOnly(libs.junit.platform.launcher)
-    testRuntimeOnly(libs.junit.engine)
-    testImplementation(libs.bundles.junit)
-    testImplementation(libs.mockito.core)
 }
 
 processResources {
@@ -506,10 +501,6 @@ javadoc {
     options.tags("note:a:<strong><u>Note:</u></strong>")
 }
 
-test {
-    useJUnitPlatform()
-}
-
 task createWrapper(type: Wrapper) {
     gradleVersion = '8.2.1'
 }
diff --git a/buildSrc/shared.gradle b/buildSrc/shared.gradle
@@ -32,4 +32,23 @@ spotless {
         // or spaces. Takes an integer argument if you don't like 4
         indentWithSpaces(4)
     }
+}
+
+configurations {
+    mockitoAgent
+}
+
+dependencies {
+    testRuntimeOnly(libs.junit.platform.launcher)
+    testRuntimeOnly(libs.junit.engine)
+    testImplementation(libs.bundles.junit)
+    testImplementation(libs.mockito.core)
+    mockitoAgent(libs.mockito.core) {
+        transitive = false
+    }
+}
+
+test {
+    useJUnitPlatform()
+    jvmArgs += "-javaagent:${configurations.mockitoAgent.asPath}"
 }
diff --git a/clientserver/build.gradle b/clientserver/build.gradle
@@ -28,13 +28,4 @@ dependencies {
     // compression of messages between client and server
     implementation(libs.apache.commons.compress)
     implementation(libs.zstd)
-
-    testRuntimeOnly(libs.junit.platform.launcher)
-    testRuntimeOnly(libs.junit.engine)
-    testImplementation(libs.bundles.junit)
-    testImplementation(libs.mockito.core)
-}
-
-test {
-    useJUnitPlatform()
 }