Remove custom JUnit, make sure minecraft classpath is written before …

…tests run.
AppliedEnergistics · Nov 20, 2023 · 45b51ee · 45b51ee
1 parent 9d7e63f
commit 45b51ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -147,8 +147,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-//    testImplementation("org.junit.platform:junit-platform-launcher")
-    testImplementation files("junit-platform-launcher-1.11.0-SNAPSHOT.jar")
+    testImplementation("org.junit.platform:junit-platform-launcher")
     testImplementation files("securejarhandler-2.1.20.jar")
     testImplementation("org.assertj:assertj-core:3.19.0")
     testImplementation("com.google.guava:guava-testlib:21.0")
@@ -284,7 +283,6 @@ test {
     useJUnitPlatform()
 
     // Might not need this anymore...
-    systemProperty "junit.platform.launcher.interceptors.enabled", "true"
     systemProperty "guideDev.ae2guide.sources", file("guidebook").absolutePath
 
     def aeDir = project.rootDir.absolutePath
@@ -337,6 +335,10 @@ test {
     ]
 }
 
+tasks.named('test').configure {
+    it.dependsOn tasks.named('writeMinecraftClasspath')
+}
+
 dependencies {
     buildtoolsImplementation 'de.siegmar:fastcsv:2.1.0'
     buildtoolsImplementation 'com.google.code.gson:gson:2.8.9'

diff --git a/...unit/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherInterceptor b/...unit/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherInterceptor