From ffc7953f282d133e35fa7c73faaef155c3a498e5 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Thu, 19 May 2022 15:12:27 +0300 Subject: [PATCH] Fix ForgeSimpleMixinApTest on Windows Thank you Windows for your beautiful CRLF line endings please keep them FOREVER!!! <3 <3 <3 --- .../test/integration/forge/ForgeSimpleMixinApTest.groovy | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/forge/ForgeSimpleMixinApTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/forge/ForgeSimpleMixinApTest.groovy index 4c285a8a..1d2906cd 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/forge/ForgeSimpleMixinApTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/forge/ForgeSimpleMixinApTest.groovy @@ -51,7 +51,7 @@ class ForgeSimpleMixinApTest extends Specification implements GradleProjectTestT // verify the refmap is correctly generated def refmap = gradle.getOutputZipEntry("fabric-example-mod-1.0.0.jar", "fabric-example-mod-refmap.json") - refmap == new File(gradle.projectDir, "expected_refmap.json").text + refmap == expected(gradle) // verify that the refmap is in the mixin json def mixinJsonString = gradle.getOutputZipEntry("fabric-example-mod-1.0.0.jar", "my_mixins.json") def mixinJson = new Gson().fromJson(mixinJsonString, JsonObject) @@ -64,4 +64,8 @@ class ForgeSimpleMixinApTest extends Specification implements GradleProjectTestT where: version << STANDARD_TEST_VERSIONS } + + private String expected(GradleProject gradle) { + new File(gradle.projectDir, "expected_refmap.json").text.replaceAll('\r', '') + } }