[jboss-svn-commits] JBoss Common SVN: r2576 - jbossxb/trunk/src/test/java/org/jboss/test/xb/builder.

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

Author: alex.loubyansky at jboss.com
Date: 2007-09-25 05:50:51 -0400 (Tue, 25 Sep 2007)
New Revision: 2576

Modified:
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/AbstractBuilderTest.java
Log:
override the default handlers in setUp and restore them in tearDown

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/AbstractBuilderTest.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/AbstractBuilderTest.java	2007-09-25 03:21:01 UTC (rev 2575)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/AbstractBuilderTest.java	2007-09-25 09:50:51 UTC (rev 2576)
@@ -30,6 +30,7 @@
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultHandlers;
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.ParticleBinding;
+import org.jboss.xb.binding.sunday.unmarshalling.ParticleHandler;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SequenceBinding;
@@ -45,16 +46,11 @@
  */
 public class AbstractBuilderTest extends AbstractTestCaseWithSetup
 {
+   private static final ParticleHandler XB_DEFAULT_ELEMENT_HANDLER = DefaultHandlers.ELEMENT_HANDLER;
+   private static final ParticleHandler XB_DEFAULT_MODELGROUP_HANDLER = DefaultHandlers.MODEL_GROUP_HANDLER;
+
    protected String rootName = getRootName();
    
-   static
-   {
-      // Uncomment this to make sure we aren't using the RtElementHandler anywhere
-      DefaultHandlers.ELEMENT_HANDLER = new DebugElementHandler();
-      DefaultHandlers.SIMPLE_HANDLER = DefaultHandlers.ELEMENT_HANDLER;
-      DefaultHandlers.MODEL_GROUP_HANDLER = BuilderParticleHandler.INSTANCE;
-   }
-
    public AbstractBuilderTest(String name)
    {
       super(name);
@@ -82,8 +78,21 @@
    {
       super.setUp();
       configureLogging();
+
+      DefaultHandlers.ELEMENT_HANDLER = new DebugElementHandler();
+      DefaultHandlers.SIMPLE_HANDLER = DefaultHandlers.ELEMENT_HANDLER;
+      DefaultHandlers.MODEL_GROUP_HANDLER = BuilderParticleHandler.INSTANCE;
    }
    
+   @Override
+   protected void tearDown() throws Exception
+   {
+      super.tearDown();
+      DefaultHandlers.ELEMENT_HANDLER = XB_DEFAULT_ELEMENT_HANDLER;
+      DefaultHandlers.SIMPLE_HANDLER = DefaultHandlers.ELEMENT_HANDLER;
+      DefaultHandlers.MODEL_GROUP_HANDLER = XB_DEFAULT_MODELGROUP_HANDLER;
+   }
+   
    protected <T> T unmarshalObjectFromSchema(Class<T> expected) throws Exception
    {
       DefaultSchemaResolver resolver = new DefaultSchemaResolver();