Clean up and fix integration tests (#348)

* Rename SimpleNeoForgeTest to NeoForge1202Test

* Split ArchitecturyFabricAdditionsTest into two classes

* Fix integration tests from subdirs being ignored

The architectury and neoforge packages are now run as
single tests like noRemap and the unit tests; the runtime
should be short enough for that.

* Fix spotless exclusion

* Fix ForgeRunConfigTest reporting false errors

* Remove unused constant for undetermined main class

* Fix code style

Author: Juuxel

build.gradle

@@ -236,7 +236,7 @@ spotless {
 		targetExclude(
 				// These files use a @MAPPINGS@ token which is not valid Groovy
 				'**/projects/forge/simple/build.gradle',
-				'**/projects/neoforge/simple/build.gradle'
+				'**/projects/neoforge/1202/build.gradle'
 				)
 	}
 
@@ -489,6 +489,12 @@ abstract class WriteActionsTestMatrix extends DefaultTask {
 	def run() {
 		def testMatrix = []
 
+		// Arch: read tests from subdirs
+		// Subdirectories combined into one test run each
+		def mergedSubdirs = ['architectury', 'neoforge']
+		// Subdirectories where individual tests are added to the matrix (= longer tests)
+		def directSubdirs = ['forge']
+
 		integrationTestDirectory.get().asFile.eachFile {
 			if (it.name.endsWith("Test.groovy")) {
 				if (it.name.endsWith("ReproducibleBuildTest.groovy")) {
@@ -510,6 +516,15 @@ abstract class WriteActionsTestMatrix extends DefaultTask {
 				testMatrix.add("net.fabricmc.loom.test.integration.${className}")
 			} else if (it.name.endsWith("noRemap")) {
 				testMatrix.add("net.fabricmc.loom.test.integration.noRemap.*")
+			} else if (it.isDirectory()) {
+				if (mergedSubdirs.contains(it.name)) {
+					testMatrix.add("net.fabricmc.loom.test.integration.${it.name}.*")
+				} else if (directSubdirs.contains(it.name)) {
+					it.eachFile { child ->
+						def className = child.name.replace(".groovy", "")
+						testMatrix.add("net.fabricmc.loom.test.integration.${it.name}.${className}")
+					}
+				}
 			}
 		}
 

src/main/java/net/fabricmc/loom/util/Constants.java

@@ -221,7 +221,6 @@ public static final class Manifest {
 	}
 
 	public static final class Forge {
-		public static final String UNDETERMINED_MAIN_CLASS = "[Forge] Main class has not been determined yet!";
 		public static final String ACCESS_TRANSFORMER_PATH = "META-INF/accesstransformer.cfg";
 		public static final String MIXIN_CONFIGS_MANIFEST_KEY = "MixinConfigs";
 

…y/ArchitecturyFabricAdditionsTest.groovy …ectury/AccessWidenerInjectionTest.groovysrc/test/groovy/net/fabricmc/loom/test/integration/architectury/ArchitecturyFabricAdditionsTest.groovy renamed to src/test/groovy/net/fabricmc/loom/test/integration/architectury/AccessWidenerInjectionTest.groovy src/test/groovy/net/fabricmc/loom/test/integration/architectury/ArchitecturyFabricAdditionsTest.groovy renamed to src/test/groovy/net/fabricmc/loom/test/integration/architectury/AccessWidenerInjectionTest.groovy

@@ -1,7 +1,7 @@
 /*
  * This file is part of fabric-loom, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2023-2026 FabricMC
+ * Copyright (c) 2026 FabricMC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -33,7 +33,7 @@ import net.fabricmc.loom.test.util.GradleProjectTestTrait
 import static net.fabricmc.loom.test.LoomTestConstants.STANDARD_TEST_VERSIONS
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 
-class ArchitecturyFabricAdditionsTest extends Specification implements GradleProjectTestTrait {
+class AccessWidenerInjectionTest extends Specification implements GradleProjectTestTrait {
 	private static final String INJECTED_AW_FILE_NAME = 'hello_world.accesswidener'
 	private static final String INJECTED_AW_CONTENTS_REMAP = """\
 		accessWidener v1 named
@@ -46,31 +46,6 @@ class ArchitecturyFabricAdditionsTest extends Specification implements GradlePro
 		"""
 	.stripIndent()
 
-	@Unroll
-	def "build with crane (gradle #version)"() {
-		setup:
-		def gradle = gradleProject(project: 'minimalBase', version: version)
-		gradle.buildGradle << """
-			dependencies {
-				minecraft 'com.mojang:minecraft:1.17.1'
-				mappings loom.layered {
-					officialMojangMappings()
-					crane 'dev.architectury:crane:1.17.1+build.15'
-				}
-				modImplementation 'net.fabricmc:fabric-loader:0.14.19'
-			}
-		"""
-
-		when:
-		def result = gradle.run(task: 'build')
-
-		then:
-		result.task(':build').outcome == SUCCESS
-
-		where:
-		version << STANDARD_TEST_VERSIONS
-	}
-
 	@Unroll
 	def "inject access widener (old api, remap, gradle #version)"() {
 		setup:

src/test/groovy/net/fabricmc/loom/test/integration/architectury/CraneTest.groovy

@@ -0,0 +1,60 @@
+/*
+ * This file is part of fabric-loom, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) 2023 FabricMC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package net.fabricmc.loom.test.integration.architectury
+
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import net.fabricmc.loom.test.util.GradleProjectTestTrait
+
+import static net.fabricmc.loom.test.LoomTestConstants.STANDARD_TEST_VERSIONS
+import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
+
+class CraneTest extends Specification implements GradleProjectTestTrait {
+	@Unroll
+	def "build with crane (gradle #version)"() {
+		setup:
+		def gradle = gradleProject(project: 'minimalBase', version: version)
+		gradle.buildGradle << """
+			dependencies {
+				minecraft 'com.mojang:minecraft:1.17.1'
+				mappings loom.layered {
+					officialMojangMappings()
+					crane 'dev.architectury:crane:1.17.1+build.15'
+				}
+				modImplementation 'net.fabricmc:fabric-loader:0.14.19'
+			}
+		"""
+
+		when:
+		def result = gradle.run(task: 'build')
+
+		then:
+		result.task(':build').outcome == SUCCESS
+
+		where:
+		version << STANDARD_TEST_VERSIONS
+	}
+}

src/test/groovy/net/fabricmc/loom/test/integration/forge/ForgeRunConfigTest.groovy

@@ -24,6 +24,8 @@
 
 package net.fabricmc.loom.test.integration.forge
 
+import java.util.stream.Collectors
+
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -44,24 +46,26 @@ class ForgeRunConfigTest extends Specification implements GradleProjectTestTrait
 				.replace('@PACKAGE@', 'net.minecraftforge:forge')
 				.replace('@JAVA_VERSION@', javaVersion)
 		gradle.buildGradle << """
-		tasks.register('verifyRunConfigs') {
-			doLast {
-				loom.runs.each {
-					def expected = '$mainClass'
-					def found = it.mainClass.get()
-					if (expected != found) {
-						throw new AssertionError("\$it.name: found main class \$found, expected \$expected")
-					}
-				}
+		afterEvaluate {
+			loom.runs.each {
+				def finalised = net.fabricmc.loom.configuration.ide.DefaultRunConfigurationSettings.finialise(it, project)
+				def mainClass = finalised.mainClass.get()
+				file('main_classes.txt') << "\$it.name\\t\$mainClass\\n"
 			}
 		}
 		""".stripIndent()
 
 		when:
-		def result = gradle.run(task: "verifyRunConfigs", configurationCache: false)
+		def result = gradle.run(task: "build")
+		def mainClasses = new File(gradle.projectDir, 'main_classes.txt')
+				.readLines()
+				.stream()
+				.map { it.split('\t') }
+				.collect(Collectors.toMap({ it[0] }) { it[1] })
 
 		then:
-		result.task(":verifyRunConfigs").outcome == SUCCESS
+		result.task(":build").outcome == SUCCESS
+		mainClasses == [client: mainClass, server: mainClass]
 
 		where:
 		mcVersion | forgeVersion | javaVersion | mainClass

…ation/neoforge/SimpleNeoForgeTest.groovy …gration/neoforge/NeoForge1202Test.groovysrc/test/groovy/net/fabricmc/loom/test/integration/neoforge/SimpleNeoForgeTest.groovy renamed to src/test/groovy/net/fabricmc/loom/test/integration/neoforge/NeoForge1202Test.groovy src/test/groovy/net/fabricmc/loom/test/integration/neoforge/SimpleNeoForgeTest.groovy renamed to src/test/groovy/net/fabricmc/loom/test/integration/neoforge/NeoForge1202Test.groovy

@@ -32,11 +32,11 @@ import net.fabricmc.loom.test.util.GradleProjectTestTrait
 import static net.fabricmc.loom.test.LoomTestConstants.DEFAULT_GRADLE
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 
-class SimpleNeoForgeTest extends Specification implements GradleProjectTestTrait {
+class NeoForge1202Test extends Specification implements GradleProjectTestTrait {
 	@Unroll
 	def "build #mcVersion #neoforgeVersion #mappings"() {
 		setup:
-		def gradle = gradleProject(project: "neoforge/simple", version: DEFAULT_GRADLE)
+		def gradle = gradleProject(project: "neoforge/1202", version: DEFAULT_GRADLE)
 		gradle.buildGradle.text = gradle.buildGradle.text.replace('@MCVERSION@', mcVersion)
 				.replace('@NEOFORGEVERSION@', neoforgeVersion)
 				.replace('@MAPPINGS@', mappings)