[incubator-dubbo] branch 2.7.0-release updated: Fix UT
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.7.0-release by this push:
new 747b804 Fix UT
747b804 is described below
commit 747b8049192527bdc6512f659efc044a100bb8f6
Author: ken.lj
AuthorDate: Thu Jan 10 13:16:07 2019 +0800
Fix UT
---
.../test/java/org/apache/dubbo/config/AbstractConfigTest.java| 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
index e053511..0310f04 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.config;
import org.apache.dubbo.common.config.Environment;
+import org.apache.dubbo.common.utils.ConfigUtils;
import org.apache.dubbo.config.api.Greeting;
import org.apache.dubbo.config.support.Parameter;
@@ -32,6 +33,7 @@ import java.lang.annotation.Target;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Properties;
import static org.junit.Assert.assertThat;
@@ -346,7 +348,7 @@ public class AbstractConfigTest {
}
@Test
-public void testRefreshProperties() {
+public void testRefreshProperties() throws Exception{
try {
Environment.getInstance().setExternalConfigMap(new HashMap<>());
OverrideConfig overrideConfig = new OverrideConfig();
@@ -354,6 +356,10 @@ public class AbstractConfigTest {
overrideConfig.setProtocol("override-config");
overrideConfig.setEscape("override-config://");
+Properties properties = new Properties();
+
properties.load(this.getClass().getResourceAsStream("/dubbo.properties"));
+ConfigUtils.setProperties(properties);
+
overrideConfig.refresh();
Assert.assertEquals("override-config://127.0.0.1:2181",
overrideConfig.getAddress());
@@ -362,6 +368,7 @@ public class AbstractConfigTest {
Assert.assertEquals("properties",
overrideConfig.getUseKeyAsProperty());
} finally {
Environment.getInstance().clearExternalConfigs();
+ConfigUtils.setProperties(null);
}
}
[incubator-dubbo] branch 2.7.0-release updated: fix UT
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.7.0-release by this push:
new bcf474d fix UT
bcf474d is described below
commit bcf474dff5a49e0ca7dbe1212db1078d8a2c593b
Author: ken.lj
AuthorDate: Tue Jan 8 11:00:32 2019 +0800
fix UT
---
.../src/test/java/org/apache/dubbo/config/ConfigTest.java | 9 -
.../java/org/apache/dubbo/config/ReferenceConfigTest.java | 13 +
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git
a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ConfigTest.java
b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ConfigTest.java
index d68c241..26e0bdd 100644
--- a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ConfigTest.java
+++ b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ConfigTest.java
@@ -17,25 +17,32 @@
package org.apache.dubbo.config;
+import org.apache.dubbo.config.context.ConfigManager;
import org.apache.dubbo.service.DemoService;
import org.apache.dubbo.service.DemoServiceImpl;
import com.alibaba.dubbo.config.ReferenceConfig;
import com.alibaba.dubbo.config.ServiceConfig;
+import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class ConfigTest {
-
private com.alibaba.dubbo.config.ApplicationConfig applicationConfig = new
com.alibaba.dubbo.config.ApplicationConfig("first-dubbo-test");
private com.alibaba.dubbo.config.RegistryConfig registryConfig = new
com.alibaba.dubbo.config.RegistryConfig("multicast://224.5.6.7:1234");
+@After
+public void tearDown() {
+ConfigManager.getInstance().clear();
+}
+
@Before
public void setup() {
// In IDE env, make sure adding the following argument to VM options
System.setProperty("java.net.preferIPv4Stack", "true");
+ConfigManager.getInstance().clear();
}
@Test
diff --git
a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
index 7ba972d..3acd2c2 100644
---
a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
+++
b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.config;
+import org.apache.dubbo.config.context.ConfigManager;
import org.apache.dubbo.service.DemoService;
import org.apache.dubbo.service.DemoServiceImpl;
@@ -26,6 +27,8 @@ import com.alibaba.dubbo.config.ReferenceConfig;
import com.alibaba.dubbo.config.RegistryConfig;
import com.alibaba.dubbo.config.ServiceConfig;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
public class ReferenceConfigTest {
@@ -33,6 +36,16 @@ public class ReferenceConfigTest {
private RegistryConfig registry = new RegistryConfig();
private ProtocolConfig protocol = new ProtocolConfig();
+@Before
+public void setUp() {
+ConfigManager.getInstance().clear();
+}
+
+@After
+public void tearDown() {
+ConfigManager.getInstance().clear();
+}
+
@Test
public void testInjvm() throws Exception {
[incubator-dubbo] branch 2.7.0-release updated: fix UT
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.7.0-release by this push:
new b399df7 fix UT
b399df7 is described below
commit b399df7d1b69d38ed6ce8f74767d962551c52cfc
Author: ken.lj
AuthorDate: Tue Jan 8 10:32:44 2019 +0800
fix UT
---
dubbo-compatible/pom.xml | 18 ++
.../test/java/org/apache/dubbo/config/ConfigTest.java | 13 +++--
.../org/apache/dubbo/config/ReferenceConfigTest.java | 8
3 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/dubbo-compatible/pom.xml b/dubbo-compatible/pom.xml
index 95be710..4648309 100644
--- a/dubbo-compatible/pom.xml
+++ b/dubbo-compatible/pom.xml
@@ -80,6 +80,24 @@
test
+org.apache.dubbo
+dubbo-registry-zookeeper
+${project.parent.version}
+test
+
+
+org.apache.dubbo
+dubbo-configcenter-zookeeper
+${project.parent.version}
+test
+
+
+org.apache.dubbo
+dubbo-metadata-report-zookeeper
+${project.parent.version}
+test
+
+
com.alibaba
fastjson
test
diff --git
a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ConfigTest.java
b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ConfigTest.java
index 9300032..d68c241 100644
--- a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ConfigTest.java
+++ b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ConfigTest.java
@@ -20,9 +20,7 @@ package org.apache.dubbo.config;
import org.apache.dubbo.service.DemoService;
import org.apache.dubbo.service.DemoServiceImpl;
-import com.alibaba.dubbo.config.ApplicationConfig;
import com.alibaba.dubbo.config.ReferenceConfig;
-import com.alibaba.dubbo.config.RegistryConfig;
import com.alibaba.dubbo.config.ServiceConfig;
import org.junit.Assert;
@@ -31,6 +29,9 @@ import org.junit.Test;
public class ConfigTest {
+private com.alibaba.dubbo.config.ApplicationConfig applicationConfig = new
com.alibaba.dubbo.config.ApplicationConfig("first-dubbo-test");
+private com.alibaba.dubbo.config.RegistryConfig registryConfig = new
com.alibaba.dubbo.config.RegistryConfig("multicast://224.5.6.7:1234");
+
@Before
public void setup() {
// In IDE env, make sure adding the following argument to VM options
@@ -40,15 +41,15 @@ public class ConfigTest {
@Test
public void testConfig() {
com.alibaba.dubbo.config.ServiceConfig service = new
ServiceConfig<>();
-service.setApplication(new
com.alibaba.dubbo.config.ApplicationConfig("first-dubbo-provider"));
-service.setRegistry(new
com.alibaba.dubbo.config.RegistryConfig("multicast://224.5.6.7:1234"));
+service.setApplication(applicationConfig);
+service.setRegistry(registryConfig);
service.setInterface(DemoService.class);
service.setRef(new DemoServiceImpl());
service.export();
com.alibaba.dubbo.config.ReferenceConfig reference = new
ReferenceConfig<>();
-reference.setApplication(new ApplicationConfig("first-dubbo-client"));
-reference.setRegistry(new
RegistryConfig("multicast://224.5.6.7:1234"));
+reference.setApplication(applicationConfig);
+reference.setRegistry(registryConfig);
reference.setInterface(DemoService.class);
DemoService demoService = reference.get();
String message = demoService.sayHello("dubbo");
diff --git
a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
index 0bda70e..7ba972d 100644
---
a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
+++
b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
@@ -29,16 +29,16 @@ import com.alibaba.dubbo.config.ServiceConfig;
import org.junit.Test;
public class ReferenceConfigTest {
+private ApplicationConfig application = new ApplicationConfig();
+private RegistryConfig registry = new RegistryConfig();
+private ProtocolConfig protocol = new ProtocolConfig();
@Test
public void testInjvm() throws Exception {
-ApplicationConfig application = new ApplicationConfig();
-application.setName("test-protocol-random-port");
-RegistryConfig registry = new RegistryConfig();
+application.setName("test-protocol-random-port");
registry.setAddress("multicast://224.5.6.7:1234");
-ProtocolConfig protocol = new ProtocolConfig();
protocol.setName("dubbo");
ServiceConfig demoService;
[incubator-dubbo] branch 2.7.0-release updated: fix UT
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.7.0-release by this push:
new ff5d2ff fix UT
ff5d2ff is described below
commit ff5d2ff0a67e0625e9118dc7afb82891ca9702bc
Author: ken.lj
AuthorDate: Mon Jan 7 14:11:48 2019 +0800
fix UT
---
.../dubbo/rpc/validation/ValidationTest.java | 40 +++---
1 file changed, 28 insertions(+), 12 deletions(-)
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java
index 8382fef..f0e85f9 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java
@@ -23,11 +23,14 @@ import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.ServiceConfig;
+import org.apache.dubbo.config.context.ConfigManager;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.service.GenericException;
import org.apache.dubbo.rpc.service.GenericService;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import javax.validation.ConstraintViolation;
@@ -41,20 +44,33 @@ import java.util.Set;
* GenericServiceTest
*/
public class ValidationTest {
+private ApplicationConfig application = new
ApplicationConfig("validation-test");
+private RegistryConfig registryNA = new RegistryConfig("N/A");
+private ProtocolConfig protocolDubo29582 = new ProtocolConfig("dubbo",
29582);
+
+@Before
+public void setUp() {
+ConfigManager.getInstance().clear();
+}
+
+@After
+public void tearDown() {
+ConfigManager.getInstance().clear();
+}
@Test
public void testValidation() {
ServiceConfig service = new
ServiceConfig();
-service.setApplication(new ApplicationConfig("validation-provider"));
-service.setRegistry(new RegistryConfig("N/A"));
-service.setProtocol(new ProtocolConfig("dubbo", 29582));
+service.setApplication(application);
+service.setRegistry(registryNA);
+service.setProtocol(protocolDubo29582);
service.setInterface(ValidationService.class.getName());
service.setRef(new ValidationServiceImpl());
service.setValidation(String.valueOf(true));
service.export();
try {
ReferenceConfig reference = new
ReferenceConfig();
-reference.setApplication(new
ApplicationConfig("validation-consumer"));
+reference.setApplication(application);
reference.setInterface(ValidationService.class);
reference.setUrl("dubbo://127.0.0.1:29582?scope=remote=true");
ValidationService validationService = reference.get();
@@ -171,16 +187,16 @@ public class ValidationTest {
@Test
public void testProviderValidation() {
ServiceConfig service = new
ServiceConfig();
-service.setApplication(new ApplicationConfig("validation-provider"));
-service.setRegistry(new RegistryConfig("N/A"));
-service.setProtocol(new ProtocolConfig("dubbo", 29582));
+service.setApplication(application);
+service.setRegistry(registryNA);
+service.setProtocol(protocolDubo29582);
service.setInterface(ValidationService.class.getName());
service.setRef(new ValidationServiceImpl());
service.setValidation(String.valueOf(true));
service.export();
try {
ReferenceConfig reference = new
ReferenceConfig();
-reference.setApplication(new
ApplicationConfig("validation-consumer"));
+reference.setApplication(application);
reference.setInterface(ValidationService.class);
reference.setUrl("dubbo://127.0.0.1:29582");
ValidationService validationService = reference.get();
@@ -236,16 +252,16 @@ public class ValidationTest {
@Test
public void testGenericValidation() {
ServiceConfig service = new
ServiceConfig();
-service.setApplication(new ApplicationConfig("validation-provider"));
-service.setRegistry(new RegistryConfig("N/A"));
-service.setProtocol(new ProtocolConfig("dubbo", 29582));
+service.setApplication(application);
+service.setRegistry(registryNA);
+service.setProtocol(protocolDubo29582);
service.setInterface(ValidationService.class.getName());
service.setRef(new ValidationServiceImpl());
service.setValidation(String.valueOf(true));
service.export();
try {
[incubator-dubbo] branch 2.7.0-release updated: fix UT
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.7.0-release by this push:
new 9111b3c fix UT
9111b3c is described below
commit 9111b3c05bcd79798571f53d6fbba4c1e525d886
Author: ken.lj
AuthorDate: Mon Jan 7 13:36:47 2019 +0800
fix UT
---
.../dubbo/config/AbstractInterfaceConfigTest.java | 7 +
.../apache/dubbo/config/ReferenceConfigTest.java | 13 ++
.../org/apache/dubbo/config/ServiceConfigTest.java | 9 +++
.../org/apache/dubbo/config/cache/CacheTest.java | 30 ++
.../config/url/ExporterSideConfigUrlTest.java | 3 +++
.../dubbo/config/url/InvokerSideConfigUrlTest.java | 14 --
.../org/apache/dubbo/config/url/UrlTestBase.java | 12 +++--
7 files changed, 66 insertions(+), 22 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
index 5f7b961..1a89fdd 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
@@ -20,6 +20,7 @@ import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.ConfigUtils;
import org.apache.dubbo.config.api.Greeting;
+import org.apache.dubbo.config.context.ConfigManager;
import org.apache.dubbo.config.mock.GreetingLocal1;
import org.apache.dubbo.config.mock.GreetingLocal2;
import org.apache.dubbo.config.mock.GreetingLocal3;
@@ -29,6 +30,7 @@ import org.apache.dubbo.monitor.MonitorService;
import org.apache.dubbo.registry.RegistryService;
import junit.framework.TestCase;
+import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
@@ -60,6 +62,11 @@ public class AbstractInterfaceConfigTest {
System.clearProperty(Constants.DUBBO_PROPERTIES_KEY);
}
+@After
+public void tearMethodAfterEachUT() {
+ConfigManager.getInstance().clear();
+}
+
@Test
public void testCheckRegistry1() throws Exception {
System.setProperty("dubbo.registry.address", "addr1|addr2");
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
index 874f46b..758cd85 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
@@ -18,13 +18,26 @@ package org.apache.dubbo.config;
import org.apache.dubbo.common.Constants;
import org.apache.dubbo.config.api.DemoService;
+import org.apache.dubbo.config.context.ConfigManager;
import org.apache.dubbo.config.provider.impl.DemoServiceImpl;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
public class ReferenceConfigTest {
+@Before
+public void setUp() {
+ConfigManager.getInstance().clear();
+}
+
+@After
+public void tearDown() {
+ConfigManager.getInstance().clear();
+}
+
@Test
public void testInjvm() throws Exception {
ApplicationConfig application = new ApplicationConfig();
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
index b981e49..0379045 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
@@ -21,6 +21,7 @@ import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.config.api.DemoService;
import org.apache.dubbo.config.api.Greeting;
+import org.apache.dubbo.config.context.ConfigManager;
import org.apache.dubbo.config.mock.MockProtocol2;
import org.apache.dubbo.config.mock.MockRegistryFactory2;
import org.apache.dubbo.config.mock.TestProxyFactory;
@@ -31,6 +32,7 @@ import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Protocol;
import org.apache.dubbo.rpc.service.GenericService;
+import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -100,6 +102,13 @@ public class ServiceConfigTest {
service2.setRef(new DemoServiceImpl());
service2.setMethods(Collections.singletonList(method));
service2.setProxy("testproxyfactory");
+
+
