[infinispan-commits] Infinispan SVN: r2282 - in trunk/core/src/test/java/org/infinispan: test and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2010-08-24 09:01:38 -0400 (Tue, 24 Aug 2010)
New Revision: 2282

Modified:
   trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
   trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
Log:
[ISPN-591] - Generated Schema declares namespace as 4.0 rather than 4.1
merge from 4.1

Modified: trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java	2010-08-24 12:55:01 UTC (rev 2281)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java	2010-08-24 13:01:38 UTC (rev 2282)
@@ -24,6 +24,7 @@
 
 import static org.infinispan.test.TestingUtil.INFINISPAN_END_TAG;
 import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
+import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG_40;
 import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG_NO_SCHEMA;
 
 @Test(groups = "unit", testName = "config.parsing.XmlFileParsingTest")
@@ -70,8 +71,40 @@
       assert named != null;
       assert named.isEmpty();
    }
+   
+   public void testBackwardCompatibleInputCacheConfiguration() throws Exception {
+      
+      //read 4.0 configuration file against 4.1 schema
+      String config = INFINISPAN_START_TAG_40 +
+            "   <global>\n" +
+            "      <transport clusterName=\"demoCluster\"/>\n" +
+            "   </global>\n" +
+            "\n" +
+            "   <default>\n" +
+            "      <clustering mode=\"replication\">\n" +
+            "      </clustering>\n" +
+            "   </default>\n" +
+            TestingUtil.INFINISPAN_END_TAG;
 
+      String schemaFileName = "schema/infinispan-config-" + Version.getMajorVersion() + ".xsd";
+      
+      InputStream is = new ByteArrayInputStream(config.getBytes());      
+      InfinispanConfiguration c = InfinispanConfiguration.newInfinispanConfiguration(is,
+               InfinispanConfiguration.findSchemaInputStream(schemaFileName));
+      GlobalConfiguration gc = c.parseGlobalConfiguration();
+      
+      assert gc.getTransportClass().equals(JGroupsTransport.class.getName());
+      assert gc.getClusterName().equals("demoCluster");
 
+      Configuration def = c.parseDefaultConfiguration();
+      assert def.getCacheMode() == Configuration.CacheMode.REPL_SYNC;
+
+      Map<String, Configuration> named = c.parseNamedConfigurations();
+      assert named != null;
+      assert named.isEmpty();
+   }
+
+
    public void testNoSchemaWithStuff() throws IOException {
       String xml = INFINISPAN_START_TAG_NO_SCHEMA +
               "    <default>\n" +

Modified: trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/TestingUtil.java	2010-08-24 12:55:01 UTC (rev 2281)
+++ trunk/core/src/test/java/org/infinispan/test/TestingUtil.java	2010-08-24 13:01:38 UTC (rev 2282)
@@ -63,8 +63,12 @@
    public static final String TEST_PATH = "target" + separator + "tempFiles";
    public static final String INFINISPAN_START_TAG = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<infinispan\n" +
          "      xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-         "      xsi:schemaLocation=\"urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd\"\n" +
-         "      xmlns=\"urn:infinispan:config:4.0\">";
+         "      xsi:schemaLocation=\"urn:infinispan:config:4.1 http://www.infinispan.org/schemas/infinispan-config-4.1.xsd\"\n" +
+         "      xmlns=\"urn:infinispan:config:4.1\">";
+   public static final String INFINISPAN_START_TAG_40 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<infinispan\n" +
+   "      xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+   "      xsi:schemaLocation=\"urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd\"\n" +
+   "      xmlns=\"urn:infinispan:config:4.0\">";
    public static final String INFINISPAN_END_TAG="</infinispan>";
    public static final String INFINISPAN_START_TAG_NO_SCHEMA="<infinispan>";