From c02f436123e2e89dd6beef8bc3ea2872ca6dc509 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 23 Mar 2021 08:51:41 +0000 Subject: [PATCH] Run tests against 7.0-rc-1 --- .../net/fabricmc/loom/AccessWidenerTest.groovy | 6 +++--- .../groovy/net/fabricmc/loom/DecompileTest.groovy | 2 +- src/test/groovy/net/fabricmc/loom/KotlinTest.groovy | 6 +++--- .../fabricmc/loom/MojangMappingsProjectTest.groovy | 6 +++--- .../groovy/net/fabricmc/loom/MultiProjectTest.groovy | 6 +++--- .../net/fabricmc/loom/ReproducibleBuildTest.groovy | 6 +++--- .../groovy/net/fabricmc/loom/RunConfigTest.groovy | 12 ++++++------ .../net/fabricmc/loom/SimpleProjectTest.groovy | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/test/groovy/net/fabricmc/loom/AccessWidenerTest.groovy b/src/test/groovy/net/fabricmc/loom/AccessWidenerTest.groovy index 37e6cf9..de18a6f 100644 --- a/src/test/groovy/net/fabricmc/loom/AccessWidenerTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/AccessWidenerTest.groovy @@ -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 | _ - '6.8.3' | _ - '7.0-milestone-2' | _ + gradle | _ + '6.8.3' | _ + '7.0-rc-1' | _ } String expected() { diff --git a/src/test/groovy/net/fabricmc/loom/DecompileTest.groovy b/src/test/groovy/net/fabricmc/loom/DecompileTest.groovy index c0e5ea6..47ec05b 100644 --- a/src/test/groovy/net/fabricmc/loom/DecompileTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/DecompileTest.groovy @@ -48,7 +48,7 @@ class DecompileTest extends Specification implements ProjectTestTrait { decompiler | task | gradle 'fernflower' | "genSources" | "6.8.3" 'fernflower' | "genSources" | "4.9" - 'fernflower' | "genSources" | "7.0-milestone-2" + 'fernflower' | "genSources" | "7.0-rc-1" 'cfr' | "genSourcesWithExperimentalCfr" | "6.8.3" } } diff --git a/src/test/groovy/net/fabricmc/loom/KotlinTest.groovy b/src/test/groovy/net/fabricmc/loom/KotlinTest.groovy index 380dffd..d9a0784 100644 --- a/src/test/groovy/net/fabricmc/loom/KotlinTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/KotlinTest.groovy @@ -43,8 +43,8 @@ class KotlinTest extends Specification implements ProjectTestTrait { then: result.task(":build").outcome == SUCCESS where: - gradle | _ - '6.8.3' | _ - '7.0-milestone-2' | _ + gradle | _ + '6.8.3' | _ + '7.0-rc-1' | _ } } diff --git a/src/test/groovy/net/fabricmc/loom/MojangMappingsProjectTest.groovy b/src/test/groovy/net/fabricmc/loom/MojangMappingsProjectTest.groovy index dd8a980..1a2c303 100644 --- a/src/test/groovy/net/fabricmc/loom/MojangMappingsProjectTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/MojangMappingsProjectTest.groovy @@ -43,8 +43,8 @@ class MojangMappingsProjectTest extends Specification implements ProjectTestTrai then: result.task(":build").outcome == SUCCESS where: - gradle | _ - '6.8.3' | _ - '7.0-milestone-2' | _ + gradle | _ + '6.8.3' | _ + '7.0-rc-1' | _ } } diff --git a/src/test/groovy/net/fabricmc/loom/MultiProjectTest.groovy b/src/test/groovy/net/fabricmc/loom/MultiProjectTest.groovy index 2638135..15bb017 100644 --- a/src/test/groovy/net/fabricmc/loom/MultiProjectTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/MultiProjectTest.groovy @@ -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 | _ - '6.8.3' | _ - '7.0-milestone-2' | _ + gradle | _ + '6.8.3' | _ + '7.0-rc-1' | _ } } diff --git a/src/test/groovy/net/fabricmc/loom/ReproducibleBuildTest.groovy b/src/test/groovy/net/fabricmc/loom/ReproducibleBuildTest.groovy index 362899f..0d1ba1b 100644 --- a/src/test/groovy/net/fabricmc/loom/ReproducibleBuildTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/ReproducibleBuildTest.groovy @@ -48,9 +48,9 @@ class ReproducibleBuildTest extends Specification implements ProjectTestTrait { getOutputHash("fabric-example-mod-1.0.0.jar") == modHash getOutputHash("fabric-example-mod-1.0.0-sources.jar") in sourceHash // Done for different line endings. where: - gradle | modHash | sourceHash - '6.8.3' | "6132ffb4117adb7e258f663110552952" | ["be31766e6cafbe4ae3bca9e35ba63169", "7348b0bd87d36d7ec6f3bca9c2b66062"] - '7.0-milestone-2' | "6132ffb4117adb7e258f663110552952" | ["be31766e6cafbe4ae3bca9e35ba63169", "7348b0bd87d36d7ec6f3bca9c2b66062"] + gradle | modHash | sourceHash + '6.8.3' | "6132ffb4117adb7e258f663110552952" | ["be31766e6cafbe4ae3bca9e35ba63169", "7348b0bd87d36d7ec6f3bca9c2b66062"] + '7.0-rc-1' | "6132ffb4117adb7e258f663110552952" | ["be31766e6cafbe4ae3bca9e35ba63169", "7348b0bd87d36d7ec6f3bca9c2b66062"] } String getOutputHash(String name) { diff --git a/src/test/groovy/net/fabricmc/loom/RunConfigTest.groovy b/src/test/groovy/net/fabricmc/loom/RunConfigTest.groovy index e76369c..96619f5 100644 --- a/src/test/groovy/net/fabricmc/loom/RunConfigTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/RunConfigTest.groovy @@ -44,11 +44,11 @@ class RunConfigTest extends Specification implements ProjectTestTrait { then: result.task(":${task}").outcome == SUCCESS where: - task | _ - 'runClient' | _ - 'runServer' | _ - 'runTestmodClient' | _ - 'runTestmodServer' | _ - 'runAutoTestServer' | _ + task | _ + 'runClient' | _ + 'runServer' | _ + 'runTestmodClient' | _ + 'runTestmodServer' | _ + 'runAutoTestServer' | _ } } diff --git a/src/test/groovy/net/fabricmc/loom/SimpleProjectTest.groovy b/src/test/groovy/net/fabricmc/loom/SimpleProjectTest.groovy index 6954b88..f499356 100644 --- a/src/test/groovy/net/fabricmc/loom/SimpleProjectTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/SimpleProjectTest.groovy @@ -43,9 +43,9 @@ class SimpleProjectTest extends Specification implements ProjectTestTrait { then: result.task(":build").outcome == SUCCESS where: - gradle | _ - '6.8.3' | _ - '7.0-milestone-2' | _ + gradle | _ + '6.8.3' | _ + '7.0-rc-1' | _ } @Unroll