[jboss-cvs] JBossAS SVN: r102619 - in projects/kernel/trunk/dependency/src: test/java/org/jboss/test/dependency/controller/support and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 19 06:48:27 EDT 2010
Author: adrian at jboss.org
Date: 2010-03-19 06:48:27 -0400 (Fri, 19 Mar 2010)
New Revision: 102619
Added:
projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/support/TestAddDependencyItem.java
projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/AddDependencyInResolveTestCase.java
Modified:
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyInfo.java
projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerTestSuite.java
Log:
[JBKERNEL-113] - Recursively added depdnency items
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyInfo.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyInfo.java 2010-03-19 08:01:02 UTC (rev 102618)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyInfo.java 2010-03-19 10:48:27 UTC (rev 102619)
@@ -78,6 +78,9 @@
/** The semiresolved dependencies by state */
private volatile Map<ControllerState, Set<DependencyItem>> semiResolved;
+ /** Whether we have been modified */
+ private volatile boolean modified = false;
+
/**
* Create an abstract dependency info
*/
@@ -303,6 +306,8 @@
public void addIDependOn(DependencyItem dependency)
{
+ modified = true;
+
Set<DependencyItem> iDependOn = this.iDependOn;
if (iDependOn == null)
{
@@ -414,6 +419,21 @@
public boolean resolveDependencies(Controller controller, ControllerState state)
{
+ modified = false;
+ if (internalResolveDependencies(controller, state) == false)
+ return false;
+
+ while (modified)
+ {
+ modified = false;
+ if (internalResolveDependencies(controller, state) == false)
+ return false;
+ }
+ return true;
+ }
+
+ protected boolean internalResolveDependencies(Controller controller, ControllerState state)
+ {
boolean resolved = true;
Set<DependencyItem> items = getUnresolvedDependencies(state);
if (items.isEmpty() == false)
Added: projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/support/TestAddDependencyItem.java
===================================================================
--- projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/support/TestAddDependencyItem.java (rev 0)
+++ projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/support/TestAddDependencyItem.java 2010-03-19 10:48:27 UTC (rev 102619)
@@ -0,0 +1,59 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, 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.test.dependency.controller.support;
+
+import org.jboss.dependency.plugins.AbstractDependencyItem;
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.DependencyInfo;
+import org.jboss.dependency.spi.DependencyItem;
+
+/**
+ * TestAddDependencyItem.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class TestAddDependencyItem extends AbstractDependencyItem
+{
+ private DependencyInfo info;
+ private Object toAdd;
+ private DependencyItem done;
+
+ public TestAddDependencyItem(Object name, Object iDependOn, ControllerState whenRequired, ControllerState dependentState, DependencyInfo info, Object toAdd)
+ {
+ super(name, iDependOn, whenRequired, dependentState);
+ this.info = info;
+ this.toAdd = toAdd;
+ }
+
+ @Override
+ public boolean resolve(Controller controller)
+ {
+ if (done == null)
+ {
+ done = new AbstractDependencyItem(getName(), toAdd, getWhenRequired(), getDependentState());
+ info.addIDependOn(done);
+ }
+ return super.resolve(controller);
+ }
+}
Added: projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/AddDependencyInResolveTestCase.java
===================================================================
--- projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/AddDependencyInResolveTestCase.java (rev 0)
+++ projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/AddDependencyInResolveTestCase.java 2010-03-19 10:48:27 UTC (rev 102619)
@@ -0,0 +1,96 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2010, Red Hat Inc., and individual contributors
+* by the @authors tag. See the copyright.txt 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.test.dependency.controller.test;
+
+import java.util.Collections;
+import java.util.Map;
+
+import junit.framework.Test;
+
+import org.jboss.dependency.plugins.AbstractControllerContext;
+import org.jboss.dependency.plugins.AbstractControllerContextActions;
+import org.jboss.dependency.plugins.action.ControllerContextAction;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerContextActions;
+import org.jboss.dependency.spi.ControllerMode;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.DependencyInfo;
+import org.jboss.test.dependency.controller.support.TestAddDependencyItem;
+
+/**
+ * AddDependencyInResolveTestCase.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class AddDependencyInResolveTestCase extends AbstractDependencyTest
+{
+ public static Test suite()
+ {
+ return suite(AddDependencyInResolveTestCase.class);
+ }
+
+ public AddDependencyInResolveTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testAddDepenencyNotResolved() throws Throwable
+ {
+ Map<ControllerState, ControllerContextAction> actionsMap = Collections.emptyMap();
+ ControllerContextActions actions = new AbstractControllerContextActions(actionsMap);
+
+ ControllerContext ctx1 = new AbstractControllerContext("1", actions);
+ ctx1.setMode(ControllerMode.AUTOMATIC);
+ assertInstall(ctx1, ControllerState.INSTALLED);
+
+ ControllerContext ctx2 = new AbstractControllerContext("2", actions);
+ ctx2.setMode(ControllerMode.MANUAL);
+ DependencyInfo ctx2dependencies = ctx2.getDependencyInfo();
+ ctx2dependencies.addIDependOn(new TestAddDependencyItem("2", "1", ControllerState.INSTALLED, ControllerState.INSTALLED, ctx2dependencies, "3"));
+ assertInstall(ctx2, ControllerState.NOT_INSTALLED);
+
+ assertChange(ctx2, ControllerState.INSTALLED, ControllerState.START);
+ }
+
+ public void testAddDepenencyResolved() throws Throwable
+ {
+ Map<ControllerState, ControllerContextAction> actionsMap = Collections.emptyMap();
+ ControllerContextActions actions = new AbstractControllerContextActions(actionsMap);
+
+ ControllerContext ctx1 = new AbstractControllerContext("1", actions);
+ ctx1.setMode(ControllerMode.AUTOMATIC);
+ assertInstall(ctx1, ControllerState.INSTALLED);
+
+ ControllerContext ctx3 = new AbstractControllerContext("3", actions);
+ ctx3.setMode(ControllerMode.AUTOMATIC);
+ assertInstall(ctx3, ControllerState.INSTALLED);
+
+ ControllerContext ctx2 = new AbstractControllerContext("2", actions);
+ ctx2.setMode(ControllerMode.MANUAL);
+ DependencyInfo ctx2dependencies = ctx2.getDependencyInfo();
+ ctx2dependencies.addIDependOn(new TestAddDependencyItem("2", "1", ControllerState.INSTALLED, ControllerState.INSTALLED, ctx2dependencies, "3"));
+ assertInstall(ctx2, ControllerState.NOT_INSTALLED);
+
+ assertChange(ctx2, ControllerState.INSTALLED);
+ }
+}
Modified: projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerTestSuite.java
===================================================================
--- projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerTestSuite.java 2010-03-19 08:01:02 UTC (rev 102618)
+++ projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerTestSuite.java 2010-03-19 10:48:27 UTC (rev 102619)
@@ -76,6 +76,7 @@
suite.addTest(ControllerAsRnQTestCase.suite());
suite.addTest(ControllerStateTestCase.suite());
suite.addTest(SemiResolveDependencyTestCase.suite());
+ suite.addTest(AddDependencyInResolveTestCase.suite());
return suite;
}
More information about the jboss-cvs-commits
mailing list