[Jboss-cvs] JBossAS SVN: r56277 - trunk/testsuite/src/main/org/jboss/test/security/test

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

Author: scott.stark at jboss.org
Date: 2006-08-25 15:10:01 -0400 (Fri, 25 Aug 2006)
New Revision: 56277

Modified:
   trunk/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java
Log:
Remove the service to fully cleanup failed deployments

Modified: trunk/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java	2006-08-25 18:52:25 UTC (rev 56276)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java	2006-08-25 19:10:01 UTC (rev 56277)
@@ -30,6 +30,7 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
   
+import org.jboss.system.ServiceContext;
 import org.jboss.test.JBossTestCase;
 import org.jboss.test.JBossTestSetup; 
 import org.jboss.test.util.ServiceControllerUtil;
@@ -96,7 +97,8 @@
       sutil.startAService(serviceName);
       assertTrue("Started?", sutil.isStarted(serviceName));
       sutil.destroyAService(serviceName);
-      assertTrue("Destroyed?", sutil.isDestroyed(serviceName));
+      assertEquals("state is Destroyed", ServiceContext.getStateString(ServiceContext.DESTROYED),
+            sutil.getStateString(serviceName));
       if(server.isRegistered(serviceName))
          server.unregisterMBean(serviceName);
    } 
@@ -109,14 +111,18 @@
    {
       MBeanServerConnection server = getServer(); 
       ObjectName serviceName = new ObjectName("jboss:service=TestDynamicLoginConfig");
+      sutil.removeAService(serviceName);
       if(server.isRegistered(serviceName))
+      {
          server.unregisterMBean(serviceName);
+      }
       prepareTestDynamicLoginConfig(server, 
             new ObjectName("jboss:service=TestDynamicLoginConfig"), null); 
       try
       { 
          sutil.createAService(serviceName);
-         assertTrue("Created?", sutil.isCreated(serviceName)); 
+         assertEquals("state is Created", ServiceContext.getStateString(ServiceContext.CREATED),
+               sutil.getStateString(serviceName));
          sutil.startAService(serviceName);
          assertFalse("Should not Start", sutil.isStarted(serviceName));  
       }
@@ -129,7 +135,8 @@
          if(sutil.isStarted(serviceName)) 
          {
             sutil.stopAService(serviceName);
-            assertTrue("Stopped?", sutil.isStopped(serviceName));
+            assertEquals("state is Stopped", ServiceContext.getStateString(ServiceContext.STOPPED),
+                  sutil.getStateString(serviceName));
          } 
       } 
         
@@ -146,13 +153,18 @@
       }
       finally
       {
-         if(sutil.isStarted(serviceName)) 
+         boolean isStarted = sutil.isStarted(serviceName);
+         log.info(serviceName+", isStarted: "+isStarted);
+         if(isStarted) 
          {
             sutil.stopAService(serviceName);
-            assertTrue("Stopped?", sutil.isStopped(serviceName)); 
-         }  
+            assertEquals("state is Stopped", ServiceContext.getStateString(ServiceContext.STOPPED),
+                  sutil.getStateString(serviceName));
+         }
          sutil.destroyAService(serviceName);
-         assertTrue("Destroyed?", sutil.isDestroyed(serviceName));
+         assertEquals("state is Destroyed", ServiceContext.getStateString(ServiceContext.DESTROYED),
+               sutil.getStateString(serviceName));
+         sutil.removeAService(serviceName);
          if(server.isRegistered(serviceName))
             server.unregisterMBean(serviceName);
       }