Add some failing tests for potential issues I noticed

unimined · Jan 5, 2024 · a6ec3fb · a6ec3fb
1 parent a1fbbbc
commit a6ec3fb
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 0 deletions.
diff --git a/src/test/kotlin/com/replaymod/gradle/remap/mapper/mixin/TestMixinInjections.kt b/src/test/kotlin/com/replaymod/gradle/remap/mapper/mixin/TestMixinInjections.kt
@@ -290,4 +290,21 @@ class TestMixinInjections {
             }
         """.trimIndent()
     }
+
+    @Test
+    fun `remaps synthetic bridges that change the return type inside inner classes inside inner classes`() {
+        TestData.remap("""
+            @org.spongepowered.asm.mixin.Mixin(a.pkg.A.InnerB.InnerC.class)
+            class MixinA {
+                @org.spongepowered.asm.mixin.injection.Inject(method = "getA()La/pkg/A${'$'}InnerB${'$'}InnerC")
+                private void test() {}
+            }
+        """.trimIndent()) shouldBe """
+            @org.spongepowered.asm.mixin.Mixin(b.pkg.B.InnerB.InnerC.class)
+            class MixinA {
+                @org.spongepowered.asm.mixin.injection.Inject(method = "getB()Lb/pkg/B${'$'}InnerB${'$'}InnerC")
+                private void test() {}
+            }
+        """.trimIndent()
+    }
 }
diff --git a/src/test/kotlin/com/replaymod/gradle/remap/misc/TestMiscJavaCode.kt b/src/test/kotlin/com/replaymod/gradle/remap/misc/TestMiscJavaCode.kt
@@ -23,4 +23,23 @@ class TestMiscJavaCode {
             }
         """.trimIndent()
     }
+
+    @Test
+    fun `remaps methods that are called on the return value of another method when using synthetic bridges that change the return type`() {
+        TestData.remap("""
+            public class Test {
+                public static void test() {
+                    final a.pkg.A value = null;
+                    value.aGeneratedSynthetic().aGeneratedSynthetic().aGeneratedSynthetic();
+                }
+            }
+        """.trimIndent()) shouldBe """
+            public class Test {
+                public static void test() {
+                    final b.pkg.B value = null;
+                    value.bGeneratedSynthetic().bGeneratedSynthetic().bGeneratedSynthetic();
+                }
+            }
+        """.trimIndent()
+    }
 }
diff --git a/src/testA/java/a/pkg/A.java b/src/testA/java/a/pkg/A.java
@@ -143,4 +143,17 @@ public class InnerA {
     }
 
     public class GenericA<T> {}
+
+    public static class InnerC {
+        public InnerC getA() {
+            return this;
+        }
+
+        public static class InnerD extends InnerC {
+            @Override
+            public InnerD getA() {
+                return this;
+            }
+        }
+    }
 }
diff --git a/src/testB/java/b/pkg/B.java b/src/testB/java/b/pkg/B.java
@@ -136,4 +136,17 @@ public class InnerB {
     }
 
     public class GenericB<T> {}
+
+    public static class InnerC {
+        public InnerC getB() {
+            return this;
+        }
+
+        public static class InnerD extends InnerC {
+            @Override
+            public InnerD getB() {
+                return this;
+            }
+        }
+    }
 }