test(apollo-client): fix 'there is no value for xxx.from.system.prope…

…rty'. Merge similar xml file.

apollo-client/src/test/java/com/ctrip/framework/apollo/spring/XmlConfigPlaceholderTest.java

@@ -143,7 +143,7 @@ public void testResolveNamespacesWithDefaultValue() throws Exception {
     int someBatch = 2000;
     this.prepare(someTimeout, anotherTimeout, someBatch);
 
-    check("spring/config.namespace.resolve.to.default.xml", anotherTimeout, someBatch);
+    check("spring/config.namespace.placeholder.with.default.value.xml", anotherTimeout, someBatch);
   }
 
   @Test
@@ -155,7 +155,7 @@ public void testResolveNamespacesFromSystemProperty() throws Exception {
     int someBatch = 2000;
     this.prepare(someTimeout, anotherTimeout, someBatch);
 
-    check("spring/config.namespace.resolve.from.system.property.xml", anotherTimeout, someBatch);
+    check("spring/config.namespace.placeholder.xml", anotherTimeout, someBatch);
   }
 
   @Test(expected = FatalBeanException.class)
@@ -165,7 +165,7 @@ public void testUnresolvedNamespaces() {
     int someBatch = 2000;
     this.prepare(someTimeout, anotherTimeout, someBatch);
 
-    check("spring/config.namespace.unresolved.xml", anotherTimeout, someBatch);
+    check("spring/config.namespace.placeholder.xml", anotherTimeout, someBatch);
   }
 
   private static void check(String xmlLocation, int expectedTimeout, int expectedBatch) {

apollo-client/src/test/resources/spring/config.namespace.placeholder.with.default.value.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:apollo="http://www.ctrip.com/schema/apollo"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
+  <apollo:config namespaces="${xxx.random:application}"/>
+  <apollo:config namespaces="${yyy.random:FX.apollo}" order="10"/>
+
+  <bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
+    <property name="timeout" value="${timeout:100}"/>
+    <property name="batch" value="${batch:200}"/>
+  </bean>
+</beans>

apollo-client/src/test/resources/spring/config.namespace.placeholder.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:apollo="http://www.ctrip.com/schema/apollo"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
+  <apollo:config namespaces="${xxx.from.system.property}"/>
+  <apollo:config namespaces="${yyy.from.system.property}" order="10"/>
+
+  <bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean">
+    <property name="timeout" value="${timeout:100}"/>
+    <property name="batch" value="${batch:200}"/>
+  </bean>
+</beans>