From a956bd9b088c886990e7cc8081d15657abf69ce5 Mon Sep 17 00:00:00 2001
From: "william.liangf" <william.liangf@1a56cb94-b969-4eaa-88fa-be21384802f2>
Date: Mon, 6 Feb 2012 10:25:36 +0000
Subject: [PATCH] =?UTF-8?q?DUBBO-194=20=E5=A2=9E=E5=8A=A0=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@903 1a56cb94-b969-4eaa-88fa-be21384802f2
---
 .../com/alibaba/dubbo/config/ConfigTest.java  | 39 +++++++++++++++----
 .../system-properties-override-default.xml    | 28 +++++++++++++
 .../config/system-properties-override.xml     |  9 +++++
 3 files changed, 69 insertions(+), 7 deletions(-)
 create mode 100644 dubbo-config/src/test/resources/com/alibaba/dubbo/config/system-properties-override-default.xml

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 c49ccce6f67..d88ffe1047d 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
@@ -424,7 +424,32 @@ public void testSystemPropertyOverrideMultiProtocol() throws Exception {
     
     @SuppressWarnings("unchecked")
     @Test
-    public void testSystemPropertyOverride() throws Exception {
+    public void testSystemPropertyOverrideXmlDefault() throws Exception {
+        System.setProperty("dubbo.application.name", "sysover");
+        System.setProperty("dubbo.registry.address", "N/A");
+        System.setProperty("dubbo.protocol.name", "dubbo");
+        System.setProperty("dubbo.protocol.port", "20819");
+        ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext(ConfigTest.class.getPackage().getName().replace('.', '/') + "/system-properties-override-default.xml");
+        providerContext.start();
+        try {
+            ServiceConfig<DemoService> service = (ServiceConfig<DemoService>) providerContext.getBean("demoServiceConfig");
+            assertEquals("sysover", service.getApplication().getName());
+            assertEquals("N/A", service.getRegistry().getAddress());
+            assertEquals("dubbo", service.getProtocol().getName());
+            assertEquals(20819, service.getProtocol().getPort().intValue());
+        } finally {
+            System.setProperty("dubbo.application.name", "");
+            System.setProperty("dubbo.registry.address", "");
+            System.setProperty("dubbo.protocol.name", "");
+            System.setProperty("dubbo.protocol.port", "");
+            providerContext.stop();
+            providerContext.close();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testSystemPropertyOverrideXml() throws Exception {
         System.setProperty("dubbo.application.name", "sysover");
         System.setProperty("dubbo.registry.address", "N/A");
         System.setProperty("dubbo.protocol.name", "dubbo");
@@ -432,11 +457,11 @@ public void testSystemPropertyOverride() throws Exception {
         ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext(ConfigTest.class.getPackage().getName().replace('.', '/') + "/system-properties-override.xml");
         providerContext.start();
         try {
-            ServiceConfig<DemoService> serviceConfig = (ServiceConfig<DemoService>) providerContext.getBean("demoServiceConfig");
-            assertEquals("sysover", serviceConfig.getApplication().getName());
-            assertEquals("N/A", serviceConfig.getRegistry().getAddress());
-            assertEquals("dubbo", serviceConfig.getProtocol().getName());
-            assertEquals(20819, serviceConfig.getProtocol().getPort().intValue());
+            ServiceConfig<DemoService> service = (ServiceConfig<DemoService>) providerContext.getBean("demoServiceConfig");
+            URL url = service.toUrls().get(0);
+            assertEquals("sysover", url.getParameter("application"));
+            assertEquals("dubbo", url.getProtocol());
+            assertEquals(20819, url.getPort());
         } finally {
             System.setProperty("dubbo.application.name", "");
             System.setProperty("dubbo.registry.address", "");
@@ -499,8 +524,8 @@ public void testSystemPropertyOverrideApi() throws Exception {
             service.setProtocol(protocol);
             service.export();
             
-            URL url = service.toUrls().get(0);
             try {
+                URL url = service.toUrls().get(0);
                 assertEquals("sysover", url.getParameter("application"));
                 assertEquals("dubbo", url.getProtocol());
                 assertEquals(20834, url.getPort());
diff --git a/dubbo-config/src/test/resources/com/alibaba/dubbo/config/system-properties-override-default.xml b/dubbo-config/src/test/resources/com/alibaba/dubbo/config/system-properties-override-default.xml
new file mode 100644
index 00000000000..ed573f5a7d8
--- /dev/null
+++ b/dubbo-config/src/test/resources/com/alibaba/dubbo/config/system-properties-override-default.xml
@@ -0,0 +1,28 @@
+<!--
+ - Copyright 1999-2011 Alibaba Group.
+ -  
+ - Licensed under the Apache License, Version 2.0 (the "License");
+ - you may not use this file except in compliance with the License.
+ - You may obtain a copy of the License at
+ -  
+ -      http://www.apache.org/licenses/LICENSE-2.0
+ -  
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+    http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd
+    ">
+
+    <!-- 暴露服务配置 -->
+    <dubbo:service id="demoServiceConfig" interface="com.alibaba.dubbo.config.api.DemoService" ref="demoService" />
+     
+    <bean id="demoService" class="com.alibaba.dubbo.config.provider.impl.DemoServiceImpl" />
+ 
+</beans>
\ No newline at end of file
diff --git a/dubbo-config/src/test/resources/com/alibaba/dubbo/config/system-properties-override.xml b/dubbo-config/src/test/resources/com/alibaba/dubbo/config/system-properties-override.xml
index ed573f5a7d8..d3899a7fe19 100644
--- a/dubbo-config/src/test/resources/com/alibaba/dubbo/config/system-properties-override.xml
+++ b/dubbo-config/src/test/resources/com/alibaba/dubbo/config/system-properties-override.xml
@@ -20,6 +20,15 @@
     http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd
     ">
 
+    <!-- 当前应用信息配置 -->
+    <dubbo:application name="demo-provider" />
+    
+    <!-- 连接注册中心配置 -->
+    <dubbo:registry address="127.0.0.1" />
+     
+    <!-- 暴露服务协议配置 -->
+    <dubbo:protocol name="rmi" port="20813" />
+    
     <!-- 暴露服务配置 -->
     <dubbo:service id="demoServiceConfig" interface="com.alibaba.dubbo.config.api.DemoService" ref="demoService" />