[WIP] Clean Up Test Mods

.github/workflows/test-push.yml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         gradle: [
           8.4,
-          8.7, # version used by buildscript
+          8.8, # version used by buildscript
           8 # latest
         ]
         java: [
@@ -22,8 +22,6 @@ jobs:
           21 # Latest LTS only supported by gradle 8.5+
         ]
         exclude:
-          - gradle: 8.1
-            java: 21
           - gradle: 8.4
             java: 21
     runs-on: ubuntu-22.04

docs/USAGE.md

@@ -140,7 +140,7 @@ unimined.minecraft {
     runs {
         off = true // disable all run configurations
         config("client") {
-           disabled = true // disable the runClient task
+           enabled = false // disable the runClient task
            args += "--my-arg" // add an argument to the runClient task
         }
     }

src/test/kotlin/xyz/wagyourtail/unimined/test/integration/ForgeFabric1_12_2Test.kt → src/test/kotlin/xyz/wagyourtail/unimined/test/integration/Minecraft1Point12Point2Test.kt

@@ -2,17 +2,16 @@ package xyz.wagyourtail.unimined.test.integration
 
 import org.gradle.testkit.runner.TaskOutcome
 import org.gradle.testkit.runner.UnexpectedBuildFailure
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import xyz.wagyourtail.unimined.util.runTestProject
 
-class ForgeFabric1_12_2Test {
+class Minecraft1Point12Point2Test {
     @ParameterizedTest
     @MethodSource("xyz.wagyourtail.unimined.util.IntegrationTestUtils#versions")
-    fun test_forge_fabric_1_12_2(gradleVersion: String) {
+    fun testMinecraft1Point12Point2(gradleVersion: String) {
         try {
-            val result = runTestProject("1.12.2-Forge-Fabric", gradleVersion)
+            val result = runTestProject("minecraft/1.12.2", gradleVersion)
 
             try {
                 result.task(":build")?.outcome?.let {
@@ -27,4 +26,4 @@ class ForgeFabric1_12_2Test {
             throw Exception("build failed", e)
         }
     }
-}
+}

src/test/kotlin/xyz/wagyourtail/unimined/test/integration/ForgeModloader1_2_5Test.kt → src/test/kotlin/xyz/wagyourtail/unimined/test/integration/Minecraft1Point2Point5Test.kt

@@ -2,17 +2,16 @@ package xyz.wagyourtail.unimined.test.integration
 
 import org.gradle.testkit.runner.TaskOutcome
 import org.gradle.testkit.runner.UnexpectedBuildFailure
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import xyz.wagyourtail.unimined.util.runTestProject
 
-class ForgeModloader1_2_5Test {
+class Minecraft1Point2Point5Test {
     @ParameterizedTest
     @MethodSource("xyz.wagyourtail.unimined.util.IntegrationTestUtils#versions")
-    fun test_forge_modloader_1_2_5(gradleVersion: String) {
+    fun testMinecraft1Point2Point5(gradleVersion: String) {
         try {
-            val result = runTestProject("1.2.5-Forge-Modloader", gradleVersion)
+            val result = runTestProject("minecraft/1.2.5", gradleVersion)
 
             try {
                 result.task(":build")?.outcome?.let {
@@ -27,4 +26,4 @@ class ForgeModloader1_2_5Test {
             throw Exception("build failed", e)
         }
     }
-}
+}

src/test/kotlin/xyz/wagyourtail/unimined/test/integration/BabricModloaderB1_7_3Test.kt → src/test/kotlin/xyz/wagyourtail/unimined/test/integration/MinecraftBeta1Point7Point7Test.kt

@@ -6,12 +6,12 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import xyz.wagyourtail.unimined.util.*
 
-class BabricModloaderB1_7_3Test {
+class MinecraftBeta1Point7Point7Test {
     @ParameterizedTest
     @MethodSource("xyz.wagyourtail.unimined.util.IntegrationTestUtils#versions")
-    fun test_babric_modloader_b1_7_3(gradleVersion: String) {
+    fun testMinecraftBeta1Point7Point3(gradleVersion: String) {
         try {
-            val result = runTestProject("b1.7.3-Babric-Modloader", gradleVersion)
+            val result = runTestProject("minecraft/beta-1.7.3", gradleVersion)
 
             try {
                 result.task(":build")?.outcome?.let {
@@ -26,4 +26,4 @@ class BabricModloaderB1_7_3Test {
             throw Exception("build failed", e)
         }
     }
-}
+}

src/test/kotlin/xyz/wagyourtail/unimined/util/IntegrationTestUtils.kt

@@ -27,17 +27,12 @@ fun openZipFileSystem(project: String, path: String): FileSystem? {
 
     return fullPath.openZipFileSystem(mapOf("mutable" to false))
 }
-class IntegrationTestUtils {
-    companion object {
-        private val GRADLE_VERSION = setOf(
-            "7.6.3",
-            "8.8",
-            GRADLE_CURRENT,
-        )
 
-        @JvmStatic
-        fun versions() = GRADLE_VERSION.toTypedArray()
-    }
+object IntegrationTestUtils {
+    private val GRADLE_VERSION = setOf("8.8", GRADLE_CURRENT)
+
+    @JvmStatic
+    fun versions() = GRADLE_VERSION.toTypedArray()
 }
 
 fun runGradle(dir: Path, version: String = GRADLE_CURRENT): BuildResult {