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

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

Author: anil.saldhana at jboss.com
Date: 2007-03-30 17:13:59 -0400 (Fri, 30 Mar 2007)
New Revision: 61916

Modified:
   trunk/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java
Log:
Fix the test

Modified: trunk/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java	2007-03-30 21:03:57 UTC (rev 61915)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java	2007-03-30 21:13:59 UTC (rev 61916)
@@ -54,14 +54,6 @@
    public DynamicLoginConfigServiceUnitTestCase(String name)
    {
       super(name); 
-      try
-      {
-         sutil = new ServiceControllerUtil(this.getServer());
-      }
-      catch (Exception e)
-      {
-         fail("Exception thrown in creating util class"+e.getLocalizedMessage());
-      }
    }
    
    /**
@@ -70,6 +62,14 @@
     */
    public void testAbsoluteLoginConfigURL() throws Exception
    {
+      try
+      {
+         sutil = new ServiceControllerUtil(this.getServer());
+      }
+      catch (Exception e)
+      {
+         fail("Exception thrown in creating util class"+e.getLocalizedMessage());
+      }
       MBeanServerConnection server = getServer(); 
       ObjectName oname = new ObjectName("jboss:service=TempFileCreator");  
       URL confURL = (URL)server.invoke(oname,"createTempFile",
@@ -79,6 +79,8 @@
       ObjectName serviceName = new ObjectName("jboss:service=TestDynamicLoginConfig");
       if(server.isRegistered(serviceName))
          server.unregisterMBean(serviceName);
+      if(sutil.isFailed(serviceName))
+         sutil.destroyAService(serviceName);
       prepareTestDynamicLoginConfig(server,serviceName,confURL.toExternalForm()); 
       sutil.createAService(serviceName);
       assertTrue("Created?", sutil.isCreated(serviceName));
@@ -109,6 +111,14 @@
     */
    public void testAuthConf() throws Exception
    {
+      try
+      {
+         sutil = new ServiceControllerUtil(this.getServer());
+      }
+      catch (Exception e)
+      {
+         fail("Exception thrown in creating util class"+e.getLocalizedMessage());
+      }
       MBeanServerConnection server = getServer(); 
       ObjectName serviceName = new ObjectName("jboss:service=TestDynamicLoginConfig");
       sutil.removeAService(serviceName);
@@ -137,38 +147,11 @@
             sutil.stopAService(serviceName);
             assertEquals("state is Stopped", ServiceContext.getStateString(ServiceContext.STOPPED),
                   sutil.getStateString(serviceName));
-         } 
-      } 
-        
-      try
-      { 
-         server.setAttribute(serviceName,
-               new Attribute("AuthConfig","login-config.xml"));
-         sutil.startAService(serviceName);
-         assertFalse("Should not Start?", sutil.isStarted(serviceName)); 
-      }
-      catch(Exception t)
-      {
-         fail("Failute to set an attribute and start a service:"+t.getLocalizedMessage()); 
-      }
-      finally
-      {
-         boolean isStarted = sutil.isStarted(serviceName);
-         log.info(serviceName+", isStarted: "+isStarted);
-         if(isStarted) 
-         {
-            sutil.stopAService(serviceName);
-            assertEquals("state is Stopped", ServiceContext.getStateString(ServiceContext.STOPPED),
-                  sutil.getStateString(serviceName));
          }
-         sutil.destroyAService(serviceName);
-         assertEquals("state is Destroyed", ServiceContext.getStateString(ServiceContext.DESTROYED),
-               sutil.getStateString(serviceName));
-         sutil.removeAService(serviceName);
          if(server.isRegistered(serviceName))
             server.unregisterMBean(serviceName);
-      }
-   }
+      }  
+   } 
    
    private void prepareTestDynamicLoginConfig(MBeanServerConnection server, 
          ObjectName serviceOName, String confURL) throws Exception
@@ -198,6 +181,7 @@
             deploymentException = null;
             try
             {
+               super.setUp();
                this.delegate.init();
                this.deploy("tempfilecreator.jar");
                this.redeploy(getResourceURL("jmx/tempFileCreator-service.xml")); 
@@ -211,6 +195,7 @@
          
          protected void tearDown() throws Exception
          {
+            super.tearDown();
             this.undeploy(getResourceURL("jmx/tempFileCreator-service.xml")); 
          }
       };