Skip to content

Commit db6559c

Browse files
YeregorixYeregorix
committed
Fix Mockito error in tests
1 parent 60334d3 commit db6559c

File tree

9 files changed

+91
-32
lines changed

9 files changed

+91
-32
lines changed

‎SpongeAPI‎

‎build.gradle.kts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,7 @@ dependencies {
174174
testRuntimeOnly(apiLibs.junit.engine)
175175
testRuntimeOnly(apiLibs.junit.launcher)
176176

177-
testImplementation(libs.mockito.core)
178-
testImplementation(libs.mockito.junitJupiter) {
179-
exclude(group = "org.junit.jupiter", module = "junit-jupiter-api")
180-
}
177+
testImplementation(apiLibs.mockito)
181178

182179
testImplementation(libs.mixin)
183180
}

‎forge/build.gradle.kts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,7 @@ dependencies {
229229
testImplementation(apiLibs.junit.launcher)
230230
testRuntimeOnly(apiLibs.junit.engine)
231231

232-
testImplementation(libs.mockito.core)
233-
testImplementation(libs.mockito.junitJupiter) {
234-
exclude(group = "org.junit.jupiter", module = "junit-jupiter-api")
235-
}
232+
testImplementation(apiLibs.mockito)
236233

237234
testRuntimeOnly(libs.jacoco.core) {
238235
exclude(group = "org.ow2.asm")

‎gradle/libs.versions.toml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ securemodules = "2.2.22"
1414
fancymodloader = "10.0.32"
1515
jarjar = "0.3.26"
1616
guava = "32.1.2-jre"
17-
mockito = "5.11.0"
1817
jline = "3.25.1"
1918
tinylog = "2.7.0"
2019
vineflower = "1.11.1"
@@ -52,8 +51,6 @@ javaxInject = { module = "javax.inject:javax.inject", version = "1" }
5251
mixin = { module = "org.spongepowered:mixin", version.ref = "mixin" }
5352
mixinextras-common = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinextras" }
5453
mixinextras-forge = { module = "io.github.llamalad7:mixinextras-forge", version.ref = "mixinextras" }
55-
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
56-
mockito-junitJupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
5754
jacoco-core = { module = "org.jacoco:org.jacoco.core", version.ref = "jacoco" }
5855

5956
# vanilla

‎gradle/verification-metadata.xml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3303,6 +3303,14 @@
33033303
<sha256 value="5da995c70de7b7f4a848a85437c7ddee803d1ab7cac2d7d8df7194c3d5e2714d" origin="Generated by Gradle"/>
33043304
</artifact>
33053305
</component>
3306+
<component group="net.bytebuddy" name="byte-buddy" version="1.17.7">
3307+
<artifact name="byte-buddy-1.17.7.jar">
3308+
<sha256 value="3575dcb8a98faf943d3c1595c47a16047c4fce8a83ebbb26262f1a2f67546357" origin="Generated by Gradle"/>
3309+
</artifact>
3310+
<artifact name="byte-buddy-1.17.7.pom">
3311+
<sha256 value="ee7fba8569c3bb5c1e91e5812fd9f4a0f31be27e568d5354e1adfd19119f97b3" origin="Generated by Gradle"/>
3312+
</artifact>
3313+
</component>
33063314
<component group="net.bytebuddy" name="byte-buddy-agent" version="1.12.14">
33073315
<artifact name="byte-buddy-agent-1.12.14.jar">
33083316
<sha256 value="1819351a0c2e9719aafdb501c5399978bcb6c2817c9bae8227827771fa13dc97" origin="Generated by Gradle"/>
@@ -3327,6 +3335,14 @@
33273335
<sha256 value="66989f70d355d600fd4d926d8835e47b7d1beff678eebec59d196363b5cd4c2c" origin="Generated by Gradle"/>
33283336
</artifact>
33293337
</component>
3338+
<component group="net.bytebuddy" name="byte-buddy-agent" version="1.17.7">
3339+
<artifact name="byte-buddy-agent-1.17.7.jar">
3340+
<sha256 value="a9ba887dca252ad61b7d5153294f34e6f3bdf4b2736b04373d13615a695fc0ff" origin="Generated by Gradle"/>
3341+
</artifact>
3342+
<artifact name="byte-buddy-agent-1.17.7.pom">
3343+
<sha256 value="814ee42d6b0117f4b8d1eb6b1d62c16db4c0b597d83b3ad8daa5781eb145d7dc" origin="Generated by Gradle"/>
3344+
</artifact>
3345+
</component>
33303346
<component group="net.bytebuddy" name="byte-buddy-parent" version="1.12.14">
33313347
<artifact name="byte-buddy-parent-1.12.14.pom">
33323348
<sha256 value="3c1a71bd77df0ca4777955a0e8d24b389dcc8a33762482fb447f7b44f6fccb68" origin="Generated by Gradle"/>
@@ -3342,6 +3358,11 @@
33423358
<sha256 value="9b7fd2bf292531acb0e974d955e4a36ca41332dd0dafe89c24d8fe439bae57b0" origin="Generated by Gradle"/>
33433359
</artifact>
33443360
</component>
3361+
<component group="net.bytebuddy" name="byte-buddy-parent" version="1.17.7">
3362+
<artifact name="byte-buddy-parent-1.17.7.pom">
3363+
<sha256 value="8a57e20dcce00da71c33ef3e19d9dd858fe9d2042ca2e2bca27871700d52698c" origin="Generated by Gradle"/>
3364+
</artifact>
3365+
</component>
33453366
<component group="net.covers1624" name="Quack" version="0.4.10.101">
33463367
<artifact name="Quack-0.4.10.101.jar">
33473368
<sha256 value="22afc1694fd7ff99d71fce3544d54c3bd81df71ef1a83e96ced1daba19cf68e6" origin="Generated by Gradle"/>
@@ -9700,6 +9721,14 @@
97009721
<sha256 value="bb5da3060226b1b3ceb5408495dc69b59465bf50d7ebe63eef94f25909cf1900" origin="Generated by Gradle"/>
97019722
</artifact>
97029723
</component>
9724+
<component group="org.junit.jupiter" name="junit-jupiter-api" version="5.13.4">
9725+
<artifact name="junit-jupiter-api-5.13.4.jar">
9726+
<sha256 value="d1bb81abfd9e03418306b4e6a3390c8db52c58372e749c2980ac29f0c08278f1" origin="Generated by Gradle"/>
9727+
</artifact>
9728+
<artifact name="junit-jupiter-api-5.13.4.module">
9729+
<sha256 value="fe464d37f5c810a805ff319198165cac33c2558e2261021d8f312a825a48671f" origin="Generated by Gradle"/>
9730+
</artifact>
9731+
</component>
97039732
<component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.10.1">
97049733
<artifact name="junit-jupiter-engine-5.10.1.jar">
97059734
<sha256 value="02930dfe495f93fe70b26550ace3a28f7e1b900c84426c2e4626ce020c7282d6" origin="Generated by Gradle"/>
@@ -9719,6 +9748,14 @@
97199748
<sha256 value="abe72c8fbf9a9c8f9ee79bac29ba6479d32b0dffaab88080a502911d24d39463" origin="Generated by Gradle"/>
97209749
</artifact>
97219750
</component>
9751+
<component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.13.4">
9752+
<artifact name="junit-jupiter-engine-5.13.4.jar">
9753+
<sha256 value="027404a92fe618b72465792a257951495c503a7d5751e2791e0f51c87f67f5bc" origin="Generated by Gradle"/>
9754+
</artifact>
9755+
<artifact name="junit-jupiter-engine-5.13.4.module">
9756+
<sha256 value="ceeee6d0034a738135bd9f3820cfe089c6569163c623ba8e3e9b44f7208fd21a" origin="Generated by Gradle"/>
9757+
</artifact>
9758+
</component>
97229759
<component group="org.junit.jupiter" name="junit-jupiter-params" version="5.10.1">
97239760
<artifact name="junit-jupiter-params-5.10.1.jar">
97249761
<sha256 value="c8cf62debcbb354deefe1ffd0671eff785514907567d22a615ff8a8de4522b21" origin="Generated by Gradle"/>
@@ -9738,6 +9775,14 @@
97389775
<sha256 value="f27d7d096db48a05d6e7afd841a95454424e55c523d7aed1668178b33a63cbd7" origin="Generated by Gradle"/>
97399776
</artifact>
97409777
</component>
9778+
<component group="org.junit.jupiter" name="junit-jupiter-params" version="5.13.4">
9779+
<artifact name="junit-jupiter-params-5.13.4.jar">
9780+
<sha256 value="3a8c6365716dbb698c0d49a05456c1e1ad05c406613c550f9dd50037872efc41" origin="Generated by Gradle"/>
9781+
</artifact>
9782+
<artifact name="junit-jupiter-params-5.13.4.module">
9783+
<sha256 value="fc366fbe607999afc8cf02b9dca95d1e02a06b0ce872a45605a9d968c246f4b4" origin="Generated by Gradle"/>
9784+
</artifact>
9785+
</component>
97419786
<component group="org.junit.platform" name="junit-platform-commons" version="1.10.1">
97429787
<artifact name="junit-platform-commons-1.10.1.jar">
97439788
<sha256 value="7d9855ee3f3f71f015eb1479559bf923783243c24fbfbd8b29bed8e8099b5672" origin="Generated by Gradle"/>
@@ -9757,6 +9802,14 @@
97579802
<sha256 value="f3f825c7ca3bd89714d489447c77c76e27ea38f0285f5f796a1000a17fca4be7" origin="Generated by Gradle"/>
97589803
</artifact>
97599804
</component>
9805+
<component group="org.junit.platform" name="junit-platform-commons" version="1.13.4">
9806+
<artifact name="junit-platform-commons-1.13.4.jar">
9807+
<sha256 value="1c25ca641ebaae44ff3ad21ca1b2ef68d0dd84bfeb07c4805ba7840899b77408" origin="Generated by Gradle"/>
9808+
</artifact>
9809+
<artifact name="junit-platform-commons-1.13.4.module">
9810+
<sha256 value="1a7a2de7c798995fb97b244d6ef9e99c3a5799b57a0fbacd68496ba7ee8159d7" origin="Generated by Gradle"/>
9811+
</artifact>
9812+
</component>
97609813
<component group="org.junit.platform" name="junit-platform-engine" version="1.10.1">
97619814
<artifact name="junit-platform-engine-1.10.1.jar">
97629815
<sha256 value="baa48e470d6dee7369a0a8820c51da89c1463279eda6e13a304d11f45922c760" origin="Generated by Gradle"/>
@@ -9773,6 +9826,14 @@
97739826
<sha256 value="e1d1badcfedc27244541e0be5d5e84b72a2270d7af61686b26f11cfc4770da42" origin="Generated by Gradle"/>
97749827
</artifact>
97759828
</component>
9829+
<component group="org.junit.platform" name="junit-platform-engine" version="1.13.4">
9830+
<artifact name="junit-platform-engine-1.13.4.jar">
9831+
<sha256 value="390c5f77b84283a64b644f88251b397e0b0debb80bdcc50f899881aecff43a5a" origin="Generated by Gradle"/>
9832+
</artifact>
9833+
<artifact name="junit-platform-engine-1.13.4.module">
9834+
<sha256 value="35e4fd68ebf314e62660148936436b39ae105d355beaac1aa54eb91c2066ca77" origin="Generated by Gradle"/>
9835+
</artifact>
9836+
</component>
97769837
<component group="org.junit.platform" name="junit-platform-launcher" version="1.10.1">
97779838
<artifact name="junit-platform-launcher-1.10.1.jar">
97789839
<sha256 value="ded414c504e88d02270331071969084e1b2fd9bcf8443f35d44da2c6e3301bc2" origin="Generated by Gradle"/>
@@ -9792,6 +9853,14 @@
97929853
<sha256 value="5a311708e7906bb974629c1ac870bc11657465b989da4a077e45416bd98725e4" origin="Generated by Gradle"/>
97939854
</artifact>
97949855
</component>
9856+
<component group="org.junit.platform" name="junit-platform-launcher" version="1.13.4">
9857+
<artifact name="junit-platform-launcher-1.13.4.jar">
9858+
<sha256 value="0b0beaeb6880a31149641d2d848b863712885469670c12099586d7f798522564" origin="Generated by Gradle"/>
9859+
</artifact>
9860+
<artifact name="junit-platform-launcher-1.13.4.module">
9861+
<sha256 value="115f77455740e0c3c5398bcdd841c8aa699c2d8002b1100f2ae7a643d9405928" origin="Generated by Gradle"/>
9862+
</artifact>
9863+
</component>
97959864
<component group="org.lwjgl" name="lwjgl" version="3.3.1">
97969865
<artifact name="lwjgl-3.3.1.jar">
97979866
<sha256 value="cf83f90e32fb973ff5edfca4ef35f55ca51bb70a579b6a1f290744f552e8e484" origin="Generated by Gradle"/>
@@ -10283,6 +10352,14 @@
1028310352
<sha256 value="ba0b1b5d703509494f9a8e44582223879e3348a4c49667f0c77e68746e481c78" origin="Generated by Gradle"/>
1028410353
</artifact>
1028510354
</component>
10355+
<component group="org.mockito" name="mockito-core" version="5.21.0">
10356+
<artifact name="mockito-core-5.21.0.jar">
10357+
<sha256 value="03db23de742cbca42aa3d6127fdace560fac37b036d931870801f84c288bd286" origin="Generated by Gradle"/>
10358+
</artifact>
10359+
<artifact name="mockito-core-5.21.0.pom">
10360+
<sha256 value="0221b31f96df01a158c645371aad81b2d3f5bee0f589ca0d0c2eaa6e8da092f3" origin="Generated by Gradle"/>
10361+
</artifact>
10362+
</component>
1028610363
<component group="org.mockito" name="mockito-core" version="5.9.0">
1028710364
<artifact name="mockito-core-5.9.0.jar">
1028810365
<sha256 value="bbad9185ed734965fac7e367f0e51596f69531e51d8b2cbcec1048dd6fb41f2c" origin="Generated by Gradle"/>

‎neoforge/build.gradle.kts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,7 @@ dependencies {
220220
testImplementation(apiLibs.junit.launcher)
221221
testRuntimeOnly(apiLibs.junit.engine)
222222

223-
testImplementation(libs.mockito.core)
224-
testImplementation(libs.mockito.junitJupiter) {
225-
exclude(group = "org.junit.jupiter", module = "junit-jupiter-api")
226-
}
223+
testImplementation(apiLibs.mockito)
227224

228225
testRuntimeOnly(libs.jacoco.core) {
229226
exclude(group = "org.ow2.asm")

‎src/test/java/org/spongepowered/common/scheduler/SchedulerTest.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@
2929
import static org.mockito.Mockito.when;
3030

3131
import org.junit.jupiter.api.Test;
32-
import org.junit.jupiter.api.extension.ExtendWith;
3332
import org.mockito.Mockito;
34-
import org.mockito.junit.jupiter.MockitoExtension;
35-
import org.mockito.junit.jupiter.MockitoSettings;
36-
import org.mockito.quality.Strictness;
3733
import org.spongepowered.api.Server;
3834
import org.spongepowered.api.Sponge;
3935
import org.spongepowered.api.scheduler.Task;
@@ -44,8 +40,6 @@
4440

4541
import java.util.concurrent.atomic.AtomicBoolean;
4642

47-
@ExtendWith(MockitoExtension.class)
48-
@MockitoSettings(strictness = Strictness.LENIENT)
4943
public class SchedulerTest {
5044

5145
@Test

‎src/test/java/org/spongepowered/common/util/transformation/VolumeTransformationTest.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,9 @@
2525
package org.spongepowered.common.util.transformation;
2626

2727
import org.junit.jupiter.api.Assertions;
28-
import org.junit.jupiter.api.extension.ExtendWith;
2928
import org.junit.jupiter.params.ParameterizedTest;
3029
import org.junit.jupiter.params.provider.Arguments;
3130
import org.junit.jupiter.params.provider.MethodSource;
32-
import org.mockito.junit.jupiter.MockitoExtension;
33-
import org.mockito.junit.jupiter.MockitoSettings;
34-
import org.mockito.quality.Strictness;
3531
import org.spongepowered.api.Sponge;
3632
import org.spongepowered.api.block.BlockTypes;
3733
import org.spongepowered.api.block.entity.BlockEntityArchetype;
@@ -54,8 +50,6 @@
5450
import java.util.Optional;
5551
import java.util.stream.Stream;
5652

57-
@ExtendWith(MockitoExtension.class)
58-
@MockitoSettings(strictness = Strictness.LENIENT)
5953
public final class VolumeTransformationTest {
6054

6155
private static final Vector3i INVALID_STUB_POSITION = Vector3i.from(

‎vanilla/build.gradle.kts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ val gameManagedLibrariesConfig = configurations.register("gameManagedLibraries")
3535
val bootShadedLibrariesConfig = configurations.register("bootShadedLibraries")
3636
val gameShadedLibrariesConfig = configurations.register("gameShadedLibraries")
3737

38+
val testModulesConfig = configurations.register("testModules")
39+
3840
// ModLauncher layers
3941
val bootLayerConfig = configurations.register("bootLayer") {
4042
extendsFrom(bootLibrariesConfig.get())
@@ -143,6 +145,10 @@ val testSources = sourceSets.named("test") {
143145

144146
spongeImpl.addDependencyToImplementation(bootstrapMain.get(), this)
145147
spongeImpl.addDependencyToImplementation(bootstrapForge.get(), this)
148+
149+
configurations.named(implementationConfigurationName) {
150+
extendsFrom(testModulesConfig.get())
151+
}
146152
}
147153

148154
val mixinConfigs = spongeImpl.mixinConfigurations
@@ -256,10 +262,8 @@ dependencies {
256262
testImplementation(apiLibs.junit.launcher)
257263
testRuntimeOnly(apiLibs.junit.engine)
258264

259-
testImplementation(libs.mockito.core)
260-
testImplementation(libs.mockito.junitJupiter) {
261-
exclude(group = "org.junit.jupiter", module = "junit-jupiter-api")
262-
}
265+
val test = testModulesConfig.name
266+
test(apiLibs.mockito)
263267

264268
testRuntimeOnly(libs.jacoco.core) {
265269
exclude(group = "org.ow2.asm")
@@ -504,6 +508,8 @@ tasks {
504508

505509
val runServer = minecraft.runs.server().get()
506510
jvmArgs(runServer.allJvmArguments())
511+
jvmArgs("--module-path=" + testModulesConfig.get().asPath)
512+
jvmArgs("--add-modules=net.bytebuddy.agent,net.bytebuddy")
507513
jvmArgs("-Dsponge.test.args=" + runServer.allArguments().joinToString(" "))
508514
jvmArgs("-Dsponge.jacoco.packages=org.spongepowered")
509515
jvmArgs("-Djunit.platform.launcher.interceptors.enabled=true")

0 commit comments

Comments
 (0)