This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch 2.6.4-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.4-release by this push:
new 3750059 change port for unit test
new f7baac7 Merge branch '2.6.4-release' of
github.com:apache/incubator-dubbo into 2.6.4-release
3750059 is described below
commit 37500590723f88f7729d58ebc6d03ec2b1b90a3e
Author: zhuyong <[email protected]>
AuthorDate: Mon Sep 17 14:59:15 2018 +0800
change port for unit test
---
.../java/com/alibaba/dubbo/config/spring/ConfigTest.java | 4 ++--
.../com/alibaba/dubbo/config/spring/delay-fixed-time.xml | 2 +-
.../com/alibaba/dubbo/config/spring/delay-on-initialized.xml | 2 +-
.../rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java | 2 +-
.../rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java | 12 ++++++------
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
index eb36627..c8eaee2 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
@@ -244,7 +244,7 @@ public class ConfigTest {
}
assertNotNull(urls);
assertEquals(1, urls.size());
- assertEquals("dubbo://" + NetUtils.getLocalHost() +
":20883/com.alibaba.dubbo.config.spring.api.DemoService",
urls.get(0).toIdentityString());
+ assertEquals("dubbo://" + NetUtils.getLocalHost() +
":20888/com.alibaba.dubbo.config.spring.api.DemoService",
urls.get(0).toIdentityString());
} finally {
ctx.stop();
ctx.close();
@@ -262,7 +262,7 @@ public class ConfigTest {
List<URL> urls =
registryService.getRegistered().get("com.alibaba.dubbo.config.spring.api.DemoService");
assertNotNull(urls);
assertEquals(1, urls.size());
- assertEquals("dubbo://" + NetUtils.getLocalHost() +
":20883/com.alibaba.dubbo.config.spring.api.DemoService",
urls.get(0).toIdentityString());
+ assertEquals("dubbo://" + NetUtils.getLocalHost() +
":20888/com.alibaba.dubbo.config.spring.api.DemoService",
urls.get(0).toIdentityString());
} finally {
ctx.stop();
ctx.close();
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-fixed-time.xml
b/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-fixed-time.xml
index 0fc5cb2..ad5ecf8 100644
---
a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-fixed-time.xml
+++
b/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-fixed-time.xml
@@ -25,7 +25,7 @@
<dubbo:registry address="N/A"/>
- <dubbo:protocol name="dubbo" port="20883"/>
+ <dubbo:protocol name="dubbo" port="20888"/>
<dubbo:service interface="com.alibaba.dubbo.config.spring.api.DemoService"
ref="demoService" delay="300"/>
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-on-initialized.xml
b/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-on-initialized.xml
index 2efac44..dcbcdf0 100644
---
a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-on-initialized.xml
+++
b/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-on-initialized.xml
@@ -28,7 +28,7 @@
<dubbo:registry address="127.0.0.1:4548"/>
<!-- protocol configuration -->
- <dubbo:protocol name="dubbo" port="20883"/>
+ <dubbo:protocol name="dubbo" port="20888"/>
<!-- service configuration -->
<dubbo:service interface="com.alibaba.dubbo.config.spring.api.DemoService"
ref="demoService" delay="-1"/>
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java
index dfe7b69..d4dd4c9 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java
@@ -64,7 +64,7 @@ public class ChangeTelnetHandlerTest {
mockChannel.removeAttribute("telnet.service");
givenLastCall();
given(mockInvoker.getInterface()).willReturn(DemoService.class);
-
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20883/demo"));
+
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20884/demo"));
}
private void givenLastCall() {
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
index 9dfc20f..eb4368d 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
@@ -57,12 +57,12 @@ public class InvokerTelnetHandlerTest {
public void testInvokeDefaultSService() throws RemotingException {
mockInvoker = mock(Invoker.class);
given(mockInvoker.getInterface()).willReturn(DemoService.class);
-
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20883/demo"));
+
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20886/demo"));
given(mockInvoker.invoke(any(Invocation.class))).willReturn(new
RpcResult("ok"));
mockChannel = mock(Channel.class);
given(mockChannel.getAttribute("telnet.service")).willReturn("com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService");
given(mockChannel.getLocalAddress()).willReturn(NetUtils.toAddress("127.0.0.1:5555"));
-
given(mockChannel.getRemoteAddress()).willReturn(NetUtils.toAddress("127.0.0.1:20883"));
+
given(mockChannel.getRemoteAddress()).willReturn(NetUtils.toAddress("127.0.0.1:20886"));
DubboProtocol.getDubboProtocol().export(mockInvoker);
String result = invoke.telnet(mockChannel, "DemoService.echo(\"ok\")");
@@ -74,12 +74,12 @@ public class InvokerTelnetHandlerTest {
public void testInvokeByPassingNullValue() throws RemotingException {
mockInvoker = mock(Invoker.class);
given(mockInvoker.getInterface()).willReturn(DemoService.class);
-
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20883/demo"));
+
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20886/demo"));
given(mockInvoker.invoke(any(Invocation.class))).willReturn(new
RpcResult("ok"));
mockChannel = mock(Channel.class);
given(mockChannel.getAttribute("telnet.service")).willReturn("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService");
given(mockChannel.getLocalAddress()).willReturn(NetUtils.toAddress("127.0.0.1:5555"));
-
given(mockChannel.getRemoteAddress()).willReturn(NetUtils.toAddress("127.0.0.1:20883"));
+
given(mockChannel.getRemoteAddress()).willReturn(NetUtils.toAddress("127.0.0.1:20886"));
DubboProtocol.getDubboProtocol().export(mockInvoker);
// pass null value to parameter of primitive type
try {
@@ -109,12 +109,12 @@ public class InvokerTelnetHandlerTest {
public void testInvokeAutoFindMethod() throws RemotingException {
mockInvoker = mock(Invoker.class);
given(mockInvoker.getInterface()).willReturn(DemoService.class);
-
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20883/demo"));
+
given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20886/demo"));
given(mockInvoker.invoke(any(Invocation.class))).willReturn(new
RpcResult("ok"));
mockChannel = mock(Channel.class);
given(mockChannel.getAttribute("telnet.service")).willReturn(null);
given(mockChannel.getLocalAddress()).willReturn(NetUtils.toAddress("127.0.0.1:5555"));
-
given(mockChannel.getRemoteAddress()).willReturn(NetUtils.toAddress("127.0.0.1:20883"));
+
given(mockChannel.getRemoteAddress()).willReturn(NetUtils.toAddress("127.0.0.1:20886"));
DubboProtocol.getDubboProtocol().export(mockInvoker);
String result = invoke.telnet(mockChannel, "echo(\"ok\")");
