diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefineTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefineTest.java index dcd01b180..e956292d5 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefineTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefineTest.java @@ -23,17 +23,17 @@ import static org.hamcrest.MatcherAssert.assertThat; @RunWith(PowerMockRunner.class) public class AbstractClassEnhancePluginDefineTest { - static final String WEAVE_CLASS = "com.a.eye.skywalking.api.plugin.MockTargetObject"; + static final String WEAVE_CLASS = "com.a.eye.skywalking.api.plugin.TargetObject"; static final String INTERCEPTOR_CLASS = "com.a.eye.skywalking.api.plugin.MockPluginInterceptor"; - static final String WEAVE_INSTANCE_METHOD_NAME = "targetInstanceMethod"; - static final String WEAVE_INSTANCE_WITH_EXCEPTION_METHOD_NAME = "targetInstanceMethodWithException"; - static final String WEAVE_STATIC_METHOD_NAME = "targetStaticMethod"; + static final String WEAVE_INSTANCE_METHOD_NAME = "instanceMethod"; + static final String WEAVE_INSTANCE_WITH_EXCEPTION_METHOD_NAME = "instanceMethodWithException"; + static final String WEAVE_STATIC_METHOD_NAME = "staticMethod"; private ClassLoader classLoader; @Before public void setUp() throws Exception { classLoader = new ByteArrayClassLoader.ChildFirst(getClass().getClassLoader(), - ClassFileExtraction.of(MockTargetObject.class), + ClassFileExtraction.of(TargetObject.class), null, ByteArrayClassLoader.PersistenceHandler.MANIFEST, PackageDefinitionStrategy.NoOp.INSTANCE); @@ -45,11 +45,11 @@ public class AbstractClassEnhancePluginDefineTest { ClassFileTransformer classFileTransformer = new AgentBuilder.Default() .with(AgentBuilder.PoolStrategy.Default.FAST) .ignore(none()) - .type(ElementMatchers.is(MockTargetObject.class), ElementMatchers.is(classLoader)).transform(new MockTargetObjectTransformer()) + .type(ElementMatchers.is(TargetObject.class), ElementMatchers.is(classLoader)).transform(new MockTargetObjectTransformer()) .installOnByteBuddyAgent(); try { - Class type = classLoader.loadClass(MockTargetObject.class.getName()); + Class type = classLoader.loadClass(TargetObject.class.getName()); assertThat(type.getDeclaredMethod(WEAVE_INSTANCE_METHOD_NAME).invoke(type.getDeclaredConstructor(String.class).newInstance("a")) , CoreMatchers.is(WEAVE_INSTANCE_METHOD_NAME + "a")); } finally { @@ -64,11 +64,11 @@ public class AbstractClassEnhancePluginDefineTest { ClassFileTransformer classFileTransformer = new AgentBuilder.Default() .with(AgentBuilder.PoolStrategy.Default.FAST) .ignore(none()) - .type(ElementMatchers.is(MockTargetObject.class), ElementMatchers.is(classLoader)).transform(new MockTargetObjectTransformer()) + .type(ElementMatchers.is(TargetObject.class), ElementMatchers.is(classLoader)).transform(new MockTargetObjectTransformer()) .installOnByteBuddyAgent(); try { - Class type = classLoader.loadClass(MockTargetObject.class.getName()); + Class type = classLoader.loadClass(TargetObject.class.getName()); type.getDeclaredMethod(WEAVE_INSTANCE_WITH_EXCEPTION_METHOD_NAME).invoke(type.getDeclaredConstructor(String.class).newInstance("a")); } finally { ByteBuddyAgent.getInstrumentation().removeTransformer(classFileTransformer); @@ -81,11 +81,11 @@ public class AbstractClassEnhancePluginDefineTest { ClassFileTransformer classFileTransformer = new AgentBuilder.Default() .with(AgentBuilder.PoolStrategy.Default.FAST) .ignore(none()) - .type(ElementMatchers.is(MockTargetObject.class), ElementMatchers.is(classLoader)).transform(new MockTargetObjectTransformer()) + .type(ElementMatchers.is(TargetObject.class), ElementMatchers.is(classLoader)).transform(new MockTargetObjectTransformer()) .installOnByteBuddyAgent(); try { - Class type = classLoader.loadClass(MockTargetObject.class.getName()); + Class type = classLoader.loadClass(TargetObject.class.getName()); assertThat(type.getDeclaredMethod(WEAVE_STATIC_METHOD_NAME).invoke(type), CoreMatchers.is(WEAVE_STATIC_METHOD_NAME + "_STATIC")); } finally { ByteBuddyAgent.getInstrumentation().removeTransformer(classFileTransformer); diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockTargetObject.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockTargetObject.java deleted file mode 100644 index 6c9b548a3..000000000 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockTargetObject.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.a.eye.skywalking.api.plugin; - -public class MockTargetObject { - - private String value; - - public MockTargetObject(String value) { - this.value = value; - } - - public String targetInstanceMethod() { - return "targetInstanceMethod"; - } - - public String targetInstanceMethodWithException() { - throw new RuntimeException("test exception"); - } - - public static String targetStaticMethod() { - return "targetStaticMethod"; - } -} diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TargetObject.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TargetObject.java new file mode 100644 index 000000000..3857fb945 --- /dev/null +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TargetObject.java @@ -0,0 +1,22 @@ +package com.a.eye.skywalking.api.plugin; + +public class TargetObject { + + private String value; + + public TargetObject(String value) { + this.value = value; + } + + public String instanceMethod() { + return "instanceMethod"; + } + + public String instanceMethodWithException() { + throw new RuntimeException("test exception"); + } + + public static String staticMethod() { + return "staticMethod"; + } +}