[jboss-cvs] JBossAS SVN: r80341 - projects/server-manager/trunk/src/test/java/org/jboss/jbossas/servermanager/test/startstop/unit.

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

Author: akostadinov
Date: 2008-11-02 06:11:04 -0500 (Sun, 02 Nov 2008)
New Revision: 80341

Modified:
   projects/server-manager/trunk/src/test/java/org/jboss/jbossas/servermanager/test/startstop/unit/FailStartStopTest.java
Log:
JBASM-15 - use AsLifecycleDelegate where possible

Modified: projects/server-manager/trunk/src/test/java/org/jboss/jbossas/servermanager/test/startstop/unit/FailStartStopTest.java
===================================================================
--- projects/server-manager/trunk/src/test/java/org/jboss/jbossas/servermanager/test/startstop/unit/FailStartStopTest.java	2008-11-02 11:06:10 UTC (rev 80340)
+++ projects/server-manager/trunk/src/test/java/org/jboss/jbossas/servermanager/test/startstop/unit/FailStartStopTest.java	2008-11-02 11:11:04 UTC (rev 80341)
@@ -50,8 +50,6 @@
 public class FailStartStopTest
 {
 
-   //TODO: change according to StartStopTest in JBASM-13
-
    //----------------------------------------------------------------------------------||
    // Class Members -------------------------------------------------------------------||
    //----------------------------------------------------------------------------------||
@@ -60,10 +58,6 @@
     * Configuration
     */
 
-   private static final String JAVA_HOME = AsLifecycleDelegate.getJavaHome();
-
-   private static final String JBOSS_HOME = AsLifecycleDelegate.getJbossHome();
-
    private static final String SERVER_NAME = AsLifecycleDelegate.SERVER_NAME_DEFAULT;
 
    /**
@@ -90,7 +84,7 @@
 
       // Add the Server to the Manager
       TimeoutConfigurableMananager manager = (TimeoutConfigurableMananager) getServerManager();
-      manager.addServer(server);
+      AsLifecycleDelegate.applyServerDefaults(server, manager);
 
       boolean timedOut = false;
 
@@ -152,7 +146,7 @@
 
       // Add the Server to the Manager
       ServerManager manager = getServerManager();
-      manager.addServer(server);
+      AsLifecycleDelegate.applyServerDefaults(server, manager);
 
       // Start server
       ServerController.startServer(server, manager);
@@ -206,12 +200,10 @@
    {
       // Create ServerManager
       TimeoutConfigurableMananager serverManager = new TimeoutConfigurableMananager();
+      AsLifecycleDelegate.applyServerManagerDefaults(serverManager);
+
       setServerManager(serverManager);
       initTimeout = serverManager.getStartupTimeout();
-
-      // Set JVM / JBOSS_HOME
-      serverManager.setJavaHome(getJavaHome());
-      serverManager.setJbossHome(getJbossHome());
    }
 
    /**
@@ -243,16 +235,6 @@
    // Internal Helper Methods ---------------------------------------------------------||
    //----------------------------------------------------------------------------------||
 
-   protected static String getJavaHome()
-   {
-      return JAVA_HOME;
-   }
-
-   protected static String getJbossHome()
-   {
-      return JBOSS_HOME;
-   }
-
    private static ServerManager getServerManager()
    {
       return serverManager;