tag 2.0.14

git-svn-id: http://code.alibabatech.com/svn/dubbo/tags/2.0.14@1105 1a56cb94-b969-4eaa-88fa-be21384802f2
diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/config/ConfigTest.java b/dubbo-config/src/test/java/com/alibaba/dubbo/config/ConfigTest.java
index b1cb102..b85a098 100644
--- a/dubbo-config/src/test/java/com/alibaba/dubbo/config/ConfigTest.java
+++ b/dubbo-config/src/test/java/com/alibaba/dubbo/config/ConfigTest.java
@@ -389,7 +389,28 @@
             providerContext.close();

         }

     }

-    

+

+    @Test

+    public void testXmlOverrideProperties() throws Exception {

+        ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext(ConfigTest.class.getPackage().getName().replace('.', '/') + "/xml-override-properties.xml");

+        providerContext.start();

+        try {

+            ApplicationConfig application = (ApplicationConfig) providerContext.getBean("application");

+            assertEquals("demo-provider", application.getName());

+            assertEquals("world", application.getOwner());

+            

+            RegistryConfig registry = (RegistryConfig) providerContext.getBean("registry");

+            assertEquals("N/A", registry.getAddress());

+            

+            ProtocolConfig dubbo = (ProtocolConfig) providerContext.getBean("dubbo");

+            assertEquals(20813, dubbo.getPort().intValue());

+            

+        } finally {

+            providerContext.stop();

+            providerContext.close();

+        }

+    }

+

     @Test

     public void testSystemPropertyOverrideProtocol() throws Exception {

         System.setProperty("dubbo.protocol.port", "20812");