You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/05/07 13:56:31 UTC
[skywalking] branch master updated: Clean up unnecessary times(1)
for test verify (#2619)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 19d9c56 Clean up unnecessary times(1) for test verify (#2619)
19d9c56 is described below
commit 19d9c56f279f6485f94c77f7cd7590bc414bc205
Author: SataQiu <qi...@beyondcent.com>
AuthorDate: Tue May 7 21:56:23 2019 +0800
Clean up unnecessary times(1) for test verify (#2619)
* clean up unnecessary times(1) for test verify
* format code
* fix checkstyle
---
.../core/logging/core/SystemOutWriterTest.java | 3 +-
.../v4/HttpClientExecuteInterceptorTest.java | 9 +-
.../v4/HttpAsyncClientInterceptorTest.java | 2 +-
.../apm/plugin/jdbc/SWCallableStatementTest.java | 308 ++++++++++-----------
.../apm/plugin/jdbc/SWConnectionTest.java | 55 ++--
.../apm/plugin/jdbc/SWStatementTest.java | 59 ++--
.../apm/plugin/jdbc/SwPreparedStatementTest.java | 212 +++++++-------
...nstructorWithHostAndPortArgInterceptorTest.java | 3 +-
...uctorWithListHostAndPortArgInterceptorTest.java | 3 +-
...ConstructorWithShardInfoArgInterceptorTest.java | 3 +-
...disConstructorWithStringArgInterceptorTest.java | 5 +-
.../JedisConstructorWithUriArgInterceptorTest.java | 3 +-
.../plugin/motan/MotanConsumerInterceptorTest.java | 5 +-
.../v5/ConnectionImplCreateInterceptorTest.java | 3 +-
.../v8/ConnectionImplCreateInterceptorTest.java | 3 +-
.../CreateCallableStatementInterceptorTest.java | 2 +-
.../CreatePreparedStatementInterceptorTest.java | 2 +-
.../jdbc/mysql/CreateStatementInterceptorTest.java | 2 +-
.../nutz/http/sync/SenderInterceptorTest.java | 5 +-
.../rocketMQ/v3/MessageSendInterceptorTest.java | 7 +-
.../rocketMQ/v4/MessageSendInterceptorTest.java | 7 +-
.../ProducerOperationHandlerInterceptorTest.java | 3 +-
.../TransportClientHandlerInterceptorTest.java | 3 +-
.../ProducerOperationHandlerInterceptorTest.java | 3 +-
.../v1/TransportClientHandlerInterceptorTest.java | 3 +-
...ithInetSocketAddressListArgInterceptorTest.java | 3 +-
...edConstructorWithComplexArgInterceptorTest.java | 3 +-
...dConstructorWithHostPortArgInterceptorTest.java | 3 +-
...torWithInetSocketAddressArgInterceptorTest.java | 3 +-
...ithInetSocketAddressListArgInterceptorTest.java | 3 +-
30 files changed, 352 insertions(+), 376 deletions(-)
diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriterTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriterTest.java
index ab45c43..3c154f7 100644
--- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriterTest.java
+++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriterTest.java
@@ -27,7 +27,6 @@ import org.mockito.Mockito;
import java.io.PrintStream;
import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
/**
* Created by wusheng on 2017/2/28.
@@ -47,7 +46,7 @@ public class SystemOutWriterTest {
SystemOutWriter.INSTANCE.write("hello");
- Mockito.verify(mockStream, times(1)).println(anyString());
+ Mockito.verify(mockStream).println(anyString());
}
@AfterClass
diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java
index 89fbf30..ecfe4aa 100644
--- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java
@@ -54,7 +54,6 @@ import static junit.framework.TestCase.assertNotNull;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -128,7 +127,7 @@ public class HttpClientExecuteInterceptorTest {
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertHttpSpan(spans.get(0));
- verify(request, times(1)).setHeader(anyString(), anyString());
+ verify(request).setHeader(anyString(), anyString());
}
@Test
@@ -149,7 +148,7 @@ public class HttpClientExecuteInterceptorTest {
assertHttpSpan(spans.get(0));
assertThat(SpanHelper.getErrorOccurred(spans.get(0)), is(true));
- verify(request, times(1)).setHeader(anyString(), anyString());
+ verify(request).setHeader(anyString(), anyString());
}
@Test
@@ -167,7 +166,7 @@ public class HttpClientExecuteInterceptorTest {
assertHttpSpan(span);
assertThat(SpanHelper.getErrorOccurred(span), is(true));
assertHttpSpanErrorLog(SpanHelper.getLogs(span));
- verify(request, times(1)).setHeader(anyString(), anyString());
+ verify(request).setHeader(anyString(), anyString());
}
@@ -197,7 +196,7 @@ public class HttpClientExecuteInterceptorTest {
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertHttpSpan(spans.get(0));
- verify(request, times(1)).setHeader(anyString(), anyString());
+ verify(request).setHeader(anyString(), anyString());
}
private void assertHttpSpanErrorLog(List<LogDataEntity> logs) {
diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptorTest.java
index a046b16..e5ff8bc 100644
--- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptorTest.java
@@ -194,7 +194,7 @@ public class HttpAsyncClientInterceptorTest {
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(findNeedSegemnt());
assertHttpSpan(spans.get(0));
- verify(requestWrapper, times(1)).setHeader(anyString(), anyString());
+ verify(requestWrapper).setHeader(anyString(), anyString());
}
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWCallableStatementTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWCallableStatementTest.java
index 12fe631..7bcae2a 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWCallableStatementTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWCallableStatementTest.java
@@ -301,107 +301,107 @@ public class SWCallableStatementTest extends AbstractStatementTest {
ResultSet resultSet = callableStatement.executeQuery();
callableStatement.close();
- verify(mysqlCallableStatement, times(1)).clearParameters();
- verify(mysqlCallableStatement, times(1)).executeQuery();
- verify(mysqlCallableStatement, times(1)).close();
- verify(mysqlCallableStatement, times(1)).setAsciiStream(anyInt(), any(InputStream.class));
- verify(mysqlCallableStatement, times(1)).setAsciiStream(anyInt(), any(InputStream.class), anyInt());
- verify(mysqlCallableStatement, times(1)).setAsciiStream(anyInt(), any(InputStream.class), anyLong());
- verify(mysqlCallableStatement, times(1)).setCharacterStream(anyInt(), any(Reader.class));
- verify(mysqlCallableStatement, times(1)).setCharacterStream(anyInt(), any(Reader.class), anyInt());
- verify(mysqlCallableStatement, times(1)).setCharacterStream(anyInt(), any(Reader.class), anyLong());
- verify(mysqlCallableStatement, times(1)).setShort(anyInt(), anyShort());
- verify(mysqlCallableStatement, times(1)).setInt(anyInt(), anyInt());
- verify(mysqlCallableStatement, times(1)).setString(anyInt(), anyString());
- verify(mysqlCallableStatement, times(1)).setBoolean(anyInt(), anyBoolean());
- verify(mysqlCallableStatement, times(1)).setLong(anyInt(), anyLong());
- verify(mysqlCallableStatement, times(1)).setDouble(anyInt(), anyDouble());
- verify(mysqlCallableStatement, times(1)).setFloat(anyInt(), anyFloat());
- verify(mysqlCallableStatement, times(1)).setByte(anyInt(), anyByte());
- verify(mysqlCallableStatement, times(1)).setBytes(14, bytesParam);
- verify(mysqlCallableStatement, times(1)).setDate(anyInt(), any(Date.class));
- verify(mysqlCallableStatement, times(1)).setNull(anyInt(), anyInt());
- verify(mysqlCallableStatement, times(1)).setNull(anyInt(), anyInt(), anyString());
- verify(mysqlCallableStatement, times(1)).setBigDecimal(anyInt(), any(BigDecimal.class));
- verify(mysqlCallableStatement, times(1)).setBlob(anyInt(), any(InputStream.class));
- verify(mysqlCallableStatement, times(1)).setBlob(anyInt(), any(InputStream.class), anyLong());
- verify(mysqlCallableStatement, times(1)).setClob(anyInt(), any(Clob.class));
- verify(mysqlCallableStatement, times(1)).setClob(anyInt(), any(Reader.class));
- verify(mysqlCallableStatement, times(1)).setClob(anyInt(), any(Reader.class), anyInt());
- verify(mysqlCallableStatement, times(1)).setNString(anyInt(), anyString());
- verify(mysqlCallableStatement, times(1)).setNCharacterStream(anyInt(), any(Reader.class));
- verify(mysqlCallableStatement, times(1)).setNCharacterStream(anyInt(), any(Reader.class), anyInt());
- verify(mysqlCallableStatement, times(1)).setNClob(27, nClob);
- verify(mysqlCallableStatement, times(1)).setNClob(28, reader, 1);
- verify(mysqlCallableStatement, times(1)).setObject(anyInt(), Matchers.anyObject());
- verify(mysqlCallableStatement, times(1)).setObject(anyInt(), Matchers.anyObject(), anyInt());
- verify(mysqlCallableStatement, times(1)).setObject(anyInt(), Matchers.anyObject(), anyInt(), anyInt());
- verify(mysqlCallableStatement, times(1)).setRef(anyInt(), any(Ref.class));
- verify(mysqlCallableStatement, times(1)).setRowId(anyInt(), any(RowId.class));
- verify(mysqlCallableStatement, times(1)).setSQLXML(anyInt(), any(SQLXML.class));
- verify(mysqlCallableStatement, times(1)).setTime(anyInt(), any(Time.class));
- verify(mysqlCallableStatement, times(1)).setTimestamp(anyInt(), any(Timestamp.class));
- verify(mysqlCallableStatement, times(1)).setTimestamp(anyInt(), any(Timestamp.class), any(Calendar.class));
- verify(mysqlCallableStatement, times(1)).setURL(anyInt(), any(URL.class));
- verify(mysqlCallableStatement, times(1)).setBinaryStream(anyInt(), any(InputStream.class));
- verify(mysqlCallableStatement, times(1)).setBinaryStream(anyInt(), any(InputStream.class), anyInt());
- verify(mysqlCallableStatement, times(1)).setBinaryStream(anyInt(), any(InputStream.class), anyLong());
- verify(mysqlCallableStatement, times(1)).setNClob(42, reader);
- verify(mysqlCallableStatement, times(1)).setTime(anyInt(), any(Time.class), any(Calendar.class));
- verify(mysqlCallableStatement, times(1)).setTimestamp(anyInt(), any(Timestamp.class), any(Calendar.class));
- verify(mysqlCallableStatement, times(1)).setArray(anyInt(), any(Array.class));
- verify(mysqlCallableStatement, times(1)).setBlob(anyInt(), any(Blob.class));
- verify(mysqlCallableStatement, times(1)).setDate(anyInt(), any(Date.class), any(Calendar.class));
-
- verify(mysqlCallableStatement, times(1)).clearParameters();
- verify(mysqlCallableStatement, times(1)).executeQuery();
- verify(mysqlCallableStatement, times(1)).close();
- verify(mysqlCallableStatement, times(1)).setAsciiStream(anyString(), any(InputStream.class));
- verify(mysqlCallableStatement, times(1)).setAsciiStream(anyString(), any(InputStream.class), anyInt());
- verify(mysqlCallableStatement, times(1)).setAsciiStream(anyString(), any(InputStream.class), anyLong());
- verify(mysqlCallableStatement, times(1)).setCharacterStream(anyString(), any(Reader.class));
- verify(mysqlCallableStatement, times(1)).setCharacterStream(anyString(), any(Reader.class), anyInt());
- verify(mysqlCallableStatement, times(1)).setCharacterStream(anyString(), any(Reader.class), anyLong());
- verify(mysqlCallableStatement, times(1)).setShort(anyString(), anyShort());
- verify(mysqlCallableStatement, times(1)).setInt(anyString(), anyInt());
- verify(mysqlCallableStatement, times(1)).setString(anyString(), anyString());
- verify(mysqlCallableStatement, times(1)).setBoolean(anyString(), anyBoolean());
- verify(mysqlCallableStatement, times(1)).setLong(anyString(), anyLong());
- verify(mysqlCallableStatement, times(1)).setDouble(anyString(), anyDouble());
- verify(mysqlCallableStatement, times(1)).setFloat(anyString(), anyFloat());
- verify(mysqlCallableStatement, times(1)).setByte(anyString(), anyByte());
- verify(mysqlCallableStatement, times(1)).setBytes(14, bytesParam);
- verify(mysqlCallableStatement, times(1)).setDate(anyString(), any(Date.class));
- verify(mysqlCallableStatement, times(1)).setNull(anyString(), anyInt());
- verify(mysqlCallableStatement, times(1)).setNull(anyString(), anyInt(), anyString());
- verify(mysqlCallableStatement, times(1)).setBigDecimal(anyString(), any(BigDecimal.class));
- verify(mysqlCallableStatement, times(1)).setBlob(anyString(), any(InputStream.class));
- verify(mysqlCallableStatement, times(1)).setBlob(anyString(), any(InputStream.class), anyLong());
- verify(mysqlCallableStatement, times(1)).setClob(anyString(), any(Clob.class));
- verify(mysqlCallableStatement, times(1)).setClob(anyString(), any(Reader.class));
- verify(mysqlCallableStatement, times(1)).setClob(anyString(), any(Reader.class), anyInt());
- verify(mysqlCallableStatement, times(1)).setNString(anyString(), anyString());
- verify(mysqlCallableStatement, times(1)).setNCharacterStream(anyString(), any(Reader.class));
- verify(mysqlCallableStatement, times(1)).setNCharacterStream(anyString(), any(Reader.class), anyInt());
- verify(mysqlCallableStatement, times(1)).setNClob(27, nClob);
- verify(mysqlCallableStatement, times(1)).setNClob(28, reader, 1);
- verify(mysqlCallableStatement, times(1)).setObject(anyString(), Matchers.anyObject());
- verify(mysqlCallableStatement, times(1)).setObject(anyString(), Matchers.anyObject(), anyInt());
- verify(mysqlCallableStatement, times(1)).setObject(anyString(), Matchers.anyObject(), anyInt(), anyInt());
- verify(mysqlCallableStatement, times(1)).setRowId(anyString(), any(RowId.class));
- verify(mysqlCallableStatement, times(1)).setSQLXML(anyString(), any(SQLXML.class));
- verify(mysqlCallableStatement, times(1)).setTime(anyString(), any(Time.class));
- verify(mysqlCallableStatement, times(1)).setTimestamp(anyString(), any(Timestamp.class));
- verify(mysqlCallableStatement, times(1)).setTimestamp(anyString(), any(Timestamp.class), any(Calendar.class));
- verify(mysqlCallableStatement, times(1)).setURL(anyString(), any(URL.class));
- verify(mysqlCallableStatement, times(1)).setBinaryStream(anyString(), any(InputStream.class));
- verify(mysqlCallableStatement, times(1)).setBinaryStream(anyString(), any(InputStream.class), anyInt());
- verify(mysqlCallableStatement, times(1)).setBinaryStream(anyString(), any(InputStream.class), anyLong());
- verify(mysqlCallableStatement, times(1)).setNClob(42, reader);
- verify(mysqlCallableStatement, times(1)).setTime(anyString(), any(Time.class), any(Calendar.class));
- verify(mysqlCallableStatement, times(1)).setTimestamp(anyString(), any(Timestamp.class), any(Calendar.class));
- verify(mysqlCallableStatement, times(1)).setBlob(anyString(), any(Blob.class));
- verify(mysqlCallableStatement, times(1)).setDate(anyString(), any(Date.class), any(Calendar.class));
+ verify(mysqlCallableStatement).clearParameters();
+ verify(mysqlCallableStatement).executeQuery();
+ verify(mysqlCallableStatement).close();
+ verify(mysqlCallableStatement).setAsciiStream(anyInt(), any(InputStream.class));
+ verify(mysqlCallableStatement).setAsciiStream(anyInt(), any(InputStream.class), anyInt());
+ verify(mysqlCallableStatement).setAsciiStream(anyInt(), any(InputStream.class), anyLong());
+ verify(mysqlCallableStatement).setCharacterStream(anyInt(), any(Reader.class));
+ verify(mysqlCallableStatement).setCharacterStream(anyInt(), any(Reader.class), anyInt());
+ verify(mysqlCallableStatement).setCharacterStream(anyInt(), any(Reader.class), anyLong());
+ verify(mysqlCallableStatement).setShort(anyInt(), anyShort());
+ verify(mysqlCallableStatement).setInt(anyInt(), anyInt());
+ verify(mysqlCallableStatement).setString(anyInt(), anyString());
+ verify(mysqlCallableStatement).setBoolean(anyInt(), anyBoolean());
+ verify(mysqlCallableStatement).setLong(anyInt(), anyLong());
+ verify(mysqlCallableStatement).setDouble(anyInt(), anyDouble());
+ verify(mysqlCallableStatement).setFloat(anyInt(), anyFloat());
+ verify(mysqlCallableStatement).setByte(anyInt(), anyByte());
+ verify(mysqlCallableStatement).setBytes(14, bytesParam);
+ verify(mysqlCallableStatement).setDate(anyInt(), any(Date.class));
+ verify(mysqlCallableStatement).setNull(anyInt(), anyInt());
+ verify(mysqlCallableStatement).setNull(anyInt(), anyInt(), anyString());
+ verify(mysqlCallableStatement).setBigDecimal(anyInt(), any(BigDecimal.class));
+ verify(mysqlCallableStatement).setBlob(anyInt(), any(InputStream.class));
+ verify(mysqlCallableStatement).setBlob(anyInt(), any(InputStream.class), anyLong());
+ verify(mysqlCallableStatement).setClob(anyInt(), any(Clob.class));
+ verify(mysqlCallableStatement).setClob(anyInt(), any(Reader.class));
+ verify(mysqlCallableStatement).setClob(anyInt(), any(Reader.class), anyInt());
+ verify(mysqlCallableStatement).setNString(anyInt(), anyString());
+ verify(mysqlCallableStatement).setNCharacterStream(anyInt(), any(Reader.class));
+ verify(mysqlCallableStatement).setNCharacterStream(anyInt(), any(Reader.class), anyInt());
+ verify(mysqlCallableStatement).setNClob(27, nClob);
+ verify(mysqlCallableStatement).setNClob(28, reader, 1);
+ verify(mysqlCallableStatement).setObject(anyInt(), Matchers.anyObject());
+ verify(mysqlCallableStatement).setObject(anyInt(), Matchers.anyObject(), anyInt());
+ verify(mysqlCallableStatement).setObject(anyInt(), Matchers.anyObject(), anyInt(), anyInt());
+ verify(mysqlCallableStatement).setRef(anyInt(), any(Ref.class));
+ verify(mysqlCallableStatement).setRowId(anyInt(), any(RowId.class));
+ verify(mysqlCallableStatement).setSQLXML(anyInt(), any(SQLXML.class));
+ verify(mysqlCallableStatement).setTime(anyInt(), any(Time.class));
+ verify(mysqlCallableStatement).setTimestamp(anyInt(), any(Timestamp.class));
+ verify(mysqlCallableStatement).setTimestamp(anyInt(), any(Timestamp.class), any(Calendar.class));
+ verify(mysqlCallableStatement).setURL(anyInt(), any(URL.class));
+ verify(mysqlCallableStatement).setBinaryStream(anyInt(), any(InputStream.class));
+ verify(mysqlCallableStatement).setBinaryStream(anyInt(), any(InputStream.class), anyInt());
+ verify(mysqlCallableStatement).setBinaryStream(anyInt(), any(InputStream.class), anyLong());
+ verify(mysqlCallableStatement).setNClob(42, reader);
+ verify(mysqlCallableStatement).setTime(anyInt(), any(Time.class), any(Calendar.class));
+ verify(mysqlCallableStatement).setTimestamp(anyInt(), any(Timestamp.class), any(Calendar.class));
+ verify(mysqlCallableStatement).setArray(anyInt(), any(Array.class));
+ verify(mysqlCallableStatement).setBlob(anyInt(), any(Blob.class));
+ verify(mysqlCallableStatement).setDate(anyInt(), any(Date.class), any(Calendar.class));
+
+ verify(mysqlCallableStatement).clearParameters();
+ verify(mysqlCallableStatement).executeQuery();
+ verify(mysqlCallableStatement).close();
+ verify(mysqlCallableStatement).setAsciiStream(anyString(), any(InputStream.class));
+ verify(mysqlCallableStatement).setAsciiStream(anyString(), any(InputStream.class), anyInt());
+ verify(mysqlCallableStatement).setAsciiStream(anyString(), any(InputStream.class), anyLong());
+ verify(mysqlCallableStatement).setCharacterStream(anyString(), any(Reader.class));
+ verify(mysqlCallableStatement).setCharacterStream(anyString(), any(Reader.class), anyInt());
+ verify(mysqlCallableStatement).setCharacterStream(anyString(), any(Reader.class), anyLong());
+ verify(mysqlCallableStatement).setShort(anyString(), anyShort());
+ verify(mysqlCallableStatement).setInt(anyString(), anyInt());
+ verify(mysqlCallableStatement).setString(anyString(), anyString());
+ verify(mysqlCallableStatement).setBoolean(anyString(), anyBoolean());
+ verify(mysqlCallableStatement).setLong(anyString(), anyLong());
+ verify(mysqlCallableStatement).setDouble(anyString(), anyDouble());
+ verify(mysqlCallableStatement).setFloat(anyString(), anyFloat());
+ verify(mysqlCallableStatement).setByte(anyString(), anyByte());
+ verify(mysqlCallableStatement).setBytes(14, bytesParam);
+ verify(mysqlCallableStatement).setDate(anyString(), any(Date.class));
+ verify(mysqlCallableStatement).setNull(anyString(), anyInt());
+ verify(mysqlCallableStatement).setNull(anyString(), anyInt(), anyString());
+ verify(mysqlCallableStatement).setBigDecimal(anyString(), any(BigDecimal.class));
+ verify(mysqlCallableStatement).setBlob(anyString(), any(InputStream.class));
+ verify(mysqlCallableStatement).setBlob(anyString(), any(InputStream.class), anyLong());
+ verify(mysqlCallableStatement).setClob(anyString(), any(Clob.class));
+ verify(mysqlCallableStatement).setClob(anyString(), any(Reader.class));
+ verify(mysqlCallableStatement).setClob(anyString(), any(Reader.class), anyInt());
+ verify(mysqlCallableStatement).setNString(anyString(), anyString());
+ verify(mysqlCallableStatement).setNCharacterStream(anyString(), any(Reader.class));
+ verify(mysqlCallableStatement).setNCharacterStream(anyString(), any(Reader.class), anyInt());
+ verify(mysqlCallableStatement).setNClob(27, nClob);
+ verify(mysqlCallableStatement).setNClob(28, reader, 1);
+ verify(mysqlCallableStatement).setObject(anyString(), Matchers.anyObject());
+ verify(mysqlCallableStatement).setObject(anyString(), Matchers.anyObject(), anyInt());
+ verify(mysqlCallableStatement).setObject(anyString(), Matchers.anyObject(), anyInt(), anyInt());
+ verify(mysqlCallableStatement).setRowId(anyString(), any(RowId.class));
+ verify(mysqlCallableStatement).setSQLXML(anyString(), any(SQLXML.class));
+ verify(mysqlCallableStatement).setTime(anyString(), any(Time.class));
+ verify(mysqlCallableStatement).setTimestamp(anyString(), any(Timestamp.class));
+ verify(mysqlCallableStatement).setTimestamp(anyString(), any(Timestamp.class), any(Calendar.class));
+ verify(mysqlCallableStatement).setURL(anyString(), any(URL.class));
+ verify(mysqlCallableStatement).setBinaryStream(anyString(), any(InputStream.class));
+ verify(mysqlCallableStatement).setBinaryStream(anyString(), any(InputStream.class), anyInt());
+ verify(mysqlCallableStatement).setBinaryStream(anyString(), any(InputStream.class), anyLong());
+ verify(mysqlCallableStatement).setNClob(42, reader);
+ verify(mysqlCallableStatement).setTime(anyString(), any(Time.class), any(Calendar.class));
+ verify(mysqlCallableStatement).setTimestamp(anyString(), any(Timestamp.class), any(Calendar.class));
+ verify(mysqlCallableStatement).setBlob(anyString(), any(Blob.class));
+ verify(mysqlCallableStatement).setDate(anyString(), any(Date.class), any(Calendar.class));
}
@Test
@@ -441,32 +441,32 @@ public class SWCallableStatementTest extends AbstractStatementTest {
callableStatement.getResultSet();
callableStatement.close();
- verify(mysqlCallableStatement, times(1)).getUpdateCount();
- verify(mysqlCallableStatement, times(1)).getMoreResults();
- verify(mysqlCallableStatement, times(1)).setFetchDirection(anyInt());
- verify(mysqlCallableStatement, times(1)).getFetchDirection();
- verify(mysqlCallableStatement, times(1)).getResultSetType();
- verify(mysqlCallableStatement, times(1)).isClosed();
- verify(mysqlCallableStatement, times(1)).setPoolable(anyBoolean());
- verify(mysqlCallableStatement, times(1)).getWarnings();
- verify(mysqlCallableStatement, times(1)).clearWarnings();
- verify(mysqlCallableStatement, times(1)).setCursorName(anyString());
- verify(mysqlCallableStatement, times(1)).setMaxFieldSize(anyInt());
- verify(mysqlCallableStatement, times(1)).getMaxFieldSize();
- verify(mysqlCallableStatement, times(1)).setMaxRows(anyInt());
- verify(mysqlCallableStatement, times(1)).getMaxRows();
- verify(mysqlCallableStatement, times(1)).setEscapeProcessing(anyBoolean());
- verify(mysqlCallableStatement, times(1)).getResultSetConcurrency();
- verify(mysqlCallableStatement, times(1)).getResultSetConcurrency();
- verify(mysqlCallableStatement, times(1)).getResultSetType();
- verify(mysqlCallableStatement, times(1)).getMetaData();
- verify(mysqlCallableStatement, times(1)).getParameterMetaData();
- verify(mysqlCallableStatement, times(1)).getMoreResults(anyInt());
- verify(mysqlCallableStatement, times(1)).setFetchSize(anyInt());
- verify(mysqlCallableStatement, times(1)).getFetchSize();
- verify(mysqlCallableStatement, times(1)).getQueryTimeout();
- verify(mysqlCallableStatement, times(1)).setQueryTimeout(anyInt());
- verify(mysqlCallableStatement, times(1)).getResultSet();
+ verify(mysqlCallableStatement).getUpdateCount();
+ verify(mysqlCallableStatement).getMoreResults();
+ verify(mysqlCallableStatement).setFetchDirection(anyInt());
+ verify(mysqlCallableStatement).getFetchDirection();
+ verify(mysqlCallableStatement).getResultSetType();
+ verify(mysqlCallableStatement).isClosed();
+ verify(mysqlCallableStatement).setPoolable(anyBoolean());
+ verify(mysqlCallableStatement).getWarnings();
+ verify(mysqlCallableStatement).clearWarnings();
+ verify(mysqlCallableStatement).setCursorName(anyString());
+ verify(mysqlCallableStatement).setMaxFieldSize(anyInt());
+ verify(mysqlCallableStatement).getMaxFieldSize();
+ verify(mysqlCallableStatement).setMaxRows(anyInt());
+ verify(mysqlCallableStatement).getMaxRows();
+ verify(mysqlCallableStatement).setEscapeProcessing(anyBoolean());
+ verify(mysqlCallableStatement).getResultSetConcurrency();
+ verify(mysqlCallableStatement).getResultSetConcurrency();
+ verify(mysqlCallableStatement).getResultSetType();
+ verify(mysqlCallableStatement).getMetaData();
+ verify(mysqlCallableStatement).getParameterMetaData();
+ verify(mysqlCallableStatement).getMoreResults(anyInt());
+ verify(mysqlCallableStatement).setFetchSize(anyInt());
+ verify(mysqlCallableStatement).getFetchSize();
+ verify(mysqlCallableStatement).getQueryTimeout();
+ verify(mysqlCallableStatement).setQueryTimeout(anyInt());
+ verify(mysqlCallableStatement).getResultSet();
assertThat(connection, CoreMatchers.<Connection>is(swConnection));
}
@@ -477,8 +477,8 @@ public class SWCallableStatementTest extends AbstractStatementTest {
callableStatement.close();
- verify(mysqlCallableStatement, times(1)).executeQuery();
- verify(mysqlCallableStatement, times(1)).close();
+ verify(mysqlCallableStatement).executeQuery();
+ verify(mysqlCallableStatement).close();
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -494,8 +494,8 @@ public class SWCallableStatementTest extends AbstractStatementTest {
preparedStatement.getGeneratedKeys();
preparedStatement.close();
- verify(mysqlCallableStatement, times(1)).executeQuery(anyString());
- verify(mysqlCallableStatement, times(1)).close();
+ verify(mysqlCallableStatement).executeQuery(anyString());
+ verify(mysqlCallableStatement).close();
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -509,8 +509,8 @@ public class SWCallableStatementTest extends AbstractStatementTest {
boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", 1);
preparedStatement.close();
- verify(mysqlCallableStatement, times(1)).execute(anyString(), anyInt());
- verify(mysqlCallableStatement, times(1)).close();
+ verify(mysqlCallableStatement).execute(anyString(), anyInt());
+ verify(mysqlCallableStatement).close();
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -524,7 +524,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", new int[] {1, 2});
preparedStatement.close();
- verify(mysqlCallableStatement, times(1)).close();
+ verify(mysqlCallableStatement).close();
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -538,7 +538,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", new String[] {"1", "2"});
preparedStatement.close();
- verify(mysqlCallableStatement, times(1)).close();
+ verify(mysqlCallableStatement).close();
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -554,8 +554,8 @@ public class SWCallableStatementTest extends AbstractStatementTest {
preparedStatement.cancel();
preparedStatement.close();
- verify(mysqlCallableStatement, times(1)).execute(anyString());
- verify(mysqlCallableStatement, times(1)).close();
+ verify(mysqlCallableStatement).execute(anyString());
+ verify(mysqlCallableStatement).close();
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -571,8 +571,8 @@ public class SWCallableStatementTest extends AbstractStatementTest {
preparedStatement.cancel();
preparedStatement.close();
- verify(mysqlCallableStatement, times(1)).executeUpdate();
- verify(mysqlCallableStatement, times(1)).close();
+ verify(mysqlCallableStatement).executeUpdate();
+ verify(mysqlCallableStatement).close();
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -588,8 +588,8 @@ public class SWCallableStatementTest extends AbstractStatementTest {
preparedStatement.cancel();
preparedStatement.close();
- verify(mysqlCallableStatement, times(1)).executeUpdate(anyString());
- verify(mysqlCallableStatement, times(1)).close();
+ verify(mysqlCallableStatement).executeUpdate(anyString());
+ verify(mysqlCallableStatement).close();
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -605,7 +605,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
preparedStatement.cancel();
preparedStatement.close();
- verify(mysqlCallableStatement, times(1)).close();
+ verify(mysqlCallableStatement).close();
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -621,7 +621,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
preparedStatement.cancel();
preparedStatement.close();
- verify(mysqlCallableStatement, times(1)).close();
+ verify(mysqlCallableStatement).close();
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -637,7 +637,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
preparedStatement.cancel();
preparedStatement.close();
- verify(mysqlCallableStatement, times(1)).close();
+ verify(mysqlCallableStatement).close();
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -654,9 +654,9 @@ public class SWCallableStatementTest extends AbstractStatementTest {
int[] resultSet = preparedStatement.executeBatch();
preparedStatement.clearBatch();
- verify(mysqlCallableStatement, times(1)).executeBatch();
- verify(mysqlCallableStatement, times(1)).addBatch();
- verify(mysqlCallableStatement, times(1)).clearBatch();
+ verify(mysqlCallableStatement).executeBatch();
+ verify(mysqlCallableStatement).addBatch();
+ verify(mysqlCallableStatement).clearBatch();
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
@@ -676,8 +676,8 @@ public class SWCallableStatementTest extends AbstractStatementTest {
preparedStatement.close();
- verify(mysqlCallableStatement, times(1)).executeQuery();
- verify(mysqlCallableStatement, times(1)).close();
+ verify(mysqlCallableStatement).executeQuery();
+ verify(mysqlCallableStatement).close();
}
@Test(expected = SQLException.class)
@@ -696,12 +696,12 @@ public class SWCallableStatementTest extends AbstractStatementTest {
preparedStatement.close();
} finally {
- verify(mysqlCallableStatement, times(1)).executeQuery();
+ verify(mysqlCallableStatement).executeQuery();
verify(mysqlCallableStatement, times(0)).close();
- verify(mysqlCallableStatement, times(1)).setBigDecimal(anyInt(), any(BigDecimal.class));
- verify(mysqlCallableStatement, times(1)).setBlob(anyInt(), any(InputStream.class));
- verify(mysqlCallableStatement, times(1)).setBlob(anyInt(), any(InputStream.class), anyLong());
- verify(mysqlCallableStatement, times(1)).setByte(anyInt(), anyByte());
+ verify(mysqlCallableStatement).setBigDecimal(anyInt(), any(BigDecimal.class));
+ verify(mysqlCallableStatement).setBlob(anyInt(), any(InputStream.class));
+ verify(mysqlCallableStatement).setBlob(anyInt(), any(InputStream.class), anyLong());
+ verify(mysqlCallableStatement).setByte(anyInt(), anyByte());
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnectionTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnectionTest.java
index 7216be7..32056f9 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnectionTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnectionTest.java
@@ -50,7 +50,6 @@ import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -323,33 +322,33 @@ public class SWConnectionTest extends AbstractStatementTest {
swConnection.setTransactionIsolation(1);
swConnection.setTypeMap(new HashMap<String, Class<?>>());
- verify(jdbcConnection, times(1)).createBlob();
- verify(jdbcConnection, times(1)).createClob();
- verify(jdbcConnection, times(1)).createNClob();
- verify(jdbcConnection, times(1)).createSQLXML();
- verify(jdbcConnection, times(1)).nativeSQL(anyString());
- verify(jdbcConnection, times(1)).setAutoCommit(anyBoolean());
- verify(jdbcConnection, times(1)).getAutoCommit();
- verify(jdbcConnection, times(1)).setCatalog(anyString());
- verify(jdbcConnection, times(1)).getCatalog();
- verify(jdbcConnection, times(1)).setClientInfo(anyString(), anyString());
- verify(jdbcConnection, times(1)).setHoldability(anyInt());
- verify(jdbcConnection, times(1)).getHoldability();
- verify(jdbcConnection, times(1)).setReadOnly(anyBoolean());
- verify(jdbcConnection, times(1)).getClientInfo();
- verify(jdbcConnection, times(1)).getClientInfo(anyString());
- verify(jdbcConnection, times(1)).setSavepoint(anyString());
- verify(jdbcConnection, times(1)).setSavepoint();
- verify(jdbcConnection, times(1)).getMetaData();
- verify(jdbcConnection, times(1)).getTransactionIsolation();
- verify(jdbcConnection, times(1)).getTypeMap();
- verify(jdbcConnection, times(1)).getWarnings();
- verify(jdbcConnection, times(1)).setTransactionIsolation(anyInt());
- verify(jdbcConnection, times(1)).getTransactionIsolation();
- verify(jdbcConnection, times(1)).isClosed();
- verify(jdbcConnection, times(1)).isReadOnly();
- verify(jdbcConnection, times(1)).isValid(anyInt());
- verify(jdbcConnection, times(1)).setTypeMap(any(HashMap.class));
+ verify(jdbcConnection).createBlob();
+ verify(jdbcConnection).createClob();
+ verify(jdbcConnection).createNClob();
+ verify(jdbcConnection).createSQLXML();
+ verify(jdbcConnection).nativeSQL(anyString());
+ verify(jdbcConnection).setAutoCommit(anyBoolean());
+ verify(jdbcConnection).getAutoCommit();
+ verify(jdbcConnection).setCatalog(anyString());
+ verify(jdbcConnection).getCatalog();
+ verify(jdbcConnection).setClientInfo(anyString(), anyString());
+ verify(jdbcConnection).setHoldability(anyInt());
+ verify(jdbcConnection).getHoldability();
+ verify(jdbcConnection).setReadOnly(anyBoolean());
+ verify(jdbcConnection).getClientInfo();
+ verify(jdbcConnection).getClientInfo(anyString());
+ verify(jdbcConnection).setSavepoint(anyString());
+ verify(jdbcConnection).setSavepoint();
+ verify(jdbcConnection).getMetaData();
+ verify(jdbcConnection).getTransactionIsolation();
+ verify(jdbcConnection).getTypeMap();
+ verify(jdbcConnection).getWarnings();
+ verify(jdbcConnection).setTransactionIsolation(anyInt());
+ verify(jdbcConnection).getTransactionIsolation();
+ verify(jdbcConnection).isClosed();
+ verify(jdbcConnection).isReadOnly();
+ verify(jdbcConnection).isValid(anyInt());
+ verify(jdbcConnection).setTypeMap(any(HashMap.class));
}
}
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWStatementTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWStatementTest.java
index d3bc35d..ea53423 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWStatementTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWStatementTest.java
@@ -49,7 +49,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -113,30 +112,30 @@ public class SWStatementTest extends AbstractStatementTest {
statement.getResultSet();
statement.close();
- verify(mysqlStatement, times(1)).getUpdateCount();
- verify(mysqlStatement, times(1)).getMoreResults();
- verify(mysqlStatement, times(1)).setFetchDirection(anyInt());
- verify(mysqlStatement, times(1)).getFetchDirection();
- verify(mysqlStatement, times(1)).getResultSetType();
- verify(mysqlStatement, times(1)).isClosed();
- verify(mysqlStatement, times(1)).setPoolable(anyBoolean());
- verify(mysqlStatement, times(1)).getWarnings();
- verify(mysqlStatement, times(1)).clearWarnings();
- verify(mysqlStatement, times(1)).setCursorName(anyString());
- verify(mysqlStatement, times(1)).setMaxFieldSize(anyInt());
- verify(mysqlStatement, times(1)).getMaxFieldSize();
- verify(mysqlStatement, times(1)).setMaxRows(anyInt());
- verify(mysqlStatement, times(1)).getMaxRows();
- verify(mysqlStatement, times(1)).setEscapeProcessing(anyBoolean());
- verify(mysqlStatement, times(1)).getResultSetConcurrency();
- verify(mysqlStatement, times(1)).getResultSetConcurrency();
- verify(mysqlStatement, times(1)).getResultSetType();
- verify(mysqlStatement, times(1)).getMoreResults(anyInt());
- verify(mysqlStatement, times(1)).setFetchSize(anyInt());
- verify(mysqlStatement, times(1)).getFetchSize();
- verify(mysqlStatement, times(1)).getQueryTimeout();
- verify(mysqlStatement, times(1)).setQueryTimeout(anyInt());
- verify(mysqlStatement, times(1)).getResultSet();
+ verify(mysqlStatement).getUpdateCount();
+ verify(mysqlStatement).getMoreResults();
+ verify(mysqlStatement).setFetchDirection(anyInt());
+ verify(mysqlStatement).getFetchDirection();
+ verify(mysqlStatement).getResultSetType();
+ verify(mysqlStatement).isClosed();
+ verify(mysqlStatement).setPoolable(anyBoolean());
+ verify(mysqlStatement).getWarnings();
+ verify(mysqlStatement).clearWarnings();
+ verify(mysqlStatement).setCursorName(anyString());
+ verify(mysqlStatement).setMaxFieldSize(anyInt());
+ verify(mysqlStatement).getMaxFieldSize();
+ verify(mysqlStatement).setMaxRows(anyInt());
+ verify(mysqlStatement).getMaxRows();
+ verify(mysqlStatement).setEscapeProcessing(anyBoolean());
+ verify(mysqlStatement).getResultSetConcurrency();
+ verify(mysqlStatement).getResultSetConcurrency();
+ verify(mysqlStatement).getResultSetType();
+ verify(mysqlStatement).getMoreResults(anyInt());
+ verify(mysqlStatement).setFetchSize(anyInt());
+ verify(mysqlStatement).getFetchSize();
+ verify(mysqlStatement).getQueryTimeout();
+ verify(mysqlStatement).setQueryTimeout(anyInt());
+ verify(mysqlStatement).getResultSet();
assertThat(connection, CoreMatchers.<Connection>is(swConnection));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
@@ -187,7 +186,7 @@ public class SWStatementTest extends AbstractStatementTest {
int executeSuccess = statement.executeUpdate("UPDATE test SET a = 1", 1);
statement.getGeneratedKeys();
- verify(mysqlStatement, times(1)).getGeneratedKeys();
+ verify(mysqlStatement).getGeneratedKeys();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -249,9 +248,9 @@ public class SWStatementTest extends AbstractStatementTest {
int[] resultSet = statement.executeBatch();
statement.clearBatch();
- verify(mysqlStatement, times(1)).executeBatch();
- verify(mysqlStatement, times(1)).addBatch(anyString());
- verify(mysqlStatement, times(1)).clearBatch();
+ verify(mysqlStatement).executeBatch();
+ verify(mysqlStatement).addBatch(anyString());
+ verify(mysqlStatement).clearBatch();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -267,7 +266,7 @@ public class SWStatementTest extends AbstractStatementTest {
Statement statement = multiHostConnection.createStatement();
statement.execute("UPDATE test SET a = 1 WHERE b = 2");
} finally {
- verify(mysqlStatement, times(1)).execute(anyString());
+ verify(mysqlStatement).execute(anyString());
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java
index b783eb0..2bea98f 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java
@@ -182,57 +182,57 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
ResultSet resultSet = preparedStatement.executeQuery();
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).clearParameters();
- verify(mysqlPreparedStatement, times(1)).executeQuery();
- verify(mysqlPreparedStatement, times(1)).close();
- verify(mysqlPreparedStatement, times(1)).setAsciiStream(anyInt(), any(InputStream.class));
- verify(mysqlPreparedStatement, times(1)).setAsciiStream(anyInt(), any(InputStream.class), anyInt());
- verify(mysqlPreparedStatement, times(1)).setAsciiStream(anyInt(), any(InputStream.class), anyLong());
- verify(mysqlPreparedStatement, times(1)).setCharacterStream(anyInt(), any(Reader.class));
- verify(mysqlPreparedStatement, times(1)).setCharacterStream(anyInt(), any(Reader.class), anyInt());
- verify(mysqlPreparedStatement, times(1)).setCharacterStream(anyInt(), any(Reader.class), anyLong());
- verify(mysqlPreparedStatement, times(1)).setShort(anyInt(), anyShort());
- verify(mysqlPreparedStatement, times(1)).setInt(anyInt(), anyInt());
- verify(mysqlPreparedStatement, times(1)).setString(anyInt(), anyString());
- verify(mysqlPreparedStatement, times(1)).setBoolean(anyInt(), anyBoolean());
- verify(mysqlPreparedStatement, times(1)).setLong(anyInt(), anyLong());
- verify(mysqlPreparedStatement, times(1)).setDouble(anyInt(), anyDouble());
- verify(mysqlPreparedStatement, times(1)).setFloat(anyInt(), anyFloat());
- verify(mysqlPreparedStatement, times(1)).setByte(anyInt(), anyByte());
- verify(mysqlPreparedStatement, times(1)).setBytes(14, bytesParam);
- verify(mysqlPreparedStatement, times(1)).setDate(anyInt(), any(Date.class));
- verify(mysqlPreparedStatement, times(1)).setNull(anyInt(), anyInt());
- verify(mysqlPreparedStatement, times(1)).setNull(anyInt(), anyInt(), anyString());
- verify(mysqlPreparedStatement, times(1)).setBigDecimal(anyInt(), any(BigDecimal.class));
- verify(mysqlPreparedStatement, times(1)).setBlob(anyInt(), any(InputStream.class));
- verify(mysqlPreparedStatement, times(1)).setBlob(anyInt(), any(InputStream.class), anyLong());
- verify(mysqlPreparedStatement, times(1)).setClob(anyInt(), any(Clob.class));
- verify(mysqlPreparedStatement, times(1)).setClob(anyInt(), any(Reader.class));
- verify(mysqlPreparedStatement, times(1)).setClob(anyInt(), any(Reader.class), anyInt());
- verify(mysqlPreparedStatement, times(1)).setNString(anyInt(), anyString());
- verify(mysqlPreparedStatement, times(1)).setNCharacterStream(anyInt(), any(Reader.class));
- verify(mysqlPreparedStatement, times(1)).setNCharacterStream(anyInt(), any(Reader.class), anyInt());
- verify(mysqlPreparedStatement, times(1)).setNClob(27, nClob);
- verify(mysqlPreparedStatement, times(1)).setNClob(28, reader, 1);
- verify(mysqlPreparedStatement, times(1)).setObject(anyInt(), Matchers.anyObject());
- verify(mysqlPreparedStatement, times(1)).setObject(anyInt(), Matchers.anyObject(), anyInt());
- verify(mysqlPreparedStatement, times(1)).setObject(anyInt(), Matchers.anyObject(), anyInt(), anyInt());
- verify(mysqlPreparedStatement, times(1)).setRef(anyInt(), any(Ref.class));
- verify(mysqlPreparedStatement, times(1)).setRowId(anyInt(), any(RowId.class));
- verify(mysqlPreparedStatement, times(1)).setSQLXML(anyInt(), any(SQLXML.class));
- verify(mysqlPreparedStatement, times(1)).setTime(anyInt(), any(Time.class));
- verify(mysqlPreparedStatement, times(1)).setTimestamp(anyInt(), any(Timestamp.class));
- verify(mysqlPreparedStatement, times(1)).setTimestamp(anyInt(), any(Timestamp.class), any(Calendar.class));
- verify(mysqlPreparedStatement, times(1)).setURL(anyInt(), any(URL.class));
- verify(mysqlPreparedStatement, times(1)).setBinaryStream(anyInt(), any(InputStream.class));
- verify(mysqlPreparedStatement, times(1)).setBinaryStream(anyInt(), any(InputStream.class), anyInt());
- verify(mysqlPreparedStatement, times(1)).setBinaryStream(anyInt(), any(InputStream.class), anyLong());
- verify(mysqlPreparedStatement, times(1)).setNClob(42, reader);
- verify(mysqlPreparedStatement, times(1)).setTime(anyInt(), any(Time.class), any(Calendar.class));
- verify(mysqlPreparedStatement, times(1)).setTimestamp(anyInt(), any(Timestamp.class), any(Calendar.class));
- verify(mysqlPreparedStatement, times(1)).setArray(anyInt(), any(Array.class));
- verify(mysqlPreparedStatement, times(1)).setBlob(anyInt(), any(Blob.class));
- verify(mysqlPreparedStatement, times(1)).setDate(anyInt(), any(Date.class), any(Calendar.class));
+ verify(mysqlPreparedStatement).clearParameters();
+ verify(mysqlPreparedStatement).executeQuery();
+ verify(mysqlPreparedStatement).close();
+ verify(mysqlPreparedStatement).setAsciiStream(anyInt(), any(InputStream.class));
+ verify(mysqlPreparedStatement).setAsciiStream(anyInt(), any(InputStream.class), anyInt());
+ verify(mysqlPreparedStatement).setAsciiStream(anyInt(), any(InputStream.class), anyLong());
+ verify(mysqlPreparedStatement).setCharacterStream(anyInt(), any(Reader.class));
+ verify(mysqlPreparedStatement).setCharacterStream(anyInt(), any(Reader.class), anyInt());
+ verify(mysqlPreparedStatement).setCharacterStream(anyInt(), any(Reader.class), anyLong());
+ verify(mysqlPreparedStatement).setShort(anyInt(), anyShort());
+ verify(mysqlPreparedStatement).setInt(anyInt(), anyInt());
+ verify(mysqlPreparedStatement).setString(anyInt(), anyString());
+ verify(mysqlPreparedStatement).setBoolean(anyInt(), anyBoolean());
+ verify(mysqlPreparedStatement).setLong(anyInt(), anyLong());
+ verify(mysqlPreparedStatement).setDouble(anyInt(), anyDouble());
+ verify(mysqlPreparedStatement).setFloat(anyInt(), anyFloat());
+ verify(mysqlPreparedStatement).setByte(anyInt(), anyByte());
+ verify(mysqlPreparedStatement).setBytes(14, bytesParam);
+ verify(mysqlPreparedStatement).setDate(anyInt(), any(Date.class));
+ verify(mysqlPreparedStatement).setNull(anyInt(), anyInt());
+ verify(mysqlPreparedStatement).setNull(anyInt(), anyInt(), anyString());
+ verify(mysqlPreparedStatement).setBigDecimal(anyInt(), any(BigDecimal.class));
+ verify(mysqlPreparedStatement).setBlob(anyInt(), any(InputStream.class));
+ verify(mysqlPreparedStatement).setBlob(anyInt(), any(InputStream.class), anyLong());
+ verify(mysqlPreparedStatement).setClob(anyInt(), any(Clob.class));
+ verify(mysqlPreparedStatement).setClob(anyInt(), any(Reader.class));
+ verify(mysqlPreparedStatement).setClob(anyInt(), any(Reader.class), anyInt());
+ verify(mysqlPreparedStatement).setNString(anyInt(), anyString());
+ verify(mysqlPreparedStatement).setNCharacterStream(anyInt(), any(Reader.class));
+ verify(mysqlPreparedStatement).setNCharacterStream(anyInt(), any(Reader.class), anyInt());
+ verify(mysqlPreparedStatement).setNClob(27, nClob);
+ verify(mysqlPreparedStatement).setNClob(28, reader, 1);
+ verify(mysqlPreparedStatement).setObject(anyInt(), Matchers.anyObject());
+ verify(mysqlPreparedStatement).setObject(anyInt(), Matchers.anyObject(), anyInt());
+ verify(mysqlPreparedStatement).setObject(anyInt(), Matchers.anyObject(), anyInt(), anyInt());
+ verify(mysqlPreparedStatement).setRef(anyInt(), any(Ref.class));
+ verify(mysqlPreparedStatement).setRowId(anyInt(), any(RowId.class));
+ verify(mysqlPreparedStatement).setSQLXML(anyInt(), any(SQLXML.class));
+ verify(mysqlPreparedStatement).setTime(anyInt(), any(Time.class));
+ verify(mysqlPreparedStatement).setTimestamp(anyInt(), any(Timestamp.class));
+ verify(mysqlPreparedStatement).setTimestamp(anyInt(), any(Timestamp.class), any(Calendar.class));
+ verify(mysqlPreparedStatement).setURL(anyInt(), any(URL.class));
+ verify(mysqlPreparedStatement).setBinaryStream(anyInt(), any(InputStream.class));
+ verify(mysqlPreparedStatement).setBinaryStream(anyInt(), any(InputStream.class), anyInt());
+ verify(mysqlPreparedStatement).setBinaryStream(anyInt(), any(InputStream.class), anyLong());
+ verify(mysqlPreparedStatement).setNClob(42, reader);
+ verify(mysqlPreparedStatement).setTime(anyInt(), any(Time.class), any(Calendar.class));
+ verify(mysqlPreparedStatement).setTimestamp(anyInt(), any(Timestamp.class), any(Calendar.class));
+ verify(mysqlPreparedStatement).setArray(anyInt(), any(Array.class));
+ verify(mysqlPreparedStatement).setBlob(anyInt(), any(Blob.class));
+ verify(mysqlPreparedStatement).setDate(anyInt(), any(Date.class), any(Calendar.class));
}
@Test
@@ -272,32 +272,32 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
preparedStatement.getResultSet();
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).getUpdateCount();
- verify(mysqlPreparedStatement, times(1)).getMoreResults();
- verify(mysqlPreparedStatement, times(1)).setFetchDirection(anyInt());
- verify(mysqlPreparedStatement, times(1)).getFetchDirection();
- verify(mysqlPreparedStatement, times(1)).getResultSetType();
- verify(mysqlPreparedStatement, times(1)).isClosed();
- verify(mysqlPreparedStatement, times(1)).setPoolable(anyBoolean());
- verify(mysqlPreparedStatement, times(1)).getWarnings();
- verify(mysqlPreparedStatement, times(1)).clearWarnings();
- verify(mysqlPreparedStatement, times(1)).setCursorName(anyString());
- verify(mysqlPreparedStatement, times(1)).setMaxFieldSize(anyInt());
- verify(mysqlPreparedStatement, times(1)).getMaxFieldSize();
- verify(mysqlPreparedStatement, times(1)).setMaxRows(anyInt());
- verify(mysqlPreparedStatement, times(1)).getMaxRows();
- verify(mysqlPreparedStatement, times(1)).setEscapeProcessing(anyBoolean());
- verify(mysqlPreparedStatement, times(1)).getResultSetConcurrency();
- verify(mysqlPreparedStatement, times(1)).getResultSetConcurrency();
- verify(mysqlPreparedStatement, times(1)).getResultSetType();
- verify(mysqlPreparedStatement, times(1)).getMetaData();
- verify(mysqlPreparedStatement, times(1)).getParameterMetaData();
- verify(mysqlPreparedStatement, times(1)).getMoreResults(anyInt());
- verify(mysqlPreparedStatement, times(1)).setFetchSize(anyInt());
- verify(mysqlPreparedStatement, times(1)).getFetchSize();
- verify(mysqlPreparedStatement, times(1)).getQueryTimeout();
- verify(mysqlPreparedStatement, times(1)).setQueryTimeout(anyInt());
- verify(mysqlPreparedStatement, times(1)).getResultSet();
+ verify(mysqlPreparedStatement).getUpdateCount();
+ verify(mysqlPreparedStatement).getMoreResults();
+ verify(mysqlPreparedStatement).setFetchDirection(anyInt());
+ verify(mysqlPreparedStatement).getFetchDirection();
+ verify(mysqlPreparedStatement).getResultSetType();
+ verify(mysqlPreparedStatement).isClosed();
+ verify(mysqlPreparedStatement).setPoolable(anyBoolean());
+ verify(mysqlPreparedStatement).getWarnings();
+ verify(mysqlPreparedStatement).clearWarnings();
+ verify(mysqlPreparedStatement).setCursorName(anyString());
+ verify(mysqlPreparedStatement).setMaxFieldSize(anyInt());
+ verify(mysqlPreparedStatement).getMaxFieldSize();
+ verify(mysqlPreparedStatement).setMaxRows(anyInt());
+ verify(mysqlPreparedStatement).getMaxRows();
+ verify(mysqlPreparedStatement).setEscapeProcessing(anyBoolean());
+ verify(mysqlPreparedStatement).getResultSetConcurrency();
+ verify(mysqlPreparedStatement).getResultSetConcurrency();
+ verify(mysqlPreparedStatement).getResultSetType();
+ verify(mysqlPreparedStatement).getMetaData();
+ verify(mysqlPreparedStatement).getParameterMetaData();
+ verify(mysqlPreparedStatement).getMoreResults(anyInt());
+ verify(mysqlPreparedStatement).setFetchSize(anyInt());
+ verify(mysqlPreparedStatement).getFetchSize();
+ verify(mysqlPreparedStatement).getQueryTimeout();
+ verify(mysqlPreparedStatement).setQueryTimeout(anyInt());
+ verify(mysqlPreparedStatement).getResultSet();
assertThat(connection, CoreMatchers.<Connection>is(swConnection));
}
@@ -308,8 +308,8 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).executeQuery();
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).executeQuery();
+ verify(mysqlPreparedStatement).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -323,8 +323,8 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).execute();
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).execute();
+ verify(mysqlPreparedStatement).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -339,8 +339,8 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
preparedStatement.getGeneratedKeys();
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).executeQuery(anyString());
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).executeQuery(anyString());
+ verify(mysqlPreparedStatement).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -354,8 +354,8 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", 1);
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).execute(anyString(), anyInt());
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).execute(anyString(), anyInt());
+ verify(mysqlPreparedStatement).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -369,7 +369,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", new int[] {1, 2});
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -383,7 +383,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", new String[] {"1", "2"});
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -399,8 +399,8 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
preparedStatement.cancel();
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).execute(anyString());
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).execute(anyString());
+ verify(mysqlPreparedStatement).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -416,8 +416,8 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
preparedStatement.cancel();
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).executeUpdate();
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).executeUpdate();
+ verify(mysqlPreparedStatement).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -433,8 +433,8 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
preparedStatement.cancel();
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).executeUpdate(anyString());
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).executeUpdate(anyString());
+ verify(mysqlPreparedStatement).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -450,7 +450,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
preparedStatement.cancel();
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -465,7 +465,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
preparedStatement.cancel();
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -481,7 +481,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
preparedStatement.cancel();
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).close();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertThat(spans.size(), is(1));
@@ -497,9 +497,9 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
int[] resultSet = preparedStatement.executeBatch();
preparedStatement.clearBatch();
- verify(mysqlPreparedStatement, times(1)).executeBatch();
- verify(mysqlPreparedStatement, times(1)).addBatch();
- verify(mysqlPreparedStatement, times(1)).clearBatch();
+ verify(mysqlPreparedStatement).executeBatch();
+ verify(mysqlPreparedStatement).addBatch();
+ verify(mysqlPreparedStatement).clearBatch();
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
@@ -519,8 +519,8 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
preparedStatement.close();
- verify(mysqlPreparedStatement, times(1)).executeQuery();
- verify(mysqlPreparedStatement, times(1)).close();
+ verify(mysqlPreparedStatement).executeQuery();
+ verify(mysqlPreparedStatement).close();
}
@Test(expected = SQLException.class)
@@ -539,12 +539,12 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
preparedStatement.close();
} finally {
- verify(mysqlPreparedStatement, times(1)).executeQuery();
+ verify(mysqlPreparedStatement).executeQuery();
verify(mysqlPreparedStatement, times(0)).close();
- verify(mysqlPreparedStatement, times(1)).setBigDecimal(anyInt(), any(BigDecimal.class));
- verify(mysqlPreparedStatement, times(1)).setBlob(anyInt(), any(InputStream.class));
- verify(mysqlPreparedStatement, times(1)).setBlob(anyInt(), any(InputStream.class), anyLong());
- verify(mysqlPreparedStatement, times(1)).setByte(anyInt(), anyByte());
+ verify(mysqlPreparedStatement).setBigDecimal(anyInt(), any(BigDecimal.class));
+ verify(mysqlPreparedStatement).setBlob(anyInt(), any(InputStream.class));
+ verify(mysqlPreparedStatement).setBlob(anyInt(), any(InputStream.class), anyLong());
+ verify(mysqlPreparedStatement).setByte(anyInt(), anyByte());
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java
index 72dc6da..49ffc1f 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java
@@ -28,7 +28,6 @@ import org.mockito.runners.MockitoJUnitRunner;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
import redis.clients.jedis.HostAndPort;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
@@ -52,7 +51,7 @@ public class JedisClusterConstructorWithHostAndPortArgInterceptorTest {
@Test
public void onConstruct() throws Exception {
interceptor.onConstruct(enhancedInstance, new Object[] {new HostAndPort("127.0.0.1", 6379)});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField("127.0.0.1:6379");
+ verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:6379");
}
}
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java
index f152074..b2fbc81 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java
@@ -29,7 +29,6 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import redis.clients.jedis.HostAndPort;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
@@ -59,7 +58,7 @@ public class JedisClusterConstructorWithListHostAndPortArgInterceptorTest {
public void onConstruct() throws Exception {
interceptor.onConstruct(enhancedInstance, new Object[] {hostAndPortSet});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField("127.0.0.1:6379;127.0.0.1:16379;");
+ verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:6379;127.0.0.1:16379;");
}
}
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java
index aca152a..371bf75 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java
@@ -28,7 +28,6 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import redis.clients.jedis.JedisShardInfo;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
@@ -51,7 +50,7 @@ public class JedisConstructorWithShardInfoArgInterceptorTest {
public void onConstruct() throws Exception {
interceptor.onConstruct(enhancedInstance, new Object[] {new JedisShardInfo("127.0.0.1", 6379)});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField("127.0.0.1:6379");
+ verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:6379");
}
}
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java
index a1e9234..f645b7c 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java
@@ -26,7 +26,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
@@ -46,14 +45,14 @@ public class JedisConstructorWithStringArgInterceptorTest {
public void onConstruct() throws Exception {
interceptor.onConstruct(enhancedInstance, new Object[] {"127.0.0.1"});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField("127.0.0.1:6379");
+ verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:6379");
}
@Test
public void onConstructWithPort() {
interceptor.onConstruct(enhancedInstance, new Object[] {"127.0.0.1", 16379});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField("127.0.0.1:16379");
+ verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:16379");
}
}
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java
index 3b4264f..d22c7b2 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java
@@ -28,7 +28,6 @@ import org.mockito.Mock;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@RunWith(PowerMockRunner.class)
@@ -50,6 +49,6 @@ public class JedisConstructorWithUriArgInterceptorTest {
public void onConstruct() throws Exception {
interceptor.onConstruct(enhancedInstance, new Object[] {uri});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField("127.0.0.1:6379");
+ verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:6379");
}
}
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java
index 5972262..1f0f2b0 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java
@@ -48,7 +48,6 @@ import org.powermock.modules.junit4.PowerMockRunnerDelegate;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.apache.skywalking.apm.agent.test.tools.SpanAssert.assertComponent;
@@ -94,7 +93,7 @@ public class MotanConsumerInterceptorTest {
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertMotanConsumerSpan(spans.get(0));
- verify(request, times(1)).setAttachment(anyString(), anyString());
+ verify(request).setAttachment(anyString(), anyString());
}
@Test
@@ -112,7 +111,7 @@ public class MotanConsumerInterceptorTest {
private void assertTraceSegmentWhenOccurException(AbstractTracingSpan tracingSpan) {
assertMotanConsumerSpan(tracingSpan);
- verify(request, times(1)).setAttachment(anyString(), anyString());
+ verify(request).setAttachment(anyString(), anyString());
List<LogDataEntity> logDataEntities = SpanHelper.getLogs(tracingSpan);
assertThat(logDataEntities.size(), is(1));
SpanAssert.assertException(logDataEntities.get(0), RuntimeException.class);
diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionImplCreateInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionImplCreateInterceptorTest.java
index c71ed23..b333fb7 100644
--- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionImplCreateInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionImplCreateInterceptorTest.java
@@ -27,7 +27,6 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import static org.mockito.Mockito.verify;
-import static org.mockito.internal.verification.VerificationModeFactory.times;
/**
*
@@ -49,6 +48,6 @@ public class ConnectionImplCreateInterceptorTest {
@Test
public void testResultIsEnhanceInstance() throws Throwable {
interceptor.afterMethod(null,null,new Object[]{"localhost",3360,null,"test","jdbc:mysql:replication://localhost:3360,localhost:3360,localhost:3360/test?useUnicode=true&characterEncoding=utf8&useSSL=false&roundRobinLoadBalance=true"},null,objectInstance);
- verify(objectInstance,times(1)).setSkyWalkingDynamicField(Matchers.any());
+ verify(objectInstance).setSkyWalkingDynamicField(Matchers.any());
}
}
\ No newline at end of file
diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionImplCreateInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionImplCreateInterceptorTest.java
index 2022d24..a4f95bc 100644
--- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionImplCreateInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionImplCreateInterceptorTest.java
@@ -28,7 +28,6 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import static org.mockito.Mockito.verify;
-import static org.mockito.internal.verification.VerificationModeFactory.times;
/**
*
@@ -52,6 +51,6 @@ public class ConnectionImplCreateInterceptorTest {
final ConnectionUrlParser connectionUrlParser = ConnectionUrlParser.parseConnectionString("jdbc:mysql:replication://localhost:3360,localhost:3360,localhost:3360/test?useUnicode=true&characterEncoding=utf8&useSSL=false&roundRobinLoadBalance=true");
interceptor.afterMethod(null,null,connectionUrlParser.getHosts().toArray(),null,objectInstance);
- verify(objectInstance,times(1)).setSkyWalkingDynamicField(Matchers.any());
+ verify(objectInstance).setSkyWalkingDynamicField(Matchers.any());
}
}
\ No newline at end of file
diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptorTest.java
index 9ccb856..569c1a7 100644
--- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptorTest.java
@@ -56,7 +56,7 @@ public class CreateCallableStatementInterceptorTest {
@Test
public void testResultIsEnhanceInstance() throws Throwable {
interceptor.afterMethod(objectInstance, null, new Object[] {"SELECT * FROM test"}, null, ret);
- verify(ret, times(1)).setSkyWalkingDynamicField(Matchers.any());
+ verify(ret).setSkyWalkingDynamicField(Matchers.any());
}
@Test
diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptorTest.java
index 9806db0..4d6d829 100644
--- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptorTest.java
@@ -55,7 +55,7 @@ public class CreatePreparedStatementInterceptorTest {
@Test
public void testResultIsEnhanceInstance() throws Throwable {
interceptor.afterMethod(objectInstance, null, new Object[] {"SELECT * FROM test"}, null, ret);
- verify(ret, times(1)).setSkyWalkingDynamicField(Matchers.any());
+ verify(ret).setSkyWalkingDynamicField(Matchers.any());
}
@Test
diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptorTest.java
index e22db05..b50fdbe 100644
--- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptorTest.java
@@ -56,7 +56,7 @@ public class CreateStatementInterceptorTest {
@Test
public void testResultIsEnhanceInstance() throws Throwable {
interceptor.afterMethod(objectInstance, null, new Object[] {"SELECT * FROM test"}, null, ret);
- verify(ret, times(1)).setSkyWalkingDynamicField(Matchers.any());
+ verify(ret).setSkyWalkingDynamicField(Matchers.any());
}
@Test
diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderInterceptorTest.java
index 1512824..9731766 100644
--- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderInterceptorTest.java
@@ -46,7 +46,6 @@ import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -91,7 +90,7 @@ public class SenderInterceptorTest {
public void test_constructor() {
Request request = Request.create("https://nutz.cn/yvr/list", METHOD.GET);
constructorInterceptPoint.onConstruct(enhancedInstance, new Object[] {request});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField(request);
+ verify(enhancedInstance).setSkyWalkingDynamicField(request);
}
@Test
@@ -115,7 +114,7 @@ public class SenderInterceptorTest {
protected void _sender_sender_test() throws Throwable {
Request request = Request.create("https://nutz.cn/yvr/list", METHOD.GET);
constructorInterceptPoint.onConstruct(enhancedInstance, new Object[] {request});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField(request);
+ verify(enhancedInstance).setSkyWalkingDynamicField(request);
when(enhancedInstance.getSkyWalkingDynamicField()).thenReturn(request);
when(resp.getStatus()).thenReturn(200);
diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptorTest.java
index 283bae5..935f6df 100644
--- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptorTest.java
@@ -46,7 +46,6 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.powermock.api.mockito.PowerMockito.when;
@@ -111,8 +110,8 @@ public class MessageSendInterceptorTest {
SpanAssert.assertLayer(mqSpan, SpanLayer.MQ);
SpanAssert.assertComponent(mqSpan, ComponentsDefine.ROCKET_MQ_PRODUCER);
SpanAssert.assertTag(mqSpan, 0, "127.0.0.1");
- verify(messageRequestHeader, times(1)).setProperties(anyString());
- verify(callBack, times(1)).setSkyWalkingDynamicField(Matchers.any());
+ verify(messageRequestHeader).setProperties(anyString());
+ verify(callBack).setSkyWalkingDynamicField(Matchers.any());
}
@Test
@@ -130,7 +129,7 @@ public class MessageSendInterceptorTest {
SpanAssert.assertLayer(mqSpan, SpanLayer.MQ);
SpanAssert.assertComponent(mqSpan, ComponentsDefine.ROCKET_MQ_PRODUCER);
SpanAssert.assertTag(mqSpan, 0, "127.0.0.1");
- verify(messageRequestHeader, times(1)).setProperties(anyString());
+ verify(messageRequestHeader).setProperties(anyString());
}
}
diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptorTest.java
index 7c3d762..1c41f7f 100644
--- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptorTest.java
@@ -46,7 +46,6 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.powermock.api.mockito.PowerMockito.when;
@@ -111,8 +110,8 @@ public class MessageSendInterceptorTest {
SpanAssert.assertLayer(mqSpan, SpanLayer.MQ);
SpanAssert.assertComponent(mqSpan, ComponentsDefine.ROCKET_MQ_PRODUCER);
SpanAssert.assertTag(mqSpan, 0, "127.0.0.1");
- verify(messageRequestHeader, times(1)).setProperties(anyString());
- verify(callBack, times(1)).setSkyWalkingDynamicField(Matchers.any());
+ verify(messageRequestHeader).setProperties(anyString());
+ verify(callBack).setSkyWalkingDynamicField(Matchers.any());
}
@Test
@@ -130,7 +129,7 @@ public class MessageSendInterceptorTest {
SpanAssert.assertLayer(mqSpan, SpanLayer.MQ);
SpanAssert.assertComponent(mqSpan, ComponentsDefine.ROCKET_MQ_PRODUCER);
SpanAssert.assertTag(mqSpan, 0, "127.0.0.1");
- verify(messageRequestHeader, times(1)).setProperties(anyString());
+ verify(messageRequestHeader).setProperties(anyString());
}
}
diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptorTest.java
index 0d8aa41..4ca96f9 100644
--- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptorTest.java
@@ -51,7 +51,6 @@ import org.powermock.modules.junit4.PowerMockRunnerDelegate;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -119,7 +118,7 @@ public class ProducerOperationHandlerInterceptorTest {
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertCombSpan(spans.get(0));
- verify(invocation, times(1)).getContext();
+ verify(invocation).getContext();
}
private void assertCombSpan(AbstractTracingSpan span) {
diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptorTest.java
index e32ffb0..fd27938 100644
--- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptorTest.java
@@ -51,7 +51,6 @@ import org.powermock.modules.junit4.PowerMockRunnerDelegate;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -114,7 +113,7 @@ public class TransportClientHandlerInterceptorTest {
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertCombSpan(spans.get(0));
- verify(invocation, times(1)).getContext();
+ verify(invocation).getContext();
}
private void assertCombSpan(AbstractTracingSpan span) {
diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptorTest.java
index 81495bb..00ecffd 100644
--- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptorTest.java
@@ -51,7 +51,6 @@ import org.powermock.modules.junit4.PowerMockRunnerDelegate;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -119,7 +118,7 @@ public class ProducerOperationHandlerInterceptorTest {
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertCombSpan(spans.get(0));
- verify(invocation, times(1)).getContext();
+ verify(invocation).getContext();
}
private void assertCombSpan(AbstractTracingSpan span) {
diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptorTest.java
index 3e7a376..959ad36 100644
--- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptorTest.java
@@ -51,7 +51,6 @@ import org.powermock.modules.junit4.PowerMockRunnerDelegate;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -114,7 +113,7 @@ public class TransportClientHandlerInterceptorTest {
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
List<AbstractTracingSpan> spans = SegmentHelper.getSpans(traceSegment);
assertCombSpan(spans.get(0));
- verify(invocation, times(1)).getContext();
+ verify(invocation).getContext();
}
private void assertCombSpan(AbstractTracingSpan span) {
diff --git a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java
index 3c92ffc..4d920d2 100644
--- a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java
@@ -29,7 +29,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
@@ -52,6 +51,6 @@ public class MemcachedConstructorWithInetSocketAddressListArgInterceptorTest {
inetSocketAddressList.add(new InetSocketAddress("127.0.0.2", 11211));
interceptor.onConstruct(enhancedInstance, new Object[] {null, inetSocketAddressList});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField("127.0.0.1:11211;127.0.0.2:11211");
+ verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:11211;127.0.0.2:11211");
}
}
diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptorTest.java
index d09038d..a91af96 100644
--- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptorTest.java
@@ -19,7 +19,6 @@
package org.apache.skywalking.apm.plugin.xmemcached.v2;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.net.InetSocketAddress;
@@ -52,6 +51,6 @@ public class XMemcachedConstructorWithComplexArgInterceptorTest {
inetSocketAddressMap.put(new InetSocketAddress("127.0.0.1", 11211), new InetSocketAddress("127.0.0.2", 11211));
interceptor.onConstruct(enhancedInstance, new Object[]{null, null, null, null, null, null, inetSocketAddressMap});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField("127.0.0.1:11211;127.0.0.2:11211");
+ verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:11211;127.0.0.2:11211");
}
}
diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptorTest.java
index 179a450..165746f 100644
--- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptorTest.java
@@ -19,7 +19,6 @@
package org.apache.skywalking.apm.plugin.xmemcached.v2;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
@@ -46,6 +45,6 @@ public class XMemcachedConstructorWithHostPortArgInterceptorTest {
public void onConstructWithHostPort() {
interceptor.onConstruct(enhancedInstance, new Object[]{"127.0.0.1", 11211});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField("127.0.0.1:11211");
+ verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:11211");
}
}
diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptorTest.java
index 1f715e6..ca658c0 100644
--- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptorTest.java
@@ -19,7 +19,6 @@
package org.apache.skywalking.apm.plugin.xmemcached.v2;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.net.InetSocketAddress;
@@ -48,6 +47,6 @@ public class XMemcachedConstructorWithInetSocketAddressArgInterceptorTest {
public void onConstructWithInetSocketAddress() {
interceptor.onConstruct(enhancedInstance, new Object[]{new InetSocketAddress("127.0.0.1", 11211)});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField("127.0.0.1:11211");
+ verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:11211");
}
}
diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java
index 69df20c..847cfc2 100644
--- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java
+++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java
@@ -19,7 +19,6 @@
package org.apache.skywalking.apm.plugin.xmemcached.v2;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.net.InetSocketAddress;
@@ -53,6 +52,6 @@ public class XMemcachedConstructorWithInetSocketAddressListArgInterceptorTest {
inetSocketAddressList.add(new InetSocketAddress("127.0.0.2", 11211));
interceptor.onConstruct(enhancedInstance, new Object[]{inetSocketAddressList});
- verify(enhancedInstance, times(1)).setSkyWalkingDynamicField("127.0.0.1:11211;127.0.0.2:11211");
+ verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:11211;127.0.0.2:11211");
}
}