[jboss-cvs] JBossAS SVN: r78973 - in trunk/testsuite/src/main/org/jboss/test/security: test and 1 other directory.

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

Author: mmoyses
Date: 2008-09-30 20:45:53 -0400 (Tue, 30 Sep 2008)
New Revision: 78973

Modified:
   trunk/testsuite/src/main/org/jboss/test/security/ejb/RunAsWithRolesMDB.java
   trunk/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/security/test/EJBSpecUnitTestCase.java
Log:
Fixing security tests that fail when run twice in a row

Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/RunAsWithRolesMDB.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/RunAsWithRolesMDB.java	2008-09-30 22:40:12 UTC (rev 78972)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/RunAsWithRolesMDB.java	2008-10-01 00:45:53 UTC (rev 78973)
@@ -101,9 +101,10 @@
          Name programs = parser.parse("/Programs Files");
          bean.createFolder(programs);
          // This requires DeleteFolder role
-         bean.deleteItem(programs);
+         bean.deleteFolder(programs, true);
          sendReply(replyTo, "Role tests ok");
-         bean.remove();
+         // cannot remove because of JBAS-3946
+         // bean.remove();
       }
       catch(Throwable e)
       {

Modified: trunk/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java	2008-09-30 22:40:12 UTC (rev 78972)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java	2008-10-01 00:45:53 UTC (rev 78973)
@@ -78,7 +78,7 @@
       assertNotNull(" config url != null",confURL); 
       ObjectName serviceName = new ObjectName("jboss:service=TestDynamicLoginConfig");
       if(server.isRegistered(serviceName))
-         server.unregisterMBean(serviceName); 
+         server.unregisterMBean(serviceName);
       prepareTestDynamicLoginConfig(server,serviceName,confURL.toExternalForm()); 
       sutil.createAService(serviceName);
       assertTrue("Created?", sutil.isCreated(serviceName));
@@ -99,6 +99,7 @@
       sutil.destroyAService(serviceName);
       assertEquals("state is Destroyed", ServiceContext.getStateString(ServiceContext.DESTROYED),
             sutil.getStateString(serviceName));
+      sutil.removeAService(serviceName);
       if(server.isRegistered(serviceName))
          server.unregisterMBean(serviceName);
    } 
@@ -119,7 +120,6 @@
       }
       MBeanServerConnection server = getServer(); 
       ObjectName serviceName = new ObjectName("jboss:service=TestDynamicLoginConfig");
-      sutil.removeAService(serviceName);
       if(server.isRegistered(serviceName))
       {
          server.unregisterMBean(serviceName);
@@ -146,6 +146,8 @@
             assertEquals("state is Stopped", ServiceContext.getStateString(ServiceContext.STOPPED),
                   sutil.getStateString(serviceName));
          }
+         sutil.destroyAService(serviceName);
+         sutil.removeAService(serviceName);
          if(server.isRegistered(serviceName))
             server.unregisterMBean(serviceName);
       }  
@@ -181,7 +183,7 @@
             {
                super.setUp();
                this.delegate.init();
-               this.deploy("tempfilecreator.jar");
+               this.redeploy("tempfilecreator.jar");
                this.redeploy(getResourceURL("jmx/tempFileCreator-service.xml")); 
             }
             catch (Exception ex)
@@ -193,8 +195,9 @@
          
          protected void tearDown() throws Exception
          {
+            this.undeploy(getResourceURL("jmx/tempFileCreator-service.xml"));
+            this.undeploy("tempfilecreator.jar");
             super.tearDown();
-            this.undeploy(getResourceURL("jmx/tempFileCreator-service.xml")); 
          }
       };
       return wrapper; 

Modified: trunk/testsuite/src/main/org/jboss/test/security/test/EJBSpecUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/EJBSpecUnitTestCase.java	2008-09-30 22:40:12 UTC (rev 78972)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/EJBSpecUnitTestCase.java	2008-10-01 00:45:53 UTC (rev 78973)
@@ -626,7 +626,7 @@
          String info = msg.getStringProperty("reply");
          if (info == null || info.startsWith("Failed"))
          {
-            fail("Recevied exception reply, info=" + info);
+            fail("Received exception reply, info=" + info);
          }
       }
       finally
@@ -676,7 +676,7 @@
          String info = msg.getStringProperty("reply");
          if (info == null || info.startsWith("Failed"))
          {
-            fail("Recevied exception reply, info=" + info);
+            fail("Received exception reply, info=" + info);
          }
       }
       finally
@@ -725,7 +725,7 @@
          String info = msg.getStringProperty("reply");
          if (info == null || info.startsWith("Failed"))
          {
-            fail("Recevied exception reply, info=" + info);
+            fail("Received exception reply, info=" + info);
          }
       }
       finally