Fix MojangMappingsSpec having the same hash version for each mc version.

I dont think this would be a real cause for concern as the jar would have had the mc version in it anyway.

2 files changed, 32 insertions, 6 deletions

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 53a5b3e2..f8080695 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
@@ -24,6 +24,7 @@
 
 package net.fabricmc.loom.test.unit.layeredmappings
 
+import net.fabricmc.loom.configuration.providers.MinecraftProvider
 import net.fabricmc.loom.configuration.providers.mappings.LayeredMappingSpec
 import net.fabricmc.loom.configuration.providers.mappings.LayeredMappingSpecBuilder
 import net.fabricmc.loom.configuration.providers.mappings.intermediary.IntermediaryMappingsSpec
@@ -34,20 +35,41 @@ import org.gradle.util.ConfigureUtil
 import spock.lang.Specification
 
 class LayeredMappingSpecBuilderTest extends Specification {
+    MinecraftProvider mockMinecraftProvider = Mock(MinecraftProvider)
+
     def "simple mojmap" () {
+        setup:
+            mockMinecraftProvider.minecraftVersion() >> "1.17"
+        when:
+            def spec = layered() {
+                officialMojangMappings()
+            }
+            def layers = spec.layers()
+        then:
+            spec.version == "layered+hash.1506500"
+            layers.size() == 2
+            layers[0].class == IntermediaryMappingsSpec
+            layers[1].class == MojangMappingsSpec
+    }
+
+    def "simple mojmap alternative version" () {
+        setup:
+            mockMinecraftProvider.minecraftVersion() >> "1.17.1"
         when:
             def spec = layered() {
                 officialMojangMappings()
             }
             def layers = spec.layers()
         then:
-            spec.version == "layered+hash.961"
+            spec.version == "layered+hash.1446825415"
             layers.size() == 2
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
     }
 
     def "simple mojmap with parchment" () {
+        setup:
+            mockMinecraftProvider.minecraftVersion() >> "1.17"
         when:
             def spec = layered() {
                 officialMojangMappings()
@@ -56,7 +78,7 @@ class LayeredMappingSpecBuilderTest extends Specification {
             def layers = spec.layers()
             def parchment = layers[2] as ParchmentMappingsSpec
         then:
-            spec.version == "layered+hash.863714404"
+            spec.version == "layered+hash.910386113"
             layers.size() == 3
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
@@ -66,6 +88,8 @@ class LayeredMappingSpecBuilderTest extends Specification {
     }
 
     def "simple mojmap with parchment keep prefix" () {
+        setup:
+            mockMinecraftProvider.minecraftVersion() >> "1.17"
         when:
             def spec = layered() {
                 officialMojangMappings()
@@ -76,7 +100,7 @@ class LayeredMappingSpecBuilderTest extends Specification {
             def layers = spec.layers()
             def parchment = layers[2] as ParchmentMappingsSpec
         then:
-            spec.version == "layered+hash.863714410"
+            spec.version == "layered+hash.910386119"
             layers.size() == 3
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
@@ -86,6 +110,8 @@ class LayeredMappingSpecBuilderTest extends Specification {
     }
 
     def "simple mojmap with parchment keep prefix alternate hash" () {
+        setup:
+            mockMinecraftProvider.minecraftVersion() >> "1.17"
         when:
             def spec = layered() {
                 officialMojangMappings()
@@ -96,7 +122,7 @@ class LayeredMappingSpecBuilderTest extends Specification {
             def layers = spec.layers()
             def parchment = layers[2] as ParchmentMappingsSpec
         then:
-            spec.version == "layered+hash.1144465487"
+            spec.version == "layered+hash.1097793778"
             layers.size() == 3
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
@@ -111,7 +137,7 @@ class LayeredMappingSpecBuilderTest extends Specification {
     }
 
     LayeredMappingSpec layeredAction(Action<LayeredMappingSpecBuilder> action) {
-        LayeredMappingSpecBuilder builder = new LayeredMappingSpecBuilder()
+        LayeredMappingSpecBuilder builder = new LayeredMappingSpecBuilder(mockMinecraftProvider)
         action.execute(builder)
         return builder.build()
     }
diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/MojangMappingLayerTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/MojangMappingLayerTest.groovy
index 87eca55c..c6ce8a41 100644
--- a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/MojangMappingLayerTest.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/MojangMappingLayerTest.groovy
@@ -35,7 +35,7 @@ class MojangMappingLayerTest extends LayeredMappingsSpecification {
         when:
             def mappings = getLayeredMappings(
                     new IntermediaryMappingsSpec(),
-                    new MojangMappingsSpec()
+                    new MojangMappingsSpec("1.17")
             )
             def tiny = getTiny(mappings)
         then: