This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 6649dd8 fix uts
6649dd8 is described below
commit 6649dd8ca602ee3d57dac8fce18d2047b3f886fa
Author: ken.lj <[email protected]>
AuthorDate: Tue Jul 21 13:57:42 2020 +0800
fix uts
---
.../dubbo/monitor/dubbo/MetricsFilterTest.java | 20 ++++++++++----------
.../dubbo/rpc/protocol/rest/RestProtocolTest.java | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/MetricsFilterTest.java
b/dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/MetricsFilterTest.java
index c1808c5..0583259 100644
---
a/dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/MetricsFilterTest.java
+++
b/dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/MetricsFilterTest.java
@@ -116,7 +116,7 @@ public class MetricsFilterTest {
IMetricManager metricManager = MetricManager.getIMetricManager();
metricManager.clear();
MetricsFilter metricsFilter = new MetricsFilter();
- Invocation invocation = new RpcInvocation("sayName",
DemoService.class.getName(), new Class<?>[]{Integer.class}, new Object[0]);
+ Invocation invocation = new RpcInvocation("sayName",
DemoService.class.getName(), "", new Class<?>[]{Integer.class}, new Object[0]);
RpcContext.getContext().setRemoteAddress(NetUtils.getLocalHost(),
20880).setLocalAddress(NetUtils.getLocalHost(), 2345);
RpcContext.getContext().setUrl(serviceInvoker.getUrl().addParameter(SIDE_KEY,
CONSUMER_SIDE));
AppResponse response = AppResponseBuilder.create()
@@ -144,7 +144,7 @@ public class MetricsFilterTest {
IMetricManager metricManager = MetricManager.getIMetricManager();
metricManager.clear();
MetricsFilter metricsFilter = new MetricsFilter();
- Invocation invocation = new RpcInvocation("timeoutException",
DemoService.class.getName(), null, null);
+ Invocation invocation = new RpcInvocation("timeoutException",
DemoService.class.getName(), "", null, null);
RpcContext.getContext().setRemoteAddress(NetUtils.getLocalHost(),
20880).setLocalAddress(NetUtils.getLocalHost(), 2345);
RpcContext.getContext().setUrl(timeoutInvoker.getUrl().addParameter(SIDE_KEY,
CONSUMER_SIDE)
.addParameter(TIMEOUT_KEY, 300));
@@ -177,7 +177,7 @@ public class MetricsFilterTest {
IMetricManager metricManager = MetricManager.getIMetricManager();
metricManager.clear();
MetricsFilter metricsFilter = new MetricsFilter();
- Invocation invocation = new RpcInvocation("sayName",
DemoService.class.getName(), new Class<?>[0], new Object[0]);
+ Invocation invocation = new RpcInvocation("sayName",
DemoService.class.getName(), "", new Class<?>[0], new Object[0]);
RpcContext.getContext().setRemoteAddress(NetUtils.getLocalHost(),
20880).setLocalAddress(NetUtils.getLocalHost(), 2345);
RpcContext.getContext().setUrl(serviceInvoker.getUrl().addParameter(SIDE_KEY,
PROVIDER));
AppResponse response = AppResponseBuilder.create()
@@ -204,7 +204,7 @@ public class MetricsFilterTest {
IMetricManager metricManager = MetricManager.getIMetricManager();
metricManager.clear();
MetricsFilter metricsFilter = new MetricsFilter();
- Invocation invocation = new RpcInvocation("sayName",
DemoService.class.getName(), new Class<?>[0], new Object[0]);
+ Invocation invocation = new RpcInvocation("sayName",
DemoService.class.getName(), "", new Class<?>[0], new Object[0]);
RpcContext.getContext().setRemoteAddress(NetUtils.getLocalHost(),
20880).setLocalAddress(NetUtils.getLocalHost(), 2345);
RpcContext.getContext().setUrl(serviceInvoker.getUrl().addParameter(SIDE_KEY,
PROVIDER_SIDE)
.addParameter(TIMEOUT_KEY, 300));
@@ -222,7 +222,7 @@ public class MetricsFilterTest {
Protocol protocol = new DubboProtocol();
URL url = URL.valueOf("dubbo://" +
NetUtils.getLocalAddress().getHostName() + ":20880/" +
MetricsService.class.getName());
Invoker<MetricsService> invoker = protocol.refer(MetricsService.class,
url);
- invocation = new RpcInvocation("getMetricsByGroup",
DemoService.class.getName(), new Class<?>[]{String.class}, new
Object[]{DUBBO_GROUP});
+ invocation = new RpcInvocation("getMetricsByGroup",
DemoService.class.getName(), "", new Class<?>[]{String.class}, new
Object[]{DUBBO_GROUP});
try {
Thread.sleep(5000);
} catch (Exception e) {
@@ -251,13 +251,13 @@ public class MetricsFilterTest {
IMetricManager metricManager = MetricManager.getIMetricManager();
metricManager.clear();
MetricsFilter metricsFilter = new MetricsFilter();
- Invocation sayNameInvocation = new RpcInvocation("sayName",
DemoService.class.getName(), new Class<?>[0], new Object[0]);
- Invocation echoInvocation = new RpcInvocation("echo",
DemoService.class.getName(), new Class<?>[]{Integer.class}, new Integer[]{1});
+ Invocation sayNameInvocation = new RpcInvocation("sayName",
DemoService.class.getName(), "", new Class<?>[0], new Object[0]);
+ Invocation echoInvocation = new RpcInvocation("echo",
DemoService.class.getName(), "", new Class<?>[]{Integer.class}, new
Integer[]{1});
RpcContext.getContext().setRemoteAddress(NetUtils.getLocalHost(),
20880).setLocalAddress(NetUtils.getLocalHost(), 2345);
RpcContext.getContext().setUrl(serviceInvoker.getUrl().addParameter(SIDE_KEY,
PROVIDER_SIDE)
- .addParameter(TIMEOUT_KEY, 300));
+ .addParameter(TIMEOUT_KEY, 300));
AppResponse response = AppResponseBuilder.create()
- .build();
+ .build();
onInvokeReturns(response);
for (int i = 0; i < 50; i++) {
metricsFilter.invoke(serviceInvoker, sayNameInvocation);
@@ -277,7 +277,7 @@ public class MetricsFilterTest {
Protocol protocol = new DubboProtocol();
URL url = URL.valueOf("dubbo://" +
NetUtils.getLocalAddress().getHostName() + ":20880/" +
MetricsService.class.getName());
Invoker<MetricsService> invoker = protocol.refer(MetricsService.class,
url);
- Invocation invocation = new RpcInvocation("getMetricsByGroup",
DemoService.class.getName(), new Class<?>[]{String.class}, new
Object[]{DUBBO_GROUP});
+ Invocation invocation = new RpcInvocation("getMetricsByGroup",
DemoService.class.getName(), "", new Class<?>[]{String.class}, new
Object[]{DUBBO_GROUP});
try {
Thread.sleep(15000);
} catch (Exception e) {
diff --git
a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java
b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java
index b07997f..c6eaba9 100644
---
a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java
+++
b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java
@@ -177,7 +177,7 @@ public class RestProtocolTest {
Exporter<DemoService> exporter =
protocol.export(proxy.getInvoker(server, DemoService.class, exportUrl));
- RpcInvocation rpcInvocation = new RpcInvocation("hello",
DemoService.class.getName(), new Class[]{Integer.class, Integer.class}, new
Integer[]{2, 3});
+ RpcInvocation rpcInvocation = new RpcInvocation("hello",
DemoService.class.getName(), "", new Class[]{Integer.class, Integer.class}, new
Integer[]{2, 3});
Result result = exporter.getInvoker().invoke(rpcInvocation);
assertThat(result.getValue(), CoreMatchers.<Object>is(5));
