[incubator-dubbo] branch 2.7.0-release updated: Fix UT

[liujun]

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 <ken.lj...@gmail.com>
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);
         }
     }