From 3012f4c2587d2fa44c17d4dd47b3f282390662ae Mon Sep 17 00:00:00 2001 From: emeroad Date: Mon, 5 Jun 2017 17:42:20 +0900 Subject: [PATCH] [#noissue] Remove unused mock class - Remove MockTraceContext --- .../BeanMethodInterceptorTest.java | 18 +- .../pinpoint/test/mock/MockTraceContext.java | 170 ------------------ 2 files changed, 12 insertions(+), 176 deletions(-) delete mode 100644 test/src/main/java/com/navercorp/pinpoint/test/mock/MockTraceContext.java diff --git a/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/BeanMethodInterceptorTest.java b/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/BeanMethodInterceptorTest.java index de9baa43faae..ab1684ecf7f8 100644 --- a/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/BeanMethodInterceptorTest.java +++ b/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/BeanMethodInterceptorTest.java @@ -18,11 +18,14 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; -import com.navercorp.pinpoint.test.mock.MockTraceContext; +import com.navercorp.pinpoint.bootstrap.context.TraceContext; +import com.navercorp.pinpoint.bootstrap.context.TraceId; import org.junit.Test; import org.mockito.Mockito; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; +import static org.mockito.Mockito.when; /** @@ -37,11 +40,14 @@ public void testBefore() throws Exception { @Test public void testAfter() throws Exception { - final MockTraceContext traceContext = new MockTraceContext(); - final Trace trace = Mockito.mock(Trace.class); - traceContext.setTrace(trace); - final SpanEventRecorder recorder = Mockito.mock(SpanEventRecorder.class); - Mockito.when(trace.currentSpanEventRecorder()).thenReturn(recorder); + final Trace trace = mock(Trace.class); + final TraceContext traceContext = mock(TraceContext.class); + when(traceContext.currentRawTraceObject()).thenReturn(trace); + when(traceContext.currentTraceObject()).thenReturn(trace); + when(traceContext.continueTraceObject(Mockito.any(TraceId.class))).thenReturn(trace); + + final SpanEventRecorder recorder = mock(SpanEventRecorder.class); + when(trace.currentSpanEventRecorder()).thenReturn(recorder); final BeanMethodInterceptor beanMethodInterceptor = new BeanMethodInterceptor(traceContext, true); diff --git a/test/src/main/java/com/navercorp/pinpoint/test/mock/MockTraceContext.java b/test/src/main/java/com/navercorp/pinpoint/test/mock/MockTraceContext.java deleted file mode 100644 index fe7c9c59da72..000000000000 --- a/test/src/main/java/com/navercorp/pinpoint/test/mock/MockTraceContext.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright 2014 NAVER Corp. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.navercorp.pinpoint.test.mock; - -import com.navercorp.pinpoint.bootstrap.config.DefaultProfilerConfig; -import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; -import com.navercorp.pinpoint.bootstrap.context.AsyncTraceId; -import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; -import com.navercorp.pinpoint.bootstrap.context.ParsingResult; -import com.navercorp.pinpoint.bootstrap.context.ServerMetaDataHolder; -import com.navercorp.pinpoint.bootstrap.context.Trace; -import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.context.TraceId; -import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcContext; - -/** - * @author emeroad - * @author hyungil.jeong - */ -public class MockTraceContext implements TraceContext { - - private Trace trace; - private final ProfilerConfig config = new DefaultProfilerConfig(); - - public void setTrace(Trace trace) { - this.trace = trace; - } - - @Override - public Trace currentTraceObject() { - if (trace == null) { - return null; - } - if (trace.canSampled()) { - return null; - } - return trace; - } - - @Override - public Trace currentRawTraceObject() { - return trace; - } - - @Override - public Trace continueTraceObject(TraceId traceID) { - return trace; - } - - @Override - public Trace newTraceObject() { - return trace; - } - - @Override - public String getAgentId() { - return null; - } - - @Override - public String getApplicationName() { - return null; - } - - @Override - public long getAgentStartTime() { - return 0; - } - - @Override - public short getServerTypeCode() { - return 0; - } - - @Override - public String getServerType() { - return null; - } - - @Override - public int cacheApi(MethodDescriptor methodDescriptor) { - return 0; - } - - @Override - public int cacheString(String value) { - return 0; - } - - @Override - public ParsingResult parseSql(String sql) { - return null; - } - - @Override - public boolean cacheSql(ParsingResult parsingResult) { - return false; - } - - @Override - public TraceId createTraceId(String transactionId, long parentSpanId, long spanId, short flags) { - return null; - } - - @Override - public Trace disableSampling() { - return null; - } - - @Override - public ProfilerConfig getProfilerConfig() { - return config; - } - - @Override - public ServerMetaDataHolder getServerMetaDataHolder() { - return null; - } - - @Override - public Trace newAsyncTraceObject() { - return null; - } - - @Override - public Trace continueAsyncTraceObject(TraceId traceId) { - return null; - } - - @Override - public Trace continueAsyncTraceObject(AsyncTraceId traceId, int asyncId, long startTime) { - return null; - } - - @Override - public int getAsyncId() { - return 0; - } - - @Override - public Trace continueTraceObject(Trace trace) { - return null; - } - - @Override - public Trace removeTraceObject() { - return null; - } - - @Override - public JdbcContext getJdbcContext() { -// return new - return null; - } - -} \ No newline at end of file