[#noissue] Remove unused mock class

- Remove MockTraceContext
likeonechild · Jun 5, 2017 · 3012f4c · 3012f4c
1 parent 3bec16f
commit 3012f4c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 176 deletions.
diff --git a/...ava/com/navercorp/pinpoint/plugin/spring/beans/interceptor/BeanMethodInterceptorTest.java b/...ava/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