imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 05:27:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix unit tests and remove one unnecessary modification to upstream

Browse Source
This commit is contained in:
Juuz
2022-01-20 00:06:21 +02:00
parent 5216e6f712
commit 7600472a39
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MergedMinecraftProvider.java
View File

@@ -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);

3
src/test/groovy/net/fabricmc/loom/test/unit/IdeaClasspathModificationsTest.groovy
View File

@@ -65,6 +65,7 @@ class IdeaClasspathModificationsTest extends Specification {
dummyConfig = dummyConfig.replace("%RUN_DIRECTORY%", ".run")
dummyConfig = dummyConfig.replace("%PROGRAM_ARGS%", RunConfig.joinArguments([]).replaceAll("\"", """))
dummyConfig = dummyConfig.replace("%VM_ARGS%", RunConfig.joinArguments([]).replaceAll("\"", """))
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=""/>

8
src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
View File

@@ -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