From 7600472a39b8984cb3de398727b9bb606894015f Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Thu, 20 Jan 2022 00:06:21 +0200
Subject: [PATCH] Fix unit tests and remove one unnecessary modification to
 upstream

---
 .../providers/minecraft/MergedMinecraftProvider.java      | 2 +-
 .../loom/test/unit/IdeaClasspathModificationsTest.groovy  | 3 +++
 .../layeredmappings/LayeredMappingSpecBuilderTest.groovy  | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MergedMinecraftProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MergedMinecraftProvider.java
index 748ce1d7..4d338902 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MergedMinecraftProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MergedMinecraftProvider.java
@@ -37,7 +37,7 @@ import net.fabricmc.loom.util.HashedDownloadUtil;
 import net.fabricmc.stitch.merge.JarMerger;
 
 public class MergedMinecraftProvider extends MinecraftProvider {
-	protected Path minecraftMergedJar;
+	private Path minecraftMergedJar;
 
 	public MergedMinecraftProvider(Project project) {
 		super(project);
diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/IdeaClasspathModificationsTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/IdeaClasspathModificationsTest.groovy
index 31677552..e782f42a 100644
--- a/src/test/groovy/net/fabricmc/loom/test/unit/IdeaClasspathModificationsTest.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/unit/IdeaClasspathModificationsTest.groovy
@@ -65,6 +65,7 @@ class IdeaClasspathModificationsTest extends Specification {
         dummyConfig = dummyConfig.replace("%RUN_DIRECTORY%", ".run")
         dummyConfig = dummyConfig.replace("%PROGRAM_ARGS%", RunConfig.joinArguments([]).replaceAll("\"", "&quot;"))
         dummyConfig = dummyConfig.replace("%VM_ARGS%", RunConfig.joinArguments([]).replaceAll("\"", "&quot;"))
+        dummyConfig = dummyConfig.replace("%ENVS%", "") // Architectury: we have an extra variable that needs to be replaced here
 
         return dummyConfig
     }
@@ -73,6 +74,7 @@ class IdeaClasspathModificationsTest extends Specification {
     private static final String EXPECTED = '''
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" factoryName="Application" name="Minecraft Client" type="Application">
+    
     <option name="MAIN_CLASS_NAME" value="net.minecraft.client.Main"/>
     <module name="main.test"/>
     <option name="PROGRAM_PARAMETERS" value=""/>
@@ -89,6 +91,7 @@ class IdeaClasspathModificationsTest extends Specification {
     private static final String EXPECTED2 = '''
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" factoryName="Application" name="Minecraft Client" type="Application">
+    
     <option name="MAIN_CLASS_NAME" value="net.minecraft.client.Main"/>
     <module name="main.test"/>
     <option name="PROGRAM_PARAMETERS" value=""/>
diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
index 9078342d..fe7c1a07 100644
--- a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
@@ -41,7 +41,7 @@ class LayeredMappingSpecBuilderTest extends LayeredMappingsSpecification {
             def layers = spec.layers()
         then:
             layers.size() == 2
-            spec.version == "layered+hash.2198"
+            spec.version == "layered+hash.40545"
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
     }
@@ -56,7 +56,7 @@ class LayeredMappingSpecBuilderTest extends LayeredMappingsSpecification {
             def layers = spec.layers()
             def parchment = layers[2] as ParchmentMappingsSpec
         then:
-            spec.version == "layered+hash.863752751"
+            spec.version == "layered+hash.864941508"
             layers.size() == 3
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
@@ -76,7 +76,7 @@ class LayeredMappingSpecBuilderTest extends LayeredMappingsSpecification {
             def layers = spec.layers()
             def parchment = layers[2] as ParchmentMappingsSpec
         then:
-            spec.version == "layered+hash.863752757"
+            spec.version == "layered+hash.864941514"
             layers.size() == 3
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
@@ -96,7 +96,7 @@ class LayeredMappingSpecBuilderTest extends LayeredMappingsSpecification {
             def layers = spec.layers()
             def parchment = layers[2] as ParchmentMappingsSpec
         then:
-            spec.version == "layered+hash.1144427140"
+            spec.version == "layered+hash.1143238383"
             layers.size() == 3
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec