Reorganise tests (#378)

.github/workflows/test-push.yml

@@ -61,7 +61,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - run: gradle test --tests *${{ matrix.test }} --stacktrace
+      - run: gradle test --tests ${{ matrix.test }} --stacktrace
         env:
           TEST_WARNING_MODE: fail
 

build.gradle

@@ -211,21 +211,21 @@ publishing {
 task writeActionsTestMatrix() {
 	doLast {
 		def testMatrix = []
-		file('src/test/groovy/net/fabricmc/loom').eachFile {
+		file('src/test/groovy/net/fabricmc/loom/test/intergration').eachFile {
 			if (it.name.endsWith("Test.groovy")) {
-				if (it.text.contains("@Ignore")) {
-					// A quick hack to disable currently broken tests.
-					return
-				}
-
 				if (it.name.endsWith("ReproducibleBuildTest.groovy")) {
 					// This test gets a special case to run across all os's
 					return
 				}
 
-				testMatrix.add(it.name.replace(".groovy", ""))
+				def className = it.name.replace(".groovy", "")
+				testMatrix.add("net.fabricmc.loom.test.intergration.${className}")
 			}
 		}
+
+		// Run all the unit tests togeather
+		testMatrix.add("net.fabricmc.loom.test.unit.*")
+
 		def json = groovy.json.JsonOutput.toJson(testMatrix)
 		def output = file("build/test_matrix.json")
 		output.parentFile.mkdir()

src/test/groovy/net/fabricmc/loom/test/intergration/AccessWidenerTest.groovy

@@ -22,10 +22,10 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom
+package net.fabricmc.loom.test.intergration
 
-import net.fabricmc.loom.util.ArchiveAssertionsTrait
+import net.fabricmc.loom.test.util.ArchiveAssertionsTrait
-import net.fabricmc.loom.util.ProjectTestTrait
+import net.fabricmc.loom.test.util.ProjectTestTrait
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -45,9 +45,9 @@ class AccessWidenerTest extends Specification implements ProjectTestTrait, Archi
 			result.task(":build").outcome == SUCCESS
 			getArchiveEntry("fabric-example-mod-1.0.0.jar", "modid.accesswidener") == expected().replaceAll('\r', '')
 		where:
-			gradle     | _
+			gradle              | _
-			'6.8.3'    | _
+			DEFAULT_GRADLE      | _
-			'7.0-rc-1' | _
+			PRE_RELEASE_GRADLE  | _
 	}
 
 	String expected() {

src/test/groovy/net/fabricmc/loom/test/intergration/DecompileTest.groovy

@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom
+package net.fabricmc.loom.test.intergration
 
-import net.fabricmc.loom.util.ProjectTestTrait
+import net.fabricmc.loom.test.util.ProjectTestTrait
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -46,9 +46,9 @@ class DecompileTest extends Specification implements ProjectTestTrait {
 
 		where:
 			decompiler 		| task								| gradle
-			'fernflower'	| "genSources"						| "6.8.3"
+			'fernflower'	| "genSources"						| DEFAULT_GRADLE
-			'fernflower'	| "genSources"						| "4.9"
+			'fernflower'	| "genSources"						| LEGACY_GRADLE
-			'fernflower'	| "genSources"						| "7.0-rc-1"
+			'fernflower'	| "genSources"						| PRE_RELEASE_GRADLE
-			'cfr' 			| "genSourcesWithExperimentalCfr"	| "6.8.3"
+			'cfr' 			| "genSourcesWithExperimentalCfr"	| DEFAULT_GRADLE
 	}
 }

src/test/groovy/net/fabricmc/loom/test/intergration/KotlinTest.groovy

@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom
+package net.fabricmc.loom.test.intergration
 
-import net.fabricmc.loom.util.ProjectTestTrait
+import net.fabricmc.loom.test.util.ProjectTestTrait
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -43,8 +43,8 @@ class KotlinTest extends Specification implements ProjectTestTrait {
 		then:
 			result.task(":build").outcome == SUCCESS
 		where:
-			gradle      | _
+			gradle              | _
-			'6.8.3'     | _
+			DEFAULT_GRADLE      | _
-			'7.0-rc-1'  | _
+			PRE_RELEASE_GRADLE  | _
 	}
 }

src/test/groovy/net/fabricmc/loom/test/intergration/LegacyProjectTest.groovy

@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom
+package net.fabricmc.loom.test.intergration
 
-import net.fabricmc.loom.util.ProjectTestTrait
+import net.fabricmc.loom.test.util.ProjectTestTrait
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -40,7 +40,7 @@ class LegacyProjectTest extends Specification implements ProjectTestTrait {
 	@Unroll
 	def "build"() {
 		when:
-			def result = create("build", "4.9")
+			def result = create("build", LEGACY_GRADLE)
 		then:
 			result.task(":build").outcome == SUCCESS
 	}

src/test/groovy/net/fabricmc/loom/test/intergration/MavenProjectTest.groovy

@@ -22,10 +22,10 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom
+package net.fabricmc.loom.test.intergration
 
-import net.fabricmc.loom.util.ArchiveAssertionsTrait
+import net.fabricmc.loom.test.util.ArchiveAssertionsTrait
-import net.fabricmc.loom.util.MockMavenServerTrait
+import net.fabricmc.loom.test.util.MockMavenServerTrait
 import spock.lang.Specification
 import spock.lang.Stepwise
 import spock.lang.Unroll

src/test/groovy/net/fabricmc/loom/test/intergration/MojangMappingsProjectTest.groovy

@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom
+package net.fabricmc.loom.test.intergration
 
-import net.fabricmc.loom.util.ProjectTestTrait
+import net.fabricmc.loom.test.util.ProjectTestTrait
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -43,8 +43,8 @@ class MojangMappingsProjectTest extends Specification implements ProjectTestTrai
 		then:
 			result.task(":build").outcome == SUCCESS
 		where:
-			gradle      | _
+			gradle              | _
-			'6.8.3'     | _
+			DEFAULT_GRADLE      | _
-			'7.0-rc-1'  | _
+			PRE_RELEASE_GRADLE  | _
 	}
 }

src/test/groovy/net/fabricmc/loom/test/intergration/MultiProjectTest.groovy

@@ -22,10 +22,10 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom
+package net.fabricmc.loom.test.intergration
 
-import net.fabricmc.loom.util.ArchiveAssertionsTrait
+import net.fabricmc.loom.test.util.ArchiveAssertionsTrait
-import net.fabricmc.loom.util.ProjectTestTrait
+import net.fabricmc.loom.test.util.ProjectTestTrait
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -54,8 +54,8 @@ class MultiProjectTest extends Specification implements ProjectTestTrait, Archiv
 			hasArchiveEntry("multiproject-1.0.0.jar", "META-INF/jars/fabric-api-base-0.2.1+9354966b7d.jar")
 
 		where:
-			gradle      | _
+			gradle              | _
-			'6.8.3'     | _
+			DEFAULT_GRADLE      | _
-			'7.0-rc-1'  | _
+			PRE_RELEASE_GRADLE  | _
 	}
 }

src/test/groovy/net/fabricmc/loom/test/intergration/ReproducibleBuildTest.groovy

@@ -22,12 +22,12 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom
+package net.fabricmc.loom.test.intergration
 
 import com.google.common.hash.HashCode
 import com.google.common.hash.Hashing
 import com.google.common.io.Files
-import net.fabricmc.loom.util.ProjectTestTrait
+import net.fabricmc.loom.test.util.ProjectTestTrait
 import spock.lang.Specification
 import spock.lang.Unroll
 

src/test/groovy/net/fabricmc/loom/test/intergration/RunConfigTest.groovy

@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom
+package net.fabricmc.loom.test.intergration
 
-import net.fabricmc.loom.util.ProjectTestTrait
+import net.fabricmc.loom.test.util.ProjectTestTrait
 import spock.lang.Specification
 import spock.lang.Unroll
 

src/test/groovy/net/fabricmc/loom/test/intergration/SimpleProjectTest.groovy

@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom
+package net.fabricmc.loom.test.intergration
 
-import net.fabricmc.loom.util.ProjectTestTrait
+import net.fabricmc.loom.test.util.ProjectTestTrait
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -43,9 +43,9 @@ class SimpleProjectTest extends Specification implements ProjectTestTrait {
 		then:
 			result.task(":build").outcome == SUCCESS
 		where:
-			gradle      | _
+			gradle              | _
-			'6.8.3'     | _
+			DEFAULT_GRADLE      | _
-			'7.0-rc-1'  | _
+			PRE_RELEASE_GRADLE  | _
 	}
 
 	@Unroll

src/test/groovy/net/fabricmc/loom/test/intergration/UnpickTest.groovy

@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom
+package net.fabricmc.loom.test.intergration
 
-import net.fabricmc.loom.util.ProjectTestTrait
+import net.fabricmc.loom.test.util.ProjectTestTrait
 import org.zeroturnaround.zip.ZipUtil
 import spock.lang.Specification
 

src/test/groovy/net/fabricmc/loom/test/unit/GroovyXmlUtilTest.groovy

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom
+package net.fabricmc.loom.test.unit
 
 import groovy.xml.QName
 import net.fabricmc.loom.util.GroovyXmlUtil

src/test/groovy/net/fabricmc/loom/test/util/ArchiveAssertionsTrait.groovy

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom.util
+package net.fabricmc.loom.test.util
 
 import org.zeroturnaround.zip.ZipUtil
 

src/test/groovy/net/fabricmc/loom/test/util/MockMavenServerTrait.groovy

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom.util
+package net.fabricmc.loom.test.util
 
 import io.javalin.Javalin
 import org.apache.commons.io.IOUtils

src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy

@@ -22,15 +22,17 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom.util
+package net.fabricmc.loom.test.util
 
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
 
 trait ProjectTestTrait {
-	static File gradleHome = File.createTempDir()
+	final static String LEGACY_GRADLE = "4.9"
 	final static String DEFAULT_GRADLE = "6.8.3"
+	final static String PRE_RELEASE_GRADLE = "7.0-rc-2"
 
+	static File gradleHome = File.createTempDir()
 	File testProjectDir = File.createTempDir()
 
 	abstract String name()
@@ -93,7 +95,7 @@ trait ProjectTestTrait {
 	}
 
 	String warningMode(String gradleVersion) {
-		if (gradleVersion == "4.9") {
+		if (gradleVersion == LEGACY_GRADLE) {
 			return "all"
 		}