[jboss-cvs] JBossAS SVN: r63461 - branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/deployer/unit.

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

Author: wolfc
Date: 2007-06-11 17:46:49 -0400 (Mon, 11 Jun 2007)
New Revision: 63461

Modified:
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/deployer/unit/DeployerUnitTestCase.java
Log:
EJBTHREE-877: reset deploy ejb3 ext only after test

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/deployer/unit/DeployerUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/deployer/unit/DeployerUnitTestCase.java	2007-06-11 21:38:47 UTC (rev 63460)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/deployer/unit/DeployerUnitTestCase.java	2007-06-11 21:46:49 UTC (rev 63461)
@@ -48,30 +48,37 @@
       MBeanServerConnection server = getServer();
       ObjectName on = new ObjectName("jboss.ejb3:service=EJB3Deployer");
       server.setAttribute(on, new Attribute("DeployEjb3ExtensionOnly", new Boolean(true)));
-      Boolean value = (Boolean)server.getAttribute(on, "DeployEjb3ExtensionOnly");
-      assertTrue(value.booleanValue());
-      
-      this.deploy("stateless-test.jar");
       try
       {
+         Boolean value = (Boolean)server.getAttribute(on, "DeployEjb3ExtensionOnly");
+         assertTrue(value.booleanValue());
+         
+         this.deploy("stateless-test.jar");
+         try
+         {
+            RunAsStateless runAs = (RunAsStateless) getInitialContext().lookup("RunAsStatelessEjbName/remote");
+            fail(".jar should not have deployed");
+         } catch (javax.naming.NameNotFoundException e)
+         {
+         }
+         this.undeploy("stateless-test.jar");
+         
+         this.deploy("stateless-test.ejb3");
          RunAsStateless runAs = (RunAsStateless) getInitialContext().lookup("RunAsStatelessEjbName/remote");
-         fail(".jar should not have deployed");
-      } catch (javax.naming.NameNotFoundException e)
+         this.undeploy("stateless-test.ejb3");
+         
+         server.setAttribute(on, new Attribute("DeployEjb3ExtensionOnly", new Boolean(false)));
+         value = (Boolean)server.getAttribute(on, "DeployEjb3ExtensionOnly");
+         assertFalse(value.booleanValue());
+         
+         this.deploy("stateless-test.jar");
+         runAs = (RunAsStateless) getInitialContext().lookup("RunAsStatelessEjbName/remote");
+         this.undeploy("stateless-test.jar");
+      }
+      finally
       {
+         server.setAttribute(on, new Attribute("DeployEjb3ExtensionOnly", false));
       }
-      this.undeploy("stateless-test.jar");
-      
-      this.deploy("stateless-test.ejb3");
-      RunAsStateless runAs = (RunAsStateless) getInitialContext().lookup("RunAsStatelessEjbName/remote");
-      this.undeploy("stateless-test.ejb3");
-      
-      server.setAttribute(on, new Attribute("DeployEjb3ExtensionOnly", new Boolean(false)));
-      value = (Boolean)server.getAttribute(on, "DeployEjb3ExtensionOnly");
-      assertFalse(value.booleanValue());
-      
-      this.deploy("stateless-test.jar");
-      runAs = (RunAsStateless) getInitialContext().lookup("RunAsStatelessEjbName/remote");
-      this.undeploy("stateless-test.jar");
    }
 
    public static Test suite() throws Exception