Add tests to document the problems.

raphw · Oct 14, 2021 · 6dbc949 · 6dbc949
1 parent 2a2c3ec
commit 6dbc949
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/asm/Advice.java b/byte-buddy-dep/src/main/java/net/bytebuddy/asm/Advice.java
@@ -12936,7 +12936,7 @@ public Size apply(MethodVisitor methodVisitor, Context implementationContext) {
                 Label label = new Label();
                 Size size = dispatcher.apply(methodVisitor, offset, label).aggregate(stackManipulation.apply(methodVisitor, implementationContext));
                 methodVisitor.visitLabel(label);
-                //stackMapFrameHandler.injectCompletionFrame(methodVisitor); TODO: This needs to work
+                //stackMapFrameHandler.injectCompletionFrame(methodVisitor); fixme: This needs to work
                 return size;
             }
 

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/utility/visitor/FramePaddingMethodVisitor.java b/byte-buddy-dep/src/main/java/net/bytebuddy/utility/visitor/FramePaddingMethodVisitor.java
@@ -73,7 +73,7 @@ public void visitLabel(Label label) {
     @Override
     public void visitFrame(int type, int localVariableLength, Object[] localVariable, int stackSize, Object[] stack) {
         if (padding) {
-            if (type == Opcodes.F_SAME) { // TODO: test me
+            if (type == Opcodes.F_SAME) { // fixme: test me
                 return;
             }
             injected = true;

diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/asm/AdviceAssignReturnedTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/asm/AdviceAssignReturnedTest.java
@@ -3,7 +3,6 @@
 import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
-import net.bytebuddy.test.utility.DebuggingWrapper;
 import org.junit.Test;
 
 import java.lang.reflect.InvocationTargetException;
@@ -296,7 +295,6 @@ public void testAssignReturnedToFieldStaticFromStatic() throws Exception {
     public void testAssignReturnedNoHandler() throws Exception {
         Class<?> type = new ByteBuddy()
                 .redefine(Sample.class)
-                .visit(DebuggingWrapper.makeDefault())
                 .visit(Advice.withCustomMapping()
                         .with(new Advice.AssignReturned.Factory())
                         .to(ToNothing.class)
@@ -311,7 +309,6 @@ public void testAssignReturnedNoHandler() throws Exception {
     public void testAssignReturnedWithSkip() throws Exception {
         Class<?> type = new ByteBuddy()
                 .redefine(Sample.class)
-                .visit(DebuggingWrapper.makeDefault())
                 .visit(Advice.withCustomMapping()
                         .with(new Advice.AssignReturned.Factory())
                         .to(WithSkip.class)
@@ -326,7 +323,6 @@ public void testAssignReturnedWithSkip() throws Exception {
     public void testAssignReturnedWithRepeat() throws Exception {
         Class<?> type = new ByteBuddy()
                 .redefine(Sample.class)
-                .visit(DebuggingWrapper.makeDefault())
                 .visit(Advice.withCustomMapping()
                         .with(new Advice.AssignReturned.Factory())
                         .to(WithRepeat.class)
@@ -867,7 +863,7 @@ public static String exit(@Advice.Argument(0) String argument) {
     public static class WithSkip {
 
         @Advice.OnMethodEnter(skipOn = String.class)
-        @Advice.AssignReturned.ToReturned
+        @Advice.AssignReturned.ToArguments(@Advice.AssignReturned.ToArguments.ToArgument(0))
         public static String enter(@Advice.Argument(0) String argument) {
             if (!FOO.equals(argument)) {
                 throw new AssertionError();
@@ -879,7 +875,7 @@ public static String enter(@Advice.Argument(0) String argument) {
     public static class WithRepeat {
 
         @Advice.OnMethodExit(repeatOn = String.class)
-        @Advice.AssignReturned.ToReturned
+        @Advice.AssignReturned.ToArguments(@Advice.AssignReturned.ToArguments.ToArgument(0))
         public static String exit(@Advice.Argument(0) String argument) {
             if (!FOO.equals(argument)) {
                 throw new AssertionError();