From a9f34afe9dc18d253260123f5d740457c8044fb4 Mon Sep 17 00:00:00 2001 From: jaehong-kim Date: Mon, 29 Aug 2016 16:46:15 +0900 Subject: [PATCH 1/2] fix asm testcase. --- .../ASMMethodNodeAdapterAddInterceptorTest.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java index 9248de18c012..65cf93dd85a2 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java @@ -24,8 +24,9 @@ import com.navercorp.pinpoint.profiler.instrument.mock.BasicInterceptor; import com.navercorp.pinpoint.profiler.instrument.mock.ExceptionInterceptor; import com.navercorp.pinpoint.profiler.instrument.mock.StaticInterceptor; -import com.navercorp.pinpoint.profiler.interceptor.registry.DefaultInterceptorRegistryBinder; import com.navercorp.pinpoint.profiler.interceptor.registry.InterceptorRegistryBinder; +import com.navercorp.pinpoint.test.TestInterceptorRegistryBinder; +import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -36,19 +37,17 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; public class ASMMethodNodeAdapterAddInterceptorTest { - private final static InterceptorRegistryBinder interceptorRegistryBinder = new DefaultInterceptorRegistryBinder(); + private final static InterceptorRegistryBinder interceptorRegistryBinder = new TestInterceptorRegistryBinder(); private ASMClassNodeLoader.TestClassLoader classLoader; @BeforeClass @@ -56,6 +55,11 @@ public static void beforeClass() { interceptorRegistryBinder.bind(); } + @AfterClass + public static void afterClass() { + interceptorRegistryBinder.unbind(); + } + @Before public void before() { this.classLoader = ASMClassNodeLoader.getClassLoader(); From dd10e11e8a074b33801485a90d52a83d4132cb07 Mon Sep 17 00:00:00 2001 From: jaehong-kim Date: Mon, 29 Aug 2016 17:03:01 +0900 Subject: [PATCH 2/2] change options of ASM testcase. --- .../instrument/ASMMethodNodeAdapterAddInterceptorTest.java | 2 +- .../profiler/instrument/ASMMethodNodeAdapterRenameTest.java | 2 +- .../pinpoint/profiler/instrument/ASMMethodNodeTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java index 65cf93dd85a2..ea99d290b87a 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java @@ -475,7 +475,7 @@ private void invokeMethod(final Class clazz, final String methodName, final Clas private Class addInterceptor(final int interceptorId, final String targetClassName, final Class interceptorClass) { final InterceptorDefinition interceptorDefinition = new InterceptorDefinitionFactory().createInterceptorDefinition(interceptorClass); try { - classLoader.setTrace(true); + classLoader.setTrace(false); classLoader.setVerify(false); classLoader.setTargetClassName(targetClassName); classLoader.setCallbackHandler(new ASMClassNodeLoader.CallbackHandler() { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRenameTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRenameTest.java index 6b5303292e9a..095e7d1b8268 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRenameTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRenameTest.java @@ -37,7 +37,7 @@ public void before() { @Test public void rename() throws Exception { final String targetClassName = "com.navercorp.pinpoint.profiler.instrument.mock.NormalClass"; - classLoader.setTrace(true); + classLoader.setTrace(false); classLoader.setTargetClassName(targetClassName); classLoader.setCallbackHandler(new ASMClassNodeLoader.CallbackHandler() { @Override diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeTest.java index 1c98548fd240..aeb059865217 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeTest.java @@ -95,8 +95,8 @@ public void addInterceptor() throws Exception { ASMClassNodeLoader.TestClassLoader classLoader = ASMClassNodeLoader.getClassLoader(); - classLoader.setTrace(true); - classLoader.setVerify(true); + classLoader.setTrace(false); + classLoader.setVerify(false); classLoader.setTargetClassName(targetClassName); classLoader.setCallbackHandler(new ASMClassNodeLoader.CallbackHandler() { @Override