This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 37fa49f refactor agent test (#9052)
37fa49f is described below
commit 37fa49f31feb931a8b2d333b5aad17db7f36b2bd
Author: xiaoyu <[email protected]>
AuthorDate: Fri Jan 15 18:06:21 2021 +0800
refactor agent test (#9052)
---
.../shardingsphere/agent/plugin/tracing/advice/AdviceTestBase.java | 1 -
.../shardingsphere/agent/plugin/tracing/rule/CollectorRule.java | 1 -
.../shardingsphere/agent/plugin/tracing/rule/JaegerCollector.java | 1 +
.../plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java | 5 ++---
.../tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java | 5 ++---
.../plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java | 6 ++----
6 files changed, 7 insertions(+), 12 deletions(-)
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AdviceTestBase.java
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AdviceTestBase.java
index c1fd50e..bb2de27 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AdviceTestBase.java
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AdviceTestBase.java
@@ -23,5 +23,4 @@ public interface AdviceTestBase {
* Prepare env for testing.
*/
void prepare();
-
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/rule/CollectorRule.java
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/rule/CollectorRule.java
index 3fda4b3..370e08c 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/rule/CollectorRule.java
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/rule/CollectorRule.java
@@ -23,5 +23,4 @@ public interface CollectorRule {
* Clean up the collector.
*/
void cleanup();
-
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/rule/JaegerCollector.java
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/rule/JaegerCollector.java
index 962d20b..6b9ee76 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/rule/JaegerCollector.java
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/rule/JaegerCollector.java
@@ -27,6 +27,7 @@ import org.mockito.internal.util.reflection.FieldReader;
import java.util.List;
public class JaegerCollector extends ExternalResource implements CollectorRule
{
+
private MockTracer tracer;
@Override
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
index 920a081..f1ff4c9 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
@@ -46,7 +46,7 @@ public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutor
}
@Test
- public void testMethod() {
+ public void assertMethod() {
advice.beforeMethod(getTargetObject(), null, new Object[]{}, new
MethodInvocationResult());
advice.afterMethod(getTargetObject(), null, new Object[]{}, new
MethodInvocationResult());
Span span = collector.pop();
@@ -59,7 +59,7 @@ public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutor
}
@Test
- public void testExceptionHandle() {
+ public void assertExceptionHandle() {
advice.beforeMethod(getTargetObject(), null, new Object[]{}, new
MethodInvocationResult());
advice.onThrowing(getTargetObject(), null, new Object[]{}, new
IOException());
advice.afterMethod(getTargetObject(), null, new Object[]{}, new
MethodInvocationResult());
@@ -72,5 +72,4 @@ public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutor
assertThat(tags.get(ZipkinConstants.Tags.CONNECTION_COUNT), is("0"));
assertThat(span.name(),
is("/ShardingSphere/rootInvoke/".toLowerCase()));
}
-
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
index fe11221..18a3991 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
@@ -48,7 +48,7 @@ public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCa
}
@Test
- public void testMethod() {
+ public void assertMethod() {
advice.beforeMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, new
MethodInvocationResult());
advice.afterMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, new
MethodInvocationResult());
Span span = collector.pop();
@@ -65,7 +65,7 @@ public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCa
}
@Test
- public void testExceptionHandle() {
+ public void assertExceptionHandle() {
advice.beforeMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, new
MethodInvocationResult());
advice.onThrowing(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, new IOException());
advice.afterMethod(getTargetObject(), null, new
Object[]{getExecutionUnit(), false, getExtraMap()}, new
MethodInvocationResult());
@@ -82,5 +82,4 @@ public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCa
assertThat(tags.get(ZipkinConstants.Tags.PEER_PORT), is("1000"));
assertThat(tags.get("error"), is("IOException"));
}
-
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
index ae5e84c..372ccb3 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
@@ -56,7 +56,7 @@ public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdvi
}
@Test
- public void testMethod() {
+ public void assertMethod() {
advice.beforeMethod(getTargetObject(), null, new Object[]{SQL_STMT,
true}, new MethodInvocationResult());
advice.afterMethod(getTargetObject(), null, new Object[]{SQL_STMT,
true}, new MethodInvocationResult());
parentSpan.finish();
@@ -70,11 +70,10 @@ public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdvi
}
@Test
- public void testExceptionHandle() {
+ public void assertExceptionHandle() {
advice.beforeMethod(getTargetObject(), null, new Object[]{SQL_STMT,
true}, new MethodInvocationResult());
advice.onThrowing(getTargetObject(), null, new Object[]{SQL_STMT,
true}, new IOException());
advice.afterMethod(getTargetObject(), null, new Object[]{SQL_STMT,
true}, new MethodInvocationResult());
- // ensure the parent span(mock) finished
parentSpan.finish();
zipkin2.Span span = collector.pop();
assertNotNull(span);
@@ -85,5 +84,4 @@ public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdvi
assertThat(tags.get(ZipkinConstants.Tags.DB_TYPE),
is(ZipkinConstants.DB_TYPE_VALUE));
assertThat(tags.get(ZipkinConstants.Tags.COMPONENT),
is(ZipkinConstants.COMPONENT_NAME));
}
-
}
