[jboss-cvs] JBossAS SVN: r92389 - in projects/bootstrap/trunk/impl-base/src: test/java/org/jboss/bootstrap/impl/base/server and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 14 15:01:22 EDT 2009
Author: johnbailey
Date: 2009-08-14 15:01:22 -0400 (Fri, 14 Aug 2009)
New Revision: 92389
Added:
projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/TestBoostrap.java
projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/unit/BootstrapTestCase.java
Modified:
projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java
projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/TestNoOpServer.java
Log:
[JBBOOT-87] - Added functionality to remove a bootstrap after it is shut down.
Modified: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java 2009-08-14 16:20:58 UTC (rev 92388)
+++ projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java 2009-08-14 19:01:22 UTC (rev 92389)
@@ -890,6 +890,10 @@
try
{
bootstrap.shutdown(typedServer);
+ // Remove bootstrap from started list
+ if(!startedBootstraps.remove(bootstrap)) {
+ log.warn("Failed to remove bootstrap after shutdown: " + bootstrap);
+ }
}
catch (Throwable t)
{
@@ -1064,7 +1068,7 @@
/**
* @return the startedBootstraps
*/
- private List<Bootstrap<K, T>> getStartedBootstraps()
+ List<Bootstrap<K, T>> getStartedBootstraps()
{
return startedBootstraps;
}
Added: projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/TestBoostrap.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/TestBoostrap.java (rev 0)
+++ projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/TestBoostrap.java 2009-08-14 19:01:22 UTC (rev 92389)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bootstrap.impl.base.server;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.jboss.bootstrap.impl.base.config.TestServerConfig;
+import org.jboss.bootstrap.spi.Bootstrap;
+
+/**
+ * TestBoostrap
+ *
+ * A test Bootstrap used in testing which can be used to validate the lifecycle
+ * of a Bootstrap is invoked based on the start and stop of a Server.
+ *
+ * @author <a href="mailto:baileyje at gmail.com">John Bailey</a>
+ * @version $Revision: $
+ */
+public class TestBoostrap implements Bootstrap<TestNoOpServer, TestServerConfig>
+{
+
+ //-------------------------------------------------------------------------------------||
+ // Instance Members -------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ private BootstrapState currentState;
+
+ private List<BootstrapState> stateTransitions = new LinkedList<BootstrapState>();
+
+ //-------------------------------------------------------------------------------------||
+ // Constructor ------------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ public TestBoostrap()
+ {
+ setState(BootstrapState.UNKNOWN);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.bootstrap.spi.Bootstrap#prepareShutdown(org.jboss.bootstrap.api.server.Server)
+ */
+ public void prepareShutdown(TestNoOpServer server)
+ {
+ setState(BootstrapState.PREPARED_FOR_SHUTDOWN);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.bootstrap.spi.Bootstrap#shutdown(org.jboss.bootstrap.api.server.Server)
+ */
+ public void shutdown(TestNoOpServer server)
+ {
+ setState(BootstrapState.SHUTDOWN);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.bootstrap.spi.Bootstrap#start(org.jboss.bootstrap.api.server.Server)
+ */
+ public void start(TestNoOpServer server) throws Exception
+ {
+ setState(BootstrapState.STARTED);
+ }
+
+ /**
+ * Set the current state of the bootstrap and add the state to the state transition list.
+ * @param bootstrapState BootstrapState representing the current state
+ */
+ private void setState(BootstrapState bootstrapState)
+ {
+ currentState = bootstrapState;
+ stateTransitions.add(currentState);
+ }
+
+ /**
+ * Assert the bootstrap is in a specific state
+ * @param bootstrapState BootstrapState expected state being asserted
+ */
+ public void assertInState(BootstrapState bootstrapState)
+ {
+ TestCase.assertEquals(bootstrapState, currentState);
+ }
+
+ /**
+ * Assert the bootstrap was transitioned through the correct states.
+ * @param bootstrapStates BoostrapState[] ordered list of states
+ */
+ public void assetStateTransition(BootstrapState... bootstrapStates)
+ {
+ TestCase.assertEquals(Arrays.asList(bootstrapStates), stateTransitions);
+ }
+
+ //-------------------------------------------------------------------------------------||
+ // Inner Classes ----------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ /**
+ * Just a simple state enum used to validate what has been called on the bootstrap
+ */
+ public enum BootstrapState {
+ UNKNOWN, STARTED, PREPARED_FOR_SHUTDOWN, SHUTDOWN;
+ }
+}
Modified: projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/TestNoOpServer.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/TestNoOpServer.java 2009-08-14 16:20:58 UTC (rev 92388)
+++ projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/TestNoOpServer.java 2009-08-14 19:01:22 UTC (rev 92389)
@@ -22,8 +22,11 @@
package org.jboss.bootstrap.impl.base.server;
+import java.util.List;
+
import org.jboss.bootstrap.api.server.Server;
import org.jboss.bootstrap.impl.base.config.TestServerConfig;
+import org.jboss.bootstrap.spi.Bootstrap;
import org.jboss.logging.Logger;
/**
@@ -89,4 +92,13 @@
return TestServerConfig.class;
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.bootstrap.impl.base.server.AbstractServer#getStartedBootstraps()
+ */
+ @Override
+ public List<Bootstrap<TestNoOpServer, TestServerConfig>> getStartedBootstraps()
+ {
+ return super.getStartedBootstraps();
+ }
}
Added: projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/unit/BootstrapTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/unit/BootstrapTestCase.java (rev 0)
+++ projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/unit/BootstrapTestCase.java 2009-08-14 19:01:22 UTC (rev 92389)
@@ -0,0 +1,198 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.bootstrap.impl.base.server.unit;
+
+import java.util.Arrays;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.jboss.bootstrap.impl.base.config.TestConfigFactory;
+import org.jboss.bootstrap.impl.base.config.TestServerConfig;
+import org.jboss.bootstrap.impl.base.server.TestBoostrap;
+import org.jboss.bootstrap.impl.base.server.TestNoOpServer;
+import org.jboss.bootstrap.impl.base.server.TestBoostrap.BootstrapState;
+import org.jboss.bootstrap.spi.Bootstrap;
+import org.jboss.logging.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * BootstrapTestCase
+ *
+ * Ensures that bootstraps are correctly started and stopped
+ *
+ * @author <a href="mailto:baileyje at gmail.com">John Bailey</a>
+ * @version $Revision: $
+ */
+public class BootstrapTestCase
+{
+ //-------------------------------------------------------------------------------------||
+ // Class Members ----------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ private static final Logger log = Logger.getLogger(BootstrapTestCase.class);
+
+ //-------------------------------------------------------------------------------------||
+ // Instance Members -------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ private TestNoOpServer server;
+
+ //-------------------------------------------------------------------------------------||
+ // Lifecycle --------------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ /**
+ * Creates and populates the server
+ */
+ @Before
+ public void createServer()
+ {
+ final TestNoOpServer server = new TestNoOpServer();
+ final TestServerConfig config = TestConfigFactory.createConfiguration();
+ server.setConfiguration(config);
+ this.server = server;
+ log.info("Created server: " + server);
+ }
+
+ @After
+ public void removeServer()
+ {
+ this.server = null;
+ log.info("Server reference removed");
+ }
+
+ //-------------------------------------------------------------------------------------||
+ // Tests ------------------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ /**
+ * Test to ensure all bootstrap start operations invoked on server start
+ */
+ @Test
+ public void testBootstrapStartInvokedOnServerStart() throws Throwable
+ {
+ // Log
+ log.info("testBootstrapStartInvokedOnServerStart");
+
+ TestBoostrap testBoostrapOne = new TestBoostrap();
+ TestBoostrap testBoostrapTwo = new TestBoostrap();
+ TestBoostrap testBoostrapThree = new TestBoostrap();
+
+ server.addBootstrap(testBoostrapOne);
+ server.addBootstrap(testBoostrapTwo);
+ server.addBootstrap(testBoostrapThree);
+
+ server.start();
+
+ testBoostrapOne.assertInState(BootstrapState.STARTED);
+ testBoostrapTwo.assertInState(BootstrapState.STARTED);
+ testBoostrapThree.assertInState(BootstrapState.STARTED);
+ }
+
+ /**
+ * Test to ensure all bootstrap stop operations invoked on server stop
+ */
+ @Test
+ public void testBootstrapStopInvokedOnServerStop() throws Throwable
+ {
+ // Log
+ log.info("testBootstrapStopInvokedOnServerStop");
+
+ TestBoostrap testBoostrapOne = new TestBoostrap();
+ TestBoostrap testBoostrapTwo = new TestBoostrap();
+ TestBoostrap testBoostrapThree = new TestBoostrap();
+
+ server.addBootstrap(testBoostrapOne);
+ server.addBootstrap(testBoostrapTwo);
+ server.addBootstrap(testBoostrapThree);
+
+ server.start();
+ server.stop();
+
+ testBoostrapOne.assertInState(BootstrapState.SHUTDOWN);
+ testBoostrapTwo.assertInState(BootstrapState.SHUTDOWN);
+ testBoostrapThree.assertInState(BootstrapState.SHUTDOWN);
+
+ testBoostrapOne.assetStateTransition(BootstrapState.UNKNOWN, BootstrapState.STARTED,
+ BootstrapState.PREPARED_FOR_SHUTDOWN, BootstrapState.SHUTDOWN);
+ testBoostrapTwo.assetStateTransition(BootstrapState.UNKNOWN, BootstrapState.STARTED,
+ BootstrapState.PREPARED_FOR_SHUTDOWN, BootstrapState.SHUTDOWN);
+ testBoostrapThree.assetStateTransition(BootstrapState.UNKNOWN, BootstrapState.STARTED,
+ BootstrapState.PREPARED_FOR_SHUTDOWN, BootstrapState.SHUTDOWN);
+ }
+
+ /**
+ * Test to ensure all bootstraps are removed from the startedBoostrap list after server shutdown
+ */
+ @Test
+ public void testShutdownRemovesFromStartedBootstraps() throws Throwable
+ {
+ // Log
+ log.info("testShutdownRemovesFromStartedBootstraps");
+
+ TestBoostrap testBoostrapOne = new TestBoostrap();
+ TestBoostrap testBoostrapTwo = new TestBoostrap();
+ TestBoostrap testBoostrapThree = new TestBoostrap();
+
+ server.addBootstrap(testBoostrapOne);
+ server.addBootstrap(testBoostrapTwo);
+ server.addBootstrap(testBoostrapThree);
+
+ server.start();
+
+ List<Bootstrap<TestNoOpServer, TestServerConfig>> startedBootstraps = server.getStartedBootstraps();
+
+ // Assert the list is in reverse order of startup
+ TestCase.assertEquals(Arrays.asList(testBoostrapThree, testBoostrapTwo, testBoostrapOne), startedBootstraps);
+
+ server.stop();
+
+ startedBootstraps = server.getStartedBootstraps();
+
+ TestCase.assertTrue(startedBootstraps.isEmpty());
+ }
+
+ /**
+ * Test to ensure a null bootstrap can not be added
+ */
+ @Test
+ public void testBootstrapAddFailsWithNull() throws Throwable
+ {
+ // Log
+ log.info("testBootstrapAddFailsWithNull");
+
+ try
+ {
+ server.addBootstrap(null);
+ TestCase.fail("Should have thrown IllegalArgumentException");
+ }
+ catch (IllegalArgumentException expectedException)
+ {
+ TestCase.assertEquals("Supplied bootstrap was null", expectedException.getMessage());
+ }
+ }
+
+}
More information about the jboss-cvs-commits
mailing list