Fix tests having ambiguous methods

unimined · Jan 4, 2024 · 736d229 · 736d229
1 parent 82551d1
commit 736d229
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/test/kotlin/com/replaymod/gradle/remap/mapper/mixin/TestMixinShadow.kt b/src/test/kotlin/com/replaymod/gradle/remap/mapper/mixin/TestMixinShadow.kt
@@ -83,18 +83,18 @@ class TestMixinShadow {
             @org.spongepowered.asm.mixin.Mixin(a.pkg.A.class)
             abstract class MixinA {
                 @org.spongepowered.asm.mixin.Shadow
-                private int aMethod(a.pkg.AInterface[] arguments);
+                private int aMethodWithAnArrayArgument(a.pkg.AInterface[] arguments);
                 private void test() {
-                    aMethod(new a.pkg.AInterface[1]);
+                    aMethodWithAnArrayArgument(new a.pkg.AInterface[1]);
                 }
             }
         """.trimIndent()) shouldBe """
             @org.spongepowered.asm.mixin.Mixin(b.pkg.B.class)
             abstract class MixinA {
                 @org.spongepowered.asm.mixin.Shadow
-                private int bMethod(b.pkg.BInterface[] arguments);
+                private int bMethodWithAnArrayArgument(b.pkg.BInterface[] arguments);
                 private void test() {
-                    bMethod(new b.pkg.BInterface[1]);
+                    bMethodWithAnArrayArgument(new b.pkg.BInterface[1]);
                 }
             }
         """.trimIndent()

diff --git a/src/test/resources/mappings.srg b/src/test/resources/mappings.srg
@@ -2,6 +2,7 @@ CL: a/pkg/A b/pkg/B
 FD: a/pkg/A/a b/pkg/B/b
 FD: a/pkg/A/aField b/pkg/B/bField
 MD: a/pkg/A/aMethod ()V b/pkg/B/bMethod ()V
+MD: a/pkg/A/aMethodWithAnArrayArgument ()V b/pkg/B/bMethodWithAnArrayArgument ()V
 MD: a/pkg/A/getA ()La/pkg/A; b/pkg/B/getB ()Lb/pkg/B;
 MD: a/pkg/A/getSyntheticA ()La/pkg/A; b/pkg/B/getSyntheticB ()Lb/pkg/B;
 MD: a/pkg/A/setSyntheticA (La/pkg/A;)V; b/pkg/B/setSyntheticB (Lb/pkg/B;)V;

diff --git a/src/testA/java/a/pkg/A.java b/src/testA/java/a/pkg/A.java
@@ -19,7 +19,7 @@ public void aMethod() {
         aInterfaceMethod();
     }
 
-    public int aMethod(a.pkg.AInterface[] arguments) {
+    public int aMethodWithAnArrayArgument(a.pkg.AInterface[] arguments) {
         return 0;
     }
 

diff --git a/src/testB/java/b/pkg/B.java b/src/testB/java/b/pkg/B.java
@@ -18,7 +18,7 @@ public void bMethod() {
         bInterfaceMethod();
     }
 
-    public int bMethod(b.pkg.BInterface[] arguments) {
+    public int bMethodWithAnArrayArgument(b.pkg.BInterface[] arguments) {
         return 0;
     }