Fix rewriting static methods when converting type to interface (#31)

Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
PaperMC · Dec 25, 2024 · a1eb6a3 · a1eb6a3
1 parent 73b7207
commit a1eb6a3
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/src/test/java/io/papermc/asm/rules/classes/ClassToInterfaceTest.java b/src/test/java/io/papermc/asm/rules/classes/ClassToInterfaceTest.java
@@ -8,7 +8,7 @@
 
 class ClassToInterfaceTest {
 
-    @TransformerTest(value = "data.classes.ClassToInterfaceUser", copyFromClassReader = false /*required until asm merges https://gitlab.ow2.org/asm/asm/-/merge_requests/403*/)
+    @TransformerTest("data.classes.ClassToInterfaceUser")
     void testWithNoReplacement(final TransformerCheck check) {
         final RewriteRule rule = new ClassToInterfaceRule(
             SomeAbstractClass.class.describeConstable().orElseThrow(),
@@ -18,7 +18,7 @@ void testWithNoReplacement(final TransformerCheck check) {
         check.run(rule);
     }
 
-    @TransformerTest(value = "data.classes.ClassToInterfaceRedirectUser", copyFromClassReader = false /*required until asm merges https://gitlab.ow2.org/asm/asm/-/merge_requests/403*/)
+    @TransformerTest("data.classes.ClassToInterfaceRedirectUser")
     void testWithReplacement(final TransformerCheck check) {
         final RewriteRule rule = new ClassToInterfaceRule(
             SomeAbstractClass.class.describeConstable().orElseThrow(),

diff --git a/src/test/java/io/papermc/asm/rules/classes/EnumToInterfaceTest.java b/src/test/java/io/papermc/asm/rules/classes/EnumToInterfaceTest.java
@@ -15,7 +15,7 @@ class EnumToInterfaceTest {
     private static final ClassDesc API_ENUM = desc(ApiEnum.class);
     private static final ClassDesc API_ENUM_IMPL = desc(ApiEnumImpl.class);
 
-    @TransformerTest(value = "data.classes.EnumToInterfaceUser", copyFromClassReader = false)
+    @TransformerTest("data.classes.EnumToInterfaceUser")
     void testEnumToInterface(final TransformerCheck check) {
         final RewriteRule rule = new EnumToInterfaceRule(Map.of(API_ENUM, API_ENUM_IMPL));
 

diff --git a/src/testData/resources/expected/data/classes/ClassToInterfaceRedirectUser.class b/src/testData/resources/expected/data/classes/ClassToInterfaceRedirectUser.class
diff --git a/src/testData/resources/expected/data/classes/ClassToInterfaceUser.class b/src/testData/resources/expected/data/classes/ClassToInterfaceUser.class
diff --git a/src/testData/resources/expected/data/classes/EnumToInterfaceUser.class b/src/testData/resources/expected/data/classes/EnumToInterfaceUser.class