Skip to content

S
SkyWalking

apache / SkyWalking
上一次同步 1 年多

通知 302
Star 21345
Fork 6091
S
SkyWalking

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 19d9c56f 编写于 作者: S SataQiu 提交者： wu-sheng
浏览文件
操作

Clean up unnecessary times(1) for test verify (#2619) 

* clean up unnecessary times(1) for test verify

* format code

* fix checkstyle
上级 ba73d342
展开全部 隐藏空白更改
内联 并排
Showing with 352 addition and 376 deletion
apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriterTest.java
浏览文件 @ 19d9c56f
......@@ -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
......
apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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) {
......
apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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());
}
......
apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnectionTest.java
浏览文件 @ 19d9c56f
......@@ -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));
}
}
apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWStatementTest.java
浏览文件 @ 19d9c56f
......@@ -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));
......
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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");
}
}
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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;");
}
}
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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");
}
}
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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");
}
}
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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");
}
}
apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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);
......
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionImplCreateInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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
apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionImplCreateInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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
apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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
......
apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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
......
apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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
......
apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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);
......
apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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());
}
}
apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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());
}
}
apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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) {
......
apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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) {
......
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
浏览文件 @ 19d9c56f
......@@ -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) {
......
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
浏览文件 @ 19d9c56f
......@@ -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) {
......
apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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");
}
}
apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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");
}
}
apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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");
}
}
apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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");
}
}
apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java
浏览文件 @ 19d9c56f
......@@ -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");
}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或