You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/07/11 13:18:32 UTC
[dubbo] branch 3.0 updated: remove hard code about port in
URLBuilderTest and ProtocolConfigTest (#8252)
This is an automated email from the ASF dual-hosted git repository.
albumenj 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 b722a20 remove hard code about port in URLBuilderTest and ProtocolConfigTest (#8252)
b722a20 is described below
commit b722a201e9b91b7023a09fb886cdf32ba5ad654e
Author: huijingxu <38...@users.noreply.github.com>
AuthorDate: Sun Jul 11 21:18:22 2021 +0800
remove hard code about port in URLBuilderTest and ProtocolConfigTest (#8252)
Co-authored-by: xuhuijing <hu...@Ctrip.com>
---
.../org/apache/dubbo/common/URLBuilderTest.java | 11 +++--
.../apache/dubbo/config/ProtocolConfigTest.java | 48 +++++++++++++---------
2 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/URLBuilderTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/URLBuilderTest.java
index c3dd499..7abdda6 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/URLBuilderTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/URLBuilderTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.common;
+import org.apache.dubbo.common.utils.NetUtils;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
@@ -48,26 +49,28 @@ public class URLBuilderTest {
@Test
public void shouldSet() {
URL url1 = URL.valueOf("dubbo://admin:hello1234@10.20.130.230:20880/context/path?version=1.0.0&application=morgan");
+ int port = NetUtils.getAvailablePort();
URL url2 = URLBuilder.from(url1)
.setProtocol("rest")
.setUsername("newUsername")
.setPassword("newPassword")
.setHost("newHost")
.setPath("newContext")
- .setPort(1234)
+ .setPort(port)
.build();
assertThat(url2.getProtocol(), equalTo("rest"));
assertThat(url2.getUsername(), equalTo("newUsername"));
assertThat(url2.getPassword(), equalTo("newPassword"));
assertThat(url2.getHost(), equalTo("newHost"));
- assertThat(url2.getPort(), equalTo(1234));
+ assertThat(url2.getPort(), equalTo(port));
assertThat(url2.getPath(), equalTo("newContext"));
+ int port2 = NetUtils.getAvailablePort();
url2 = URLBuilder.from(url1)
- .setAddress("newHost2:2345")
+ .setAddress("newHost2:"+ port2)
.build();
assertThat(url2.getHost(), equalTo("newHost2"));
- assertThat(url2.getPort(), equalTo(2345));
+ assertThat(url2.getPort(), equalTo(port2));
}
@Test
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ProtocolConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ProtocolConfigTest.java
index 23ab315..11aea9d 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ProtocolConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ProtocolConfigTest.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.config;
+import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.context.ConfigManager;
import org.junit.jupiter.api.AfterEach;
@@ -30,9 +31,7 @@ import java.util.HashMap;
import java.util.Map;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.*;
public class ProtocolConfigTest {
@@ -71,10 +70,11 @@ public class ProtocolConfigTest {
@Test
public void testPort() throws Exception {
ProtocolConfig protocol = new ProtocolConfig();
- protocol.setPort(8080);
+ int port = NetUtils.getAvailablePort();
+ protocol.setPort(port);
Map<String, String> parameters = new HashMap<String, String>();
ProtocolConfig.appendParameters(parameters, protocol);
- assertThat(protocol.getPort(), equalTo(8080));
+ assertThat(protocol.getPort(), equalTo(port));
assertThat(parameters.isEmpty(), is(true));
}
@@ -228,10 +228,11 @@ public class ProtocolConfigTest {
@Test
public void testOverrideEmptyConfig() {
+ int port = NetUtils.getAvailablePort();
//dubbo.protocol.name=rest
- //dubbo.protocol.port=1234
+ //dubbo.protocol.port=port
SysProps.setProperty("dubbo.protocol.name", "rest");
- SysProps.setProperty("dubbo.protocol.port", "1234");
+ SysProps.setProperty("dubbo.protocol.port", String.valueOf(port));
try {
ProtocolConfig protocolConfig = new ProtocolConfig();
@@ -242,14 +243,15 @@ public class ProtocolConfigTest {
.initialize();
Assertions.assertEquals("rest", protocolConfig.getName());
- Assertions.assertEquals(1234, protocolConfig.getPort());
+ Assertions.assertEquals(port, protocolConfig.getPort());
} finally {
}
}
@Test
public void testOverrideConfigByName() {
- SysProps.setProperty("dubbo.protocols.rest.port", "1234");
+ int port = NetUtils.getAvailablePort();
+ SysProps.setProperty("dubbo.protocols.rest.port", String.valueOf(port));
try {
ProtocolConfig protocolConfig = new ProtocolConfig();
@@ -261,15 +263,16 @@ public class ProtocolConfigTest {
.initialize();
Assertions.assertEquals("rest", protocolConfig.getName());
- Assertions.assertEquals(1234, protocolConfig.getPort());
+ Assertions.assertEquals(port, protocolConfig.getPort());
} finally {
}
}
@Test
public void testOverrideConfigById() {
+ int port = NetUtils.getAvailablePort();
SysProps.setProperty("dubbo.protocols.rest1.name", "rest");
- SysProps.setProperty("dubbo.protocols.rest1.port", "1234");
+ SysProps.setProperty("dubbo.protocols.rest1.port", String.valueOf(port));
try {
ProtocolConfig protocolConfig = new ProtocolConfig();
@@ -282,17 +285,19 @@ public class ProtocolConfigTest {
.initialize();
Assertions.assertEquals("rest", protocolConfig.getName());
- Assertions.assertEquals(1234, protocolConfig.getPort());
+ Assertions.assertEquals(port, protocolConfig.getPort());
} finally {
}
}
@Test
public void testCreateConfigFromPropsWithId() {
+ int port1 = NetUtils.getAvailablePort();
+ int port2 = NetUtils.getAvailablePort();
SysProps.setProperty("dubbo.protocols.rest1.name", "rest");
- SysProps.setProperty("dubbo.protocols.rest1.port", "1234");
+ SysProps.setProperty("dubbo.protocols.rest1.port", String.valueOf(port1));
SysProps.setProperty("dubbo.protocol.name", "dubbo"); // ignore
- SysProps.setProperty("dubbo.protocol.port", "2346");
+ SysProps.setProperty("dubbo.protocol.port", String.valueOf(port2));
try {
@@ -307,16 +312,18 @@ public class ProtocolConfigTest {
ProtocolConfig protocol = configManager.getProtocol("rest1").get();
Assertions.assertEquals("rest", protocol.getName());
- Assertions.assertEquals(1234, protocol.getPort());
+ Assertions.assertEquals(port1, protocol.getPort());
} finally {
}
}
@Test
public void testCreateConfigFromPropsWithName() {
- SysProps.setProperty("dubbo.protocols.rest.port", "1234");
+ int port1 = NetUtils.getAvailablePort();
+ int port2 = NetUtils.getAvailablePort();
+ SysProps.setProperty("dubbo.protocols.rest.port", String.valueOf(port1));
SysProps.setProperty("dubbo.protocol.name", "dubbo"); // ignore
- SysProps.setProperty("dubbo.protocol.port", "2346");
+ SysProps.setProperty("dubbo.protocol.port", String.valueOf(port2));
try {
@@ -331,15 +338,16 @@ public class ProtocolConfigTest {
ProtocolConfig protocol = configManager.getProtocol("rest").get();
Assertions.assertEquals("rest", protocol.getName());
- Assertions.assertEquals(1234, protocol.getPort());
+ Assertions.assertEquals(port1, protocol.getPort());
} finally {
}
}
@Test
public void testCreateDefaultConfigFromProps() {
+ int port = NetUtils.getAvailablePort();
SysProps.setProperty("dubbo.protocol.name", "rest");
- SysProps.setProperty("dubbo.protocol.port", "2346");
+ SysProps.setProperty("dubbo.protocol.port", String.valueOf(port));
String protocolId = "rest-protocol";
SysProps.setProperty("dubbo.protocol.id", protocolId); // Allow override config id from props
@@ -355,7 +363,7 @@ public class ProtocolConfigTest {
ProtocolConfig protocol = configManager.getProtocol("rest").get();
Assertions.assertEquals("rest", protocol.getName());
- Assertions.assertEquals(2346, protocol.getPort());
+ Assertions.assertEquals(port, protocol.getPort());
Assertions.assertEquals(protocolId, protocol.getId());
ProtocolConfig protocolConfig = configManager.getProtocol(protocolId).get();