[jboss-cvs] JBossAS SVN: r87978 - projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server.

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

Author: ALRubinger
Date: 2009-04-29 01:46:35 -0400 (Wed, 29 Apr 2009)
New Revision: 87978

Modified:
   projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerInitializationTestCase.java
   projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/NoOpJBossASServer.java
Log:
[JBBOOT-54] Allow option for NoOpJBossASServer to skip initialization/validation, which breaks the KernelEvents test if there is a JBOSS_HOME env set

Modified: projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerInitializationTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerInitializationTestCase.java	2009-04-29 05:41:16 UTC (rev 87977)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/JBossASServerInitializationTestCase.java	2009-04-29 05:46:35 UTC (rev 87978)
@@ -69,7 +69,7 @@
    public void createAndInitServer() throws Throwable
    {
       // Create a server that skips real start/stop
-      this.server = new NoOpJBossASServer();
+      this.server = new NoOpJBossASServer(true);
 
       // Set some JBOSS_HOME explicitly so the tests are reproducible
       // (environment properties cannot be mutated via the test env, and we need

Modified: projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/NoOpJBossASServer.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/NoOpJBossASServer.java	2009-04-29 05:41:16 UTC (rev 87977)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/server/NoOpJBossASServer.java	2009-04-29 05:46:35 UTC (rev 87978)
@@ -42,6 +42,37 @@
    private static final Logger log = Logger.getLogger(NoOpJBossASServer.class);
 
    //-------------------------------------------------------------------------------||
+   // Constructor ------------------------------------------------------------------||
+   //-------------------------------------------------------------------------------||
+
+   /**
+    * Constructor to clear all initializers and validators
+    */
+   public NoOpJBossASServer()
+   {
+      super();
+      this.setConfigInitializer(null);
+      this.setServerInitializer(null);
+      this.setValidator(null);
+   }
+
+   /**
+    * Constructor to optionally clear all initializers and validators
+    */
+   public NoOpJBossASServer(final boolean useInitializersAndValidators)
+   {
+      super();
+
+      // Clear our initializers and validators if specified
+      if (!useInitializersAndValidators)
+      {
+         this.setConfigInitializer(null);
+         this.setServerInitializer(null);
+         this.setValidator(null);
+      }
+   }
+
+   //-------------------------------------------------------------------------------||
    // Overridden Implementations ---------------------------------------------------||
    //-------------------------------------------------------------------------------||