[jboss-svn-commits] JBoss Common SVN: r2744 - in jbossxb/trunk/src/test/java/org/jboss/test: xb and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2008-03-17 10:01:09 -0400 (Mon, 17 Mar 2008)
New Revision: 2744

Removed:
   jbossxb/trunk/src/test/java/org/jboss/test/xb/schemaresolver/
Modified:
   jbossxb/trunk/src/test/java/org/jboss/test/resolver/DefaultSchemaResolverUnitTestCase.java
Log:
moved the xsd:redefine resolution testcase to the unit test that had existed before

Modified: jbossxb/trunk/src/test/java/org/jboss/test/resolver/DefaultSchemaResolverUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/resolver/DefaultSchemaResolverUnitTestCase.java	2008-03-17 13:11:43 UTC (rev 2743)
+++ jbossxb/trunk/src/test/java/org/jboss/test/resolver/DefaultSchemaResolverUnitTestCase.java	2008-03-17 14:01:09 UTC (rev 2744)
@@ -21,12 +21,15 @@
  */
 package org.jboss.test.resolver;
 
+import java.net.URL;
+
 import javax.xml.namespace.QName;
 
 import org.jboss.ejb.metadata.spec.EjbJar20MetaData;
 import org.jboss.ejb.metadata.spec.EjbJar21MetaData;
 import org.jboss.ejb.metadata.spec.EjbJar30MetaData;
-import org.jboss.test.BaseTestCase;
+import org.jboss.test.xml.AbstractJBossXBTest;
+import org.jboss.xb.binding.Util;
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.ElementBinding;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
@@ -36,7 +39,7 @@
  * @author Scott.Stark at jboss.org
  * @version $Revision$
  */
-public class DefaultSchemaResolverUnitTestCase extends BaseTestCase
+public class DefaultSchemaResolverUnitTestCase extends AbstractJBossXBTest
 {
    public DefaultSchemaResolverUnitTestCase(String name)
    {
@@ -98,4 +101,20 @@
       ElementBinding ejbJar3x = schema.getElement(ejbJar3xName);
       assertNotNull(ejbJar3x);
    }
+   
+   public void testRedefine() throws Exception
+   {
+      //enableTrace("org.jboss.util.xml");
+
+      /**
+       * it *has to* be in the classpath, not found with findXML()
+       */
+      String redefiningName = getRootName() + "_" + getName() + "_redefining.xsd";
+      URL redefiningURL = Thread.currentThread().getContextClassLoader().getResource(redefiningName);
+      assertNotNull("Expected to find " + redefiningName + " in the classpath", redefiningURL);
+      
+      DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+      resolver.addSchemaLocation("urn:jboss:xb:test", redefiningName);
+      Util.loadSchema(redefiningURL.toExternalForm(), resolver);
+   }
 }