[jboss-cvs] JBossAS SVN: r100882 - in projects/kernel/trunk: jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 11 11:25:19 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-02-11 11:25:18 -0500 (Thu, 11 Feb 2010)
New Revision: 100882
Modified:
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test/JMXDependsMCUnitTestCase.java
projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/NewOnDemandDependencyTest.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/PlainLifecycleDependencyTestCase.java
Log:
[JBKERNEL-95] Don't break out of states loop in resolveContexts if a context was incremented
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2010-02-11 16:18:38 UTC (rev 100881)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2010-02-11 16:25:18 UTC (rev 100882)
@@ -1109,7 +1109,8 @@
if (resolveContexts(fromState, toState, trace))
{
resolutions = true;
- break;
+ //Removed as part of JBKERNEL-95 see http://community.jboss.org/message/525792#525792
+ //break;
}
}
}
Modified: projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test/JMXDependsMCUnitTestCase.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test/JMXDependsMCUnitTestCase.java 2010-02-11 16:18:38 UTC (rev 100881)
+++ projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test/JMXDependsMCUnitTestCase.java 2010-02-11 16:25:18 UTC (rev 100882)
@@ -59,9 +59,9 @@
assertNotNull(bean);
SimpleBean simpleBean = assertInstanceOf(SimpleBean.class, bean);
- assertEquals(2, simple.createOrder);
- assertEquals(4, simple.startOrder);
- assertEquals(1, simpleBean.createOrder);
- assertEquals(3, simpleBean.startOrder);
+ assertTrue(simpleBean.createOrder < simpleBean.startOrder);
+ assertTrue(simple.createOrder < simple.startOrder);
+ assertTrue(simpleBean.createOrder < simple.createOrder);
+ assertTrue(simpleBean.startOrder < simple.startOrder);
}
}
Modified: projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/NewOnDemandDependencyTest.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/NewOnDemandDependencyTest.java 2010-02-11 16:18:38 UTC (rev 100881)
+++ projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/NewOnDemandDependencyTest.java 2010-02-11 16:25:18 UTC (rev 100882)
@@ -61,7 +61,14 @@
Simple test1 = null;
Simple test2 = null;
Simple test3 = null;
-
+
+ int start1 = 0;
+ int create1 = 0;
+ int start2 = 0;
+ int create2 = 0;
+ int start3 = 0;
+ int create3 = 0;
+
boolean error = false;
List<ObjectName> mbeans1 = deploy(resourceName1);
@@ -81,20 +88,29 @@
assertServiceRunning(NAME_TWO);
test1 = getMBean(Simple.class, NAME_ONE, "Instance");
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ create1 = test1.createOrder;
+ start1 = test1.startOrder;
+ assertTrue(create1 < start1);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
+
test2 = getMBean(Simple.class, NAME_TWO, "Instance");
assertEquals("()", test2.constructorUsed);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ start2 = test2.startOrder;
+ create2 = test2.createOrder;
+ assertTrue(create2 < start2);
+ assertTrue(create1 < create2);
+ assertTrue(start1 < start2);
assertEquals(0, test2.stopOrder);
assertEquals(0, test2.destroyOrder);
+
test3 = getMBean(Simple.class, NAME_THREE, "Instance");
assertEquals("()", test3.constructorUsed);
- assertEquals(5, test3.createOrder);
- assertEquals(6, test3.startOrder);
+ start3 = test3.startOrder;
+ create3 = test3.createOrder;
+ assertTrue(create3 < start3);
+ assertTrue(create2 < create3);
+ assertTrue(start2 < start3);
assertEquals(0, test3.stopOrder);
assertEquals(0, test3.destroyOrder);
@@ -116,19 +132,19 @@
if (error == false)
{
assertServiceRunning(NAME_ONE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
assertNoService(NAME_TWO);
assertNotRegistered(NAME_TWO);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
assertEquals(7, test2.stopOrder);
assertEquals(8, test2.destroyOrder);
assertServiceRunning(NAME_THREE);
- assertEquals(5, test3.createOrder);
- assertEquals(6, test3.startOrder);
+ assertEquals(create3, test3.createOrder);
+ assertEquals(start3, test3.startOrder);
assertEquals(0, test3.stopOrder);
assertEquals(0, test3.destroyOrder);
}
@@ -152,23 +168,23 @@
{
assertNoService(NAME_ONE);
assertNotRegistered(NAME_ONE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(10, test1.stopOrder);
assertEquals(12, test1.destroyOrder);
assertNoService(NAME_TWO);
assertNotRegistered(NAME_TWO);
if (test2 != null)
{
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
assertEquals(7, test2.stopOrder);
assertEquals(8, test2.destroyOrder);
}
if (test3 != null)
{
- assertEquals(5, test3.createOrder);
- assertEquals(6, test3.startOrder);
+ assertEquals(create3, test3.createOrder);
+ assertEquals(start3, test3.startOrder);
assertEquals(9, test3.stopOrder);
assertEquals(11, test3.destroyOrder);
}
@@ -185,6 +201,11 @@
Simple test1 = null;
Simple test2 = null;
+ int start1 = 0;
+ int create1 = 0;
+ int start2 = 0;
+ int create2 = 0;
+
boolean error = false;
List<ObjectName> mbeans2 = deploy(resourceName2);
@@ -205,14 +226,21 @@
assertServiceRunning(NAME_TWO);
assertServiceRunning(NAME_ONE);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ test1 = getMBean(Simple.class, NAME_ONE, "Instance");
+ assertEquals("()", test1.constructorUsed);
+
+ create1 = test1.createOrder;
+ start1 = test1.startOrder;
+ start2 = test2.startOrder;
+ create2 = test2.createOrder;
+
+ assertTrue(create1 < start1);
+ assertTrue(create2 < start2);
+ assertTrue(create1 < create2);
+ assertTrue(start1 < start2);
+
assertEquals(0, test2.stopOrder);
assertEquals(0, test2.destroyOrder);
- test1 = getMBean(Simple.class, NAME_ONE, "Instance");
- assertEquals("()", test1.constructorUsed);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
}
@@ -233,13 +261,13 @@
if (error == false)
{
assertServiceDestroyed(NAME_TWO);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
assertEquals(5, test2.stopOrder);
assertEquals(7, test2.destroyOrder);
assertNotRegistered(NAME_ONE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(6, test1.stopOrder);
assertEquals(8, test1.destroyOrder);
}
@@ -263,16 +291,16 @@
{
assertNoService(NAME_TWO);
assertNotRegistered(NAME_TWO);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
assertEquals(5, test2.stopOrder);
assertEquals(7, test2.destroyOrder);
assertNoService(NAME_ONE);
assertNotRegistered(NAME_ONE);
if (test1 != null)
{
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(6, test1.stopOrder);
assertEquals(8, test1.destroyOrder);
}
@@ -286,6 +314,13 @@
Simple test2 = null;
Simple test3 = null;
+ int start1 = 0;
+ int create1 = 0;
+ int start2 = 0;
+ int create2 = 0;
+ int start3 = 0;
+ int create3 = 0;
+
boolean error = false;
List<ObjectName> mbeans1 = deploy(resourceName1);
@@ -302,20 +337,28 @@
test1 = getMBean(Simple.class, NAME_ONE, "Instance");
assertEquals("()", test1.constructorUsed);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ test2 = getMBean(Simple.class, NAME_TWO, "Instance");
+ assertEquals("()", test2.constructorUsed);
+ test3 = getMBean(Simple.class, NAME_THREE, "Instance");
+ assertEquals("()", test2.constructorUsed);
+
+ create1 = test1.createOrder;
+ start1 = test1.startOrder;
+ start2 = test2.startOrder;
+ create2 = test2.createOrder;
+ start3 = test3.startOrder;
+ create3 = test3.createOrder;
+ assertTrue(create1 < start1);
+ assertTrue(create2 < start2);
+ assertTrue(create3 < start3);
+ assertTrue(create1 < create2);
+ assertTrue(create2 < start3);
+ assertTrue(start1 < start2);
+ assertTrue(start2 < start3);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
- test2 = getMBean(Simple.class, NAME_TWO, "Instance");
- assertEquals("()", test2.constructorUsed);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
assertEquals(0, test2.stopOrder);
assertEquals(0, test2.destroyOrder);
- test3 = getMBean(Simple.class, NAME_THREE, "Instance");
- assertEquals("()", test2.constructorUsed);
- assertEquals(5, test3.createOrder);
- assertEquals(6, test3.startOrder);
assertEquals(0, test3.stopOrder);
assertEquals(0, test3.destroyOrder);
@@ -325,16 +368,16 @@
assertServiceDestroyed(NAME_TWO);
assertServiceDestroyed(NAME_THREE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(9, test1.stopOrder);
assertEquals(12, test1.destroyOrder);
assertDoubleEquals(7, 8, test2.stopOrder, test3.stopOrder);
assertDoubleEquals(10, 11, test2.destroyOrder, test3.destroyOrder);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
- assertEquals(5, test3.createOrder);
- assertEquals(6, test3.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
+ assertEquals(create3, test3.createOrder);
+ assertEquals(start3, test3.startOrder);
mbeans1 = deploy(resourceName1);
@@ -344,12 +387,24 @@
test1 = getMBean(Simple.class, NAME_ONE, "Instance");
assertEquals("()", test1.constructorUsed);
- assertEquals(13, test1.createOrder);
- assertEquals(16, test1.startOrder);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
- assertDoubleEquals(14, 15, test2.createOrder, test3.createOrder);
- assertDoubleEquals(17, 18, test2.startOrder, test3.startOrder);
+
+ assertTrue (create1 < test1.createOrder);
+ assertTrue(start1 < test1.startOrder);
+ create1 = test1.createOrder;
+ start1 = test1.startOrder;
+ start2 = test2.startOrder;
+ create2 = test2.createOrder;
+ start3 = test3.startOrder;
+ create3 = test3.createOrder;
+ assertTrue(create1 < start1);
+ assertTrue(create2 < start2);
+ assertTrue(create3 < start3);
+ assertTrue(create1 < create2);
+ assertTrue(create1 < create3);
+ assertTrue(start1 < start2);
+ assertTrue(start1 < start3);
assertDoubleEquals(7, 8, test2.stopOrder, test3.stopOrder);
assertDoubleEquals(10, 11, test2.destroyOrder, test3.destroyOrder);
@@ -371,14 +426,16 @@
if (error == false)
{
assertServiceRunning(NAME_ONE);
- assertEquals(13, test1.createOrder);
- assertEquals(16, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
assertNoService(NAME_TWO);
assertNotRegistered(NAME_TWO);
- assertDoubleEquals(14, 15, test2.createOrder, test3.createOrder);
- assertDoubleEquals(17, 18, test2.startOrder, test3.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(create3, test3.createOrder);
+ assertEquals(start2, test2.startOrder);
+ assertEquals(start3, test3.startOrder);
assertEquals(19, test2.stopOrder);
assertEquals(20, test2.destroyOrder);
assertEitherEquals(7, 8, test3.stopOrder);
@@ -404,23 +461,23 @@
{
assertNoService(NAME_ONE);
assertNotRegistered(NAME_ONE);
- assertEquals(13, test1.createOrder);
- assertEquals(16, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(22, test1.stopOrder);
assertEquals(24, test1.destroyOrder);
assertNoService(NAME_TWO);
assertNotRegistered(NAME_TWO);
if (test2 != null)
{
- assertEitherEquals(14, 15, test2.createOrder);
- assertEitherEquals(17, 18, test2.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
assertEquals(19, test2.stopOrder);
assertEquals(20, test2.destroyOrder);
}
if (test3 != null)
{
- assertEitherEquals(14, 15, test3.createOrder);
- assertEitherEquals(17, 18, test3.startOrder);
+ assertEquals(create3, test3.createOrder);
+ assertEquals(start3, test3.startOrder);
assertEquals(21, test3.stopOrder);
assertEquals(23, test3.destroyOrder);
}
@@ -437,6 +494,13 @@
Simple test2 = null;
Simple test3 = null;
+ int start1 = 0;
+ int create1 = 0;
+ int start2 = 0;
+ int create2 = 0;
+ int start3 = 0;
+ int create3 = 0;
+
boolean error = false;
List<ObjectName> mbeans1 = deploy(resourceName1);
@@ -453,39 +517,48 @@
test1 = getMBean(Simple.class, NAME_ONE, "Instance");
assertEquals("()", test1.constructorUsed);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ test2 = getMBean(Simple.class, NAME_TWO, "Instance");
+ assertEquals("()", test2.constructorUsed);
+ test3 = getMBean(Simple.class, NAME_THREE, "Instance");
+ assertEquals("()", test3.constructorUsed);
+
+ create1 = test1.createOrder;
+ start1 = test1.startOrder;
+ start2 = test2.startOrder;
+ create2 = test2.createOrder;
+ start3 = test3.startOrder;
+ create3 = test3.createOrder;
+ assertTrue(create1 < start1);
+ assertTrue(create2 < start2);
+ assertTrue(create3 < start3);
+ assertTrue(create1 < create2);
+ assertTrue(create2 < start3);
+ assertTrue(start1 < start2);
+ assertTrue(start2 < start3);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
- test2 = getMBean(Simple.class, NAME_TWO, "Instance");
- assertEquals("()", test2.constructorUsed);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
assertEquals(0, test2.stopOrder);
assertEquals(0, test2.destroyOrder);
- test3 = getMBean(Simple.class, NAME_THREE, "Instance");
- assertEquals("()", test3.constructorUsed);
- assertEquals(5, test3.createOrder);
- assertEquals(6, test3.startOrder);
assertEquals(0, test3.stopOrder);
assertEquals(0, test3.destroyOrder);
+
undeploy(mbeans2);
assertServiceRunning(NAME_ONE);
assertNoService(NAME_TWO);
assertServiceRunning(NAME_THREE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
assertEquals(7, test2.stopOrder);
assertEquals(8, test2.destroyOrder);
- assertEquals(5, test3.createOrder);
- assertEquals(6, test3.startOrder);
+ assertEquals(create3, test3.createOrder);
+ assertEquals(start3, test3.startOrder);
assertEquals(0, test3.stopOrder);
assertEquals(0, test3.destroyOrder);
@@ -495,8 +568,8 @@
assertServiceRunning(NAME_TWO);
assertServiceRunning(NAME_THREE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
test2 = getMBean(Simple.class, NAME_TWO, "Instance");
@@ -527,8 +600,8 @@
if (error == false)
{
assertServiceRunning(NAME_ONE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
assertNoService(NAME_TWO);
@@ -558,8 +631,8 @@
{
assertNoService(NAME_ONE);
assertNotRegistered(NAME_ONE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(14, test1.stopOrder);
assertEquals(16, test1.destroyOrder);
assertNoService(NAME_TWO);
@@ -573,8 +646,8 @@
}
if (test3 != null)
{
- assertEquals(5, test3.createOrder);
- assertEquals(6, test3.startOrder);
+ assertEquals(create3, test3.createOrder);
+ assertEquals(start3, test3.startOrder);
assertEquals(13, test3.stopOrder);
assertEquals(15, test3.destroyOrder);
}
@@ -589,6 +662,11 @@
Simple test1 = null;
Simple test2 = null;
+ int start1 = 0;
+ int create1 = 0;
+ int start2 = 0;
+ int create2 = 0;
+
boolean error = false;
List<ObjectName> mbeans1 = deploy(resourceName1);
@@ -602,28 +680,33 @@
test1 = getMBean(Simple.class, NAME_ONE, "Instance");
assertEquals("()", test1.constructorUsed);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
- assertEquals(0, test1.stopOrder);
- assertEquals(0, test1.destroyOrder);
test2 = getMBean(Simple.class, NAME_TWO, "Instance");
assertEquals("()", test2.constructorUsed);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+
+ create1 = test1.createOrder;
+ start1 = test1.startOrder;
+ start2 = test2.startOrder;
+ create2 = test2.createOrder;
+ assertTrue(create1 < start1);
+ assertTrue(create2 < start2);
+ assertTrue(create1 < create2);
+ assertTrue(start1 < start2);
assertEquals(0, test2.stopOrder);
assertEquals(0, test2.destroyOrder);
+ assertEquals(0, test1.stopOrder);
+ assertEquals(0, test1.destroyOrder);
undeploy(mbeans2);
assertServiceDestroyed(NAME_ONE);
assertNoService(NAME_TWO);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(6, test1.stopOrder);
assertEquals(8, test1.destroyOrder);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
assertEquals(5, test2.stopOrder);
assertEquals(7, test2.destroyOrder);
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/PlainLifecycleDependencyTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/PlainLifecycleDependencyTestCase.java 2010-02-11 16:18:38 UTC (rev 100881)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/PlainLifecycleDependencyTestCase.java 2010-02-11 16:25:18 UTC (rev 100882)
@@ -95,9 +95,11 @@
assertNotNull(bean2);
assertEquals(1, bean1.createOrder);
- assertEquals(2, bean2.createOrder);
- assertEquals(3, bean1.startOrder);
- assertEquals(4, bean2.startOrder);
+ assertTrue(bean1.createOrder < bean1.startOrder);
+ assertTrue(bean2.createOrder < bean2.startOrder);
+ assertTrue(bean1.createOrder < bean2.createOrder);
+ assertTrue(bean1.startOrder < bean2.startOrder);
+
}
public void plainLifecycleDependencyWrongOrder() throws Throwable
@@ -118,11 +120,16 @@
SimpleBeanWithLifecycle bean2 = (SimpleBeanWithLifecycle) context2.getTarget();
assertNotNull(bean2);
- assertEquals(1, bean1.createOrder);
- assertEquals(2, bean1.startOrder);
- assertEquals(3, bean2.createOrder);
- assertEquals(4, bean2.startOrder);
+ int create1 = bean1.createOrder;
+ int start1 = bean1.startOrder;
+ int create2 = bean2.createOrder;
+ int start2 = bean2.startOrder;
+ assertTrue(create1 < start1);
+ assertTrue(create2 < start2);
+ assertTrue(create1 < create2);
+ assertTrue(start1 < start2);
+
uninstall("Name1");
assertContext("Name2", ControllerState.CONFIGURED);
@@ -137,11 +144,16 @@
assertNotNull(bean1);
assertContext("Name2", ControllerState.INSTALLED);
- assertEquals(9, bean1.createOrder);
- assertEquals(10, bean2.createOrder);
- assertEquals(11, bean1.startOrder);
- assertEquals(12, bean2.startOrder);
+ create1 = bean1.createOrder;
+ start1 = bean1.startOrder;
+ create2 = bean2.createOrder;
+ start2 = bean2.startOrder;
+ assertTrue(create1 < start1);
+ assertTrue(create2 < start2);
+ assertTrue(create1 < create2);
+ assertTrue(start1 < start2);
+
uninstall("Name2");
assertContext("Name1", ControllerState.INSTALLED);
@@ -158,8 +170,8 @@
assertEquals(15, bean2.createOrder);
assertEquals(16, bean2.startOrder);
- assertEquals(9, bean1.createOrder);
- assertEquals(11, bean1.startOrder);
+ assertEquals(create1, bean1.createOrder);
+ assertEquals(start1, bean1.startOrder);
}
public void plainLifecycleDependencyReinstall() throws Throwable
More information about the jboss-cvs-commits
mailing list