Adjust frames considering static methods.

raphw · Apr 3, 2016 · 8affca4 · 8affca4
1 parent 9cfea16
commit 8affca4
Showing 1 changed file with 35 additions and 6 deletions.
diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/asm/AdviceTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/asm/AdviceTest.java
@@ -505,7 +505,18 @@ public void testFrameAdvice() throws Exception {
                 .make()
                 .load(null, ClassLoadingStrategy.Default.WRAPPER)
                 .getLoaded();
-        assertThat(type.getDeclaredMethod(FOO).invoke(type.newInstance()), is((Object) FOO));
+        assertThat(type.getDeclaredMethod(FOO, String.class).invoke(type.newInstance(), FOO), is((Object) FOO));
+    }
+
+    @Test
+    public void testFrameAdviceStatic() throws Exception {
+        Class<?> type = new ByteBuddy()
+                .redefine(FrameSample.class)
+                .visit(Advice.to(FrameAdvice.class).on(named(FOO)))
+                .make()
+                .load(null, ClassLoadingStrategy.Default.WRAPPER)
+                .getLoaded();
+        assertThat(type.getDeclaredMethod(BAR, String.class).invoke(null, FOO), is((Object) FOO));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -1292,9 +1303,8 @@ private static void exit(@Advice.Origin("\\#\\#\\\\#m") String origin) throws Ex
 
     public static class FrameSample {
 
-        public String foo() {
+        public String foo(String value) {
-            int value = 0;
+            switch (0) {
-            switch (value) {
                 case 0: {
                     long a = 1L, b = 1L, c = 1L, d = 1L, e = 1L, f = 1L;
                 }
@@ -1308,15 +1318,33 @@ public String foo() {
                 long a = 1L;
             }
             long a = 1L;
-            return FOO;
+            return value;
+        }
+
+        public static String bar(String value) {
+            switch (0) {
+                case 0: {
+                    long a = 1L, b = 1L, c = 1L, d = 1L, e = 1L, f = 1L;
+                }
+                default: {
+                    long a = 1L;
+                }
+            }
+            try {
+                long a = 1L;
+            } catch (Exception ignored) {
+                long a = 1L;
+            }
+            long a = 1L;
+            return value;
         }
     }
 
     public static class FrameAdvice {
 
         @Advice.OnMethodEnter
         @Advice.OnMethodExit
-        private static void enter(@Advice.Ignored int value) {
+        private static String enter(@Advice.Ignored int value, @Advice.Argument(0) String pseudo) {
             switch (value) {
                 case 0: {
                     long a = 1L, b = 1L, c = 1L, d = 1L, e = 1L, f = 1L;
@@ -1331,6 +1359,7 @@ private static void enter(@Advice.Ignored int value) {
                 long a = 1L;
             }
             long a = 1L;
+            return pseudo;
         }
     }