diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-07-20 17:44:04 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-07-20 17:44:04 +0800 |
| commit | 07bc4eab7b23fee28d0036890337c5af97cc3d2f (patch) | |
| tree | 3d3fe446554db0cb665c7d1ced616f7c645360f6 /src/test/groovy/net | |
| parent | 3a354be4d757dcb93c8bf96bd74d50888a3f6e2f (diff) | |
| parent | 2259a4efc8f4dad35880b41cb8be59bc5b857f9b (diff) | |
| download | architectury-loom-07bc4eab7b23fee28d0036890337c5af97cc3d2f.tar.gz architectury-loom-07bc4eab7b23fee28d0036890337c5af97cc3d2f.tar.bz2 architectury-loom-07bc4eab7b23fee28d0036890337c5af97cc3d2f.zip | |
Merge branch 'upstream-0.9' into dev/0.9
# Conflicts:
# src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
# src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
# src/main/java/net/fabricmc/loom/task/RemapJarTask.java
Diffstat (limited to 'src/test/groovy/net')
3 files changed, 10 insertions, 4 deletions
diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/ReproducibleBuildTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/ReproducibleBuildTest.groovy index 60bb92db..874901dc 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/ReproducibleBuildTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/ReproducibleBuildTest.groovy @@ -30,7 +30,9 @@ import com.google.common.io.Files import net.fabricmc.loom.test.util.ProjectTestTrait import spock.lang.Specification import spock.lang.Unroll +import spock.util.environment.RestoreSystemProperties +import static java.lang.System.setProperty import static org.gradle.testkit.runner.TaskOutcome.SUCCESS class ReproducibleBuildTest extends Specification implements ProjectTestTrait { @@ -39,9 +41,11 @@ class ReproducibleBuildTest extends Specification implements ProjectTestTrait { "reproducible" } + @RestoreSystemProperties @Unroll def "build (gradle #gradle)"() { when: + setProperty('loom.test.reproducible', 'true') def result = create("build", gradle) then: result.task(":build").outcome == SUCCESS @@ -49,8 +53,8 @@ class ReproducibleBuildTest extends Specification implements ProjectTestTrait { getOutputHash("fabric-example-mod-1.0.0-sources.jar") in sourceHash // Done for different line endings. where: gradle | modHash | sourceHash - DEFAULT_GRADLE | "0f954aa060fd8fc005e834c7cd271303" | ["be31766e6cafbe4ae3bca9e35ba63169", "7348b0bd87d36d7ec6f3bca9c2b66062"] - PRE_RELEASE_GRADLE | "0f954aa060fd8fc005e834c7cd271303" | ["be31766e6cafbe4ae3bca9e35ba63169", "7348b0bd87d36d7ec6f3bca9c2b66062"] + DEFAULT_GRADLE | "ed3306ef60f434c55048cba8de5dab95" | ["be31766e6cafbe4ae3bca9e35ba63169", "7348b0bd87d36d7ec6f3bca9c2b66062"] + PRE_RELEASE_GRADLE | "ed3306ef60f434c55048cba8de5dab95" | ["be31766e6cafbe4ae3bca9e35ba63169", "7348b0bd87d36d7ec6f3bca9c2b66062"] } String getOutputHash(String name) { diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/SimpleProjectTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/SimpleProjectTest.groovy index 58276cdb..b5af2082 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/SimpleProjectTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/SimpleProjectTest.groovy @@ -24,13 +24,14 @@ package net.fabricmc.loom.test.integration +import net.fabricmc.loom.test.util.ArchiveAssertionsTrait import net.fabricmc.loom.test.util.ProjectTestTrait import spock.lang.Specification import spock.lang.Unroll import static org.gradle.testkit.runner.TaskOutcome.SUCCESS -class SimpleProjectTest extends Specification implements ProjectTestTrait { +class SimpleProjectTest extends Specification implements ProjectTestTrait, ArchiveAssertionsTrait { @Override String name() { "simple" @@ -42,6 +43,7 @@ class SimpleProjectTest extends Specification implements ProjectTestTrait { def result = create("build", gradle) then: result.task(":build").outcome == SUCCESS + getArchiveEntry("fabric-example-mod-1.0.0.jar", "META-INF/MANIFEST.MF").contains("Fabric-Loom-Version: 0.0.0+unknown") where: gradle | _ DEFAULT_GRADLE | _ diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingsTestConstants.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingsTestConstants.groovy index 7441f057..74158b12 100644 --- a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingsTestConstants.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingsTestConstants.groovy @@ -43,5 +43,5 @@ interface LayeredMappingsTestConstants { public static final MinecraftVersionMeta VERSION_META_1_16_5 = new MinecraftVersionMeta(null, null, null, 0, DOWNLOADS_1_16_5, null, null, null, null, 0, null, null, null) public static final String PARCHMENT_NOTATION = "org.parchmentmc.data:parchment-1.16.5:20210608-SNAPSHOT@zip" - public static final String PARCHMENT_URL = "https://ldtteam.jfrog.io/artifactory/parchmentmc-snapshots/org/parchmentmc/data/parchment-1.16.5/20210608-SNAPSHOT/parchment-1.16.5-20210608-SNAPSHOT.zip" + public static final String PARCHMENT_URL = "https://maven.parchmentmc.net/org/parchmentmc/data/parchment-1.16.5/20210608-SNAPSHOT/parchment-1.16.5-20210608-SNAPSHOT.zip" }
\ No newline at end of file |