[jboss-cvs] JBossAS SVN: r66128 - in projects/metadata/trunk/src/test/java/org/jboss/test/metadata: javaee and 1 other directory.

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

Author: wolfc
Date: 2007-10-15 11:12:55 -0400 (Mon, 15 Oct 2007)
New Revision: 66128

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/JBossXBTestDelegate.java
Log:
JBAS-4506: allow for optional schema validation in unit test

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-10-15 15:09:26 UTC (rev 66127)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-10-15 15:12:55 UTC (rev 66128)
@@ -57,6 +57,11 @@
       return resolver;
    }
    
+   public static boolean validateSchema()
+   {
+      return true;
+   }
+   
    public JBoss50UnitTestCase(String name)
    {
       super(name);

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/JBossXBTestDelegate.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/JBossXBTestDelegate.java	2007-10-15 15:09:26 UTC (rev 66127)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/JBossXBTestDelegate.java	2007-10-15 15:12:55 UTC (rev 66128)
@@ -50,6 +50,9 @@
    /** The resolver */
    protected SchemaBindingResolver defaultResolver;
    
+   /** validate the schema? */
+   protected boolean validateSchema = false;
+   
    /**
     * Initialize
     */
@@ -85,14 +88,15 @@
       init();
       unmarshallerFactory = UnmarshallerFactory.newInstance();
       initResolver();
+      initValidateSchema();
    }
    
    protected void initResolver() throws Exception
    {
       try
       {
-         Method method = clazz.getMethod("initResolver", null);
-         defaultResolver = (SchemaBindingResolver) method.invoke(null, null);
+         Method method = clazz.getMethod("initResolver");
+         defaultResolver = (SchemaBindingResolver) method.invoke(null);
       }
       catch (NoSuchMethodException ignored)
       {
@@ -100,6 +104,19 @@
       }
    }
    
+   protected void initValidateSchema() throws Exception
+   {
+      try
+      {
+         Method method = clazz.getMethod("validateSchema");
+         validateSchema = (Boolean) method.invoke(null);
+      }
+      catch (NoSuchMethodException ignored)
+      {
+         validateSchema = false;
+      }
+   }
+   
    /**
     * Unmarshal an object
     * 
@@ -115,6 +132,7 @@
       
       long start = System.currentTimeMillis();
       Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
+      unmarshaller.setSchemaValidation(validateSchema);
       log.debug("Initialized parsing in " + (System.currentTimeMillis() - start) + "ms");
       try
       {
@@ -141,6 +159,7 @@
    {
       long start = System.currentTimeMillis();
       Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
+      unmarshaller.setSchemaValidation(validateSchema);
       log.debug("Initialized parsing in " + (System.currentTimeMillis() - start) + "ms");
       try
       {