From 10ffbeb33104ceb0e2a43efc9bd9bebbb736b2ed Mon Sep 17 00:00:00 2001 From: emeroad Date: Mon, 3 Apr 2017 22:12:39 +0900 Subject: [PATCH] [#noissue] cleanup testcase - remove only() --- .../DriverConnectInterceptorTest.java | 4 ++-- .../rpc/handler/AgentEventHandlerTest.java | 4 ++-- .../rpc/handler/AgentLifeCycleHandlerTest.java | 2 +- .../common/util/DelegateEnumerationTest.java | 2 +- .../jboss/InvokeMethodInterceptorTest.java | 4 ++-- .../interceptor/BeanMethodInterceptorTest.java | 4 ++-- .../tomcat/InvokeMethodInterceptorTest.java | 4 ++-- .../context/ListenableAsyncStateTest.java | 2 +- .../context/SpanAsyncStateListenerTest.java | 16 +++++++++------- .../instrument/BytecodeDumpServiceTest.java | 8 ++++---- .../metadata/DefaultApiMetaDataServiceTest.java | 4 ++-- .../metadata/DefaultSqlMetaDataServiceTest.java | 5 +++-- .../DefaultStringMetaDataServiceTest.java | 4 ++-- 13 files changed, 33 insertions(+), 30 deletions(-) diff --git a/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/DriverConnectInterceptorTest.java b/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/DriverConnectInterceptorTest.java index 379977fb7..f739f6f29 100644 --- a/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/DriverConnectInterceptorTest.java +++ b/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/DriverConnectInterceptorTest.java @@ -55,8 +55,8 @@ public class DriverConnectInterceptorTest { driverConnectInterceptor.prepareAfterTrace(driver, va(invalidJdbcUrl), setAccessor, null); driverConnectInterceptor.doInAfterTrace(spanEventRecorder, driver, va(invalidJdbcUrl), getAccessor, null); - verify(setAccessor, only())._$PINPOINT$_setDatabaseInfo(UnKnownDatabaseInfo.INSTANCE); - verify(getAccessor, only())._$PINPOINT$_getDatabaseInfo(); + verify(setAccessor, times(1))._$PINPOINT$_setDatabaseInfo(UnKnownDatabaseInfo.INSTANCE); + verify(getAccessor, times(1))._$PINPOINT$_getDatabaseInfo(); } @Test diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/rpc/handler/AgentEventHandlerTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/rpc/handler/AgentEventHandlerTest.java index e7e7cd31e..3feb05054 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/rpc/handler/AgentEventHandlerTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/rpc/handler/AgentEventHandlerTest.java @@ -89,7 +89,7 @@ public class AgentEventHandlerTest { ArgumentCaptor argCaptor = ArgumentCaptor.forClass(AgentEventBo.class); // when this.agentEventHandler.handleEvent(this.pinpointServer, TEST_EVENT_TIMESTAMP, expectedEventType); - verify(this.agentEventDao, only()).insert(argCaptor.capture()); + verify(this.agentEventDao, times(1)).insert(argCaptor.capture()); // then AgentEventBo actualAgentEventBo = argCaptor.getValue(); assertEquals(TEST_AGENT_ID, actualAgentEventBo.getAgentId()); @@ -111,7 +111,7 @@ public class AgentEventHandlerTest { // when this.agentEventHandler.handleEvent(this.pinpointServer, TEST_EVENT_TIMESTAMP, expectedEventType, expectedMessageBody); - verify(this.agentEventDao, only()).insert(argCaptor.capture()); + verify(this.agentEventDao, times(1)).insert(argCaptor.capture()); // then AgentEventBo actualAgentEventBo = argCaptor.getValue(); assertEquals(TEST_AGENT_ID, actualAgentEventBo.getAgentId()); diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/rpc/handler/AgentLifeCycleHandlerTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/rpc/handler/AgentLifeCycleHandlerTest.java index 703ed45b3..508170f25 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/rpc/handler/AgentLifeCycleHandlerTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/rpc/handler/AgentLifeCycleHandlerTest.java @@ -170,7 +170,7 @@ public class AgentLifeCycleHandlerTest { // when this.agentLifeCycleHandler.handleLifeCycleEvent(this.pinpointServer, TEST_EVENT_TIMESTAMP, expectedLifeCycleState, expectedEventCounter); - verify(this.agentLifeCycleDao, only()).insert(argCaptor.capture()); + verify(this.agentLifeCycleDao, times(1)).insert(argCaptor.capture()); // then AgentLifeCycleBo actualAgentLifeCycleBo = argCaptor.getValue(); diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/DelegateEnumerationTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/DelegateEnumerationTest.java index 7cc76fd79..747951c53 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/DelegateEnumerationTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/DelegateEnumerationTest.java @@ -76,7 +76,7 @@ public class DelegateEnumerationTest { DelegateEnumeration delegateEnumeration = new DelegateEnumeration(enumeration); Assert.assertNull(delegateEnumeration.nextElement()); - verify(enumeration, only()).nextElement(); + verify(enumeration, times(1)).nextElement(); Assert.assertNull(delegateEnumeration.nextElement()); verify(enumeration, times(2)).nextElement(); diff --git a/plugins/jboss/src/test/java/com/navercorp/pinpoint/plugin/jboss/InvokeMethodInterceptorTest.java b/plugins/jboss/src/test/java/com/navercorp/pinpoint/plugin/jboss/InvokeMethodInterceptorTest.java index c53dcb816..cf91190ca 100644 --- a/plugins/jboss/src/test/java/com/navercorp/pinpoint/plugin/jboss/InvokeMethodInterceptorTest.java +++ b/plugins/jboss/src/test/java/com/navercorp/pinpoint/plugin/jboss/InvokeMethodInterceptorTest.java @@ -107,7 +107,7 @@ public class InvokeMethodInterceptorTest { interceptor.before("target", new Object[] { request, response }); interceptor.after("target", new Object[] { request, response }, new Object(), null); - verify(traceContext, only()).newTraceObject(); + verify(traceContext, times(1)).newTraceObject(); interceptor.before("target", new Object[] { request, response }); interceptor.after("target", new Object[] { request, response }, new Object(), null); @@ -175,7 +175,7 @@ public class InvokeMethodInterceptorTest { interceptor.before("target", new Object[] { request, response }); interceptor.after("target", new Object[] { request, response }, new Object(), null); - verify(traceContext, only()).continueTraceObject(any(TraceId.class)); + verify(traceContext, times(1)).continueTraceObject(any(TraceId.class)); interceptor.before("target", new Object[] { request, response }); interceptor.after("target", new Object[] { request, response }, new Object(), null); 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 8a9ef7b5c..de9baa43f 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 @@ -22,7 +22,7 @@ import com.navercorp.pinpoint.test.mock.MockTraceContext; import org.junit.Test; import org.mockito.Mockito; -import static org.mockito.Mockito.only; +import static org.mockito.Mockito.times; /** @@ -49,6 +49,6 @@ public class BeanMethodInterceptorTest { final Exception throwable = new Exception(); beanMethodInterceptor.after(thisObject, 10, null, null, throwable); - Mockito.verify(recorder, only()).recordException(true, throwable); + Mockito.verify(recorder, times(1)).recordException(true, throwable); } } \ No newline at end of file diff --git a/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/InvokeMethodInterceptorTest.java b/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/InvokeMethodInterceptorTest.java index 997118985..255df4e6f 100644 --- a/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/InvokeMethodInterceptorTest.java +++ b/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/InvokeMethodInterceptorTest.java @@ -91,7 +91,7 @@ public class InvokeMethodInterceptorTest { interceptor.before("target", new Object[]{request, response}); interceptor.after("target", new Object[]{request, response}, new Object(), null); - verify(traceContext, only()).newTraceObject(); + verify(traceContext, times(1)).newTraceObject(); interceptor.before("target", new Object[]{request, response}); interceptor.after("target", new Object[]{request, response}, new Object(), null); @@ -151,7 +151,7 @@ public class InvokeMethodInterceptorTest { interceptor.before("target", new Object[]{request, response}); interceptor.after("target", new Object[]{request, response}, new Object(), null); - verify(traceContext, only()).continueTraceObject(any(TraceId.class)); + verify(traceContext, times(1)).continueTraceObject(any(TraceId.class)); interceptor.before("target", new Object[]{request, response}); interceptor.after("target", new Object[]{request, response}, new Object(), null); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ListenableAsyncStateTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ListenableAsyncStateTest.java index 78882e2ef..301e6c10b 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ListenableAsyncStateTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ListenableAsyncStateTest.java @@ -34,7 +34,7 @@ public class ListenableAsyncStateTest { listenableAsyncState.await(); listenableAsyncState.finish(); - verify(mock, only()).finish(); + verify(mock, times(1)).finish(); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanAsyncStateListenerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanAsyncStateListenerTest.java index 797738fe1..3b9791564 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanAsyncStateListenerTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanAsyncStateListenerTest.java @@ -20,7 +20,9 @@ import com.navercorp.pinpoint.profiler.context.id.ListenableAsyncState; import com.navercorp.pinpoint.profiler.context.storage.Storage; import org.junit.Test; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * @author Woonduk Kang(emeroad) @@ -36,13 +38,13 @@ public class SpanAsyncStateListenerTest { ListenableAsyncState.AsyncStateListener listener = new SpanAsyncStateListener(span, storage); listener.finish(); - verify(span, only()).isTimeRecording(); - verify(storage, only()).store(span); + verify(span, times(1)).isTimeRecording(); + verify(storage, times(1)).store(span); // listener.finish(); - verify(span, only()).isTimeRecording(); - verify(storage, only()).store(span); + verify(span, times(1)).isTimeRecording(); + verify(storage, times(1)).store(span); } @Test @@ -53,8 +55,8 @@ public class SpanAsyncStateListenerTest { ListenableAsyncState.AsyncStateListener listener = new SpanAsyncStateListener(span, storage); listener.finish(); listener.finish(); - verify(span, only()).isTimeRecording(); - verify(storage, only()).store(span); + verify(span, times(1)).isTimeRecording(); + verify(storage, times(1)).store(span); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/BytecodeDumpServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/BytecodeDumpServiceTest.java index 4b0266e60..f43b402e2 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/BytecodeDumpServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/BytecodeDumpServiceTest.java @@ -14,7 +14,7 @@ import org.mockito.runners.MockitoJUnitRunner; import java.util.Collections; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.only; +import static org.mockito.Mockito.times; /** * @author Woonduk Kang(emeroad) @@ -42,9 +42,9 @@ public class BytecodeDumpServiceTest { bytecodeDumpService.dumpBytecode("testDump", classInternalName, classFile, classLoader); - Mockito.verify(this.disassembler, only()).dumpBytecode(classFile); - Mockito.verify(this.disassembler, only()).dumpVerify(classFile, classLoader); - Mockito.verify(this.disassembler, only()).dumpASM(classFile); + Mockito.verify(this.disassembler, times(1)).dumpBytecode(classFile); + Mockito.verify(this.disassembler, times(1)).dumpVerify(classFile, classLoader); + Mockito.verify(this.disassembler, times(1)).dumpASM(classFile); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultApiMetaDataServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultApiMetaDataServiceTest.java index abc40c654..1cf5f81dd 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultApiMetaDataServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultApiMetaDataServiceTest.java @@ -41,11 +41,11 @@ public class DefaultApiMetaDataServiceTest { int first = apiMetaDataService.cacheApi(methodDescriptor); Assert.assertNotEquals("not exist", first, 0); - verify(dataSender, only()).request(any(TBase.class)); + verify(dataSender, times(1)).request(any(TBase.class)); int second = apiMetaDataService.cacheApi(methodDescriptor); Assert.assertEquals("check cache", first, second); - verify(dataSender, only()).request(any(TBase.class)); + verify(dataSender, times(1)).request(any(TBase.class)); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultSqlMetaDataServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultSqlMetaDataServiceTest.java index ee54e9e77..3e2afc600 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultSqlMetaDataServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultSqlMetaDataServiceTest.java @@ -25,6 +25,7 @@ import org.junit.Test; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.only; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; /** @@ -43,10 +44,10 @@ public class DefaultSqlMetaDataServiceTest { boolean newValue = sqlMetaDataService.cacheSql(parsingResult); Assert.assertTrue(newValue); - verify(dataSender, only()).request(any(TBase.class)); + verify(dataSender, times(1)).request(any(TBase.class)); boolean notNewValue = sqlMetaDataService.cacheSql(parsingResult); Assert.assertFalse(notNewValue); - verify(dataSender, only()).request(any(TBase.class)); + verify(dataSender, times(1)).request(any(TBase.class)); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultStringMetaDataServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultStringMetaDataServiceTest.java index 928023b23..8af3dea67 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultStringMetaDataServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultStringMetaDataServiceTest.java @@ -39,11 +39,11 @@ public class DefaultStringMetaDataServiceTest { int first = stringMetaDataService.cacheString(str); Assert.assertNotEquals("not exist", first, 0); - verify(dataSender, only()).request(any(TBase.class)); + verify(dataSender, times(1)).request(any(TBase.class)); int second = stringMetaDataService.cacheString(str); Assert.assertEquals("check cache", first, second); - verify(dataSender, only()).request(any(TBase.class)); + verify(dataSender, times(1)).request(any(TBase.class)); } } \ No newline at end of file