[jboss-cvs] JBossAS SVN: r63497 - in trunk/ejb3: src/test/org/jboss/ejb3/test/deployer/unit and 1 other directory.

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

Author: bdecoste
Date: 2007-06-13 09:31:00 -0400 (Wed, 13 Jun 2007)
New Revision: 63497

Modified:
   trunk/ejb3/build-test.xml
   trunk/ejb3/src/test/org/jboss/ejb3/test/deployer/unit/DeployerUnitTestCase.java
Log:
improved test for DeployEjb3ExtensionOnly - check for .ejb3 deployment

Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml	2007-06-13 13:27:22 UTC (rev 63496)
+++ trunk/ejb3/build-test.xml	2007-06-13 13:31:00 UTC (rev 63497)
@@ -2965,6 +2965,8 @@
             <include name="roles.properties"/>
          </fileset>
       </jar>
+   	
+	  <copy file="${build.lib}/stateless-test.jar" tofile="${build.lib}/stateless-test.ejb3"/>
    </target>
    
    <target name="invoker"

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/deployer/unit/DeployerUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/deployer/unit/DeployerUnitTestCase.java	2007-06-13 13:27:22 UTC (rev 63496)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/deployer/unit/DeployerUnitTestCase.java	2007-06-13 13:31:00 UTC (rev 63497)
@@ -48,26 +48,38 @@
       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");
-      
-      server.setAttribute(on, new Attribute("DeployEjb3ExtensionOnly", new Boolean(false)));
-      value = (Boolean)server.getAttribute(on, "DeployEjb3ExtensionOnly");
-      assertFalse(value.booleanValue());
-      
-      this.deploy("stateless-test.jar");
-      RunAsStateless runAs = (RunAsStateless) getInitialContext().lookup("RunAsStatelessEjbName/remote");
-      this.undeploy("stateless-test.jar");
+
    }
 
    public static Test suite() throws Exception