[jboss-cvs] JBossAS SVN: r65858 - branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 4 16:05:24 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-10-04 16:05:24 -0400 (Thu, 04 Oct 2007)
New Revision: 65858
Modified:
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanTestRunner.java
Log:
[EJBTHREE-1053] remove convoluted stuff in testStatefulPassivation that leads to EJBTHREE-1053
Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanTestRunner.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanTestRunner.java 2007-10-04 19:42:38 UTC (rev 65857)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanTestRunner.java 2007-10-04 20:05:24 UTC (rev 65858)
@@ -158,40 +158,50 @@
int parentInv = beanSet.parentInvocations;
int nestedInv = beanSet.nestedInvocations;
- Assert.assertEquals("Remote counter: ", 1, parent.increment());
+// Assert.assertEquals("Remote counter: ", 1, parent.increment());
+ Assert.assertEquals("Remote counter: ", 1, monitor.incrementParent());
parentInv++;
nestedInv++;
- Assert.assertEquals("Remote counter: ", 2, parent.increment());
+// Assert.assertEquals("Remote counter: ", 2, parent.increment());
+ Assert.assertEquals("Remote counter: ", 2, monitor.incrementParent());
parentInv++;
nestedInv++;
- Assert.assertEquals("Local counter: ", 1, parent.incrementLocal());
+// Assert.assertEquals("Local counter: ", 1, parent.incrementLocal());
+ Assert.assertEquals("Local counter: ", 1, monitor.incrementLocalNested());
parentInv++;
- Assert.assertEquals("Local counter: ", 2, parent.incrementLocal());
+// Assert.assertEquals("Local counter: ", 2, parent.incrementLocal());
+ Assert.assertEquals("Local counter: ", 2, monitor.incrementLocalNested());
parentInv++;
sleep(getSleepTime()); // should passivate
Assert.assertEquals("Parent passivate count: ",
getExpectedPassivations(1, parentInv),
- parent.getPrePassivate());
+// parent.getPrePassivate());
+ monitor.getParentPassivations());
parentInv++;
Assert.assertEquals("Parent activate count: ",
getExpectedPassivations(1, parentInv),
- parent.getPostActivate());
+// parent.getPostActivate());
+ monitor.getParentActivations());
parentInv++;
Assert.assertEquals("Remote nested passivate count: ",
getExpectedPassivations(1, nestedInv),
- nested.getPrePassivate());
+// nested.getPrePassivate());
+ monitor.getNestedPassivations());
Assert.assertEquals("Remote nested activate count: ",
getExpectedPassivations(1, nestedInv),
- nested.getPostActivate());
+// nested.getPostActivate());
+ monitor.getNestedActivations());
Assert.assertEquals("Local nested passivate count: ",
getExpectedPassivations(1, parentInv),
- parent.getLocalNestedPrePassivate());
+// parent.getLocalNestedPrePassivate());
+ monitor.getLocalNestedPassivations());
parentInv++;
Assert.assertEquals("Local nested activate count: ",
getExpectedPassivations(1, parentInv),
- parent.getLocalNestedPostActivate());
+// parent.getLocalNestedPostActivate());
+ monitor.getLocalNestedActivations());
parentInv++;
// Use the monitor to check the deep nested beans. In a cluster these
@@ -206,40 +216,50 @@
Assert.assertEquals("Local deep nested activate count: ", 1, monitor.getLocalDeepNestedActivations());
parentInv++;
- Assert.assertEquals("Remote counter: ", 3, parent.increment());
+// Assert.assertEquals("Remote counter: ", 3, parent.increment());
+ Assert.assertEquals("Remote counter: ", 3, monitor.incrementParent());
parentInv++;
nestedInv++;
- Assert.assertEquals("Remote counter: ", 4, parent.increment());
+// Assert.assertEquals("Remote counter: ", 4, parent.increment());
+ Assert.assertEquals("Remote counter: ", 4, monitor.incrementParent());
parentInv++;
nestedInv++;
- Assert.assertEquals("Local counter: ", 3, parent.incrementLocal());
+// Assert.assertEquals("Local counter: ", 3, parent.incrementLocal());
+ Assert.assertEquals("Local counter: ", 3, monitor.incrementLocalNested());
parentInv++;
- Assert.assertEquals("Local counter: ", 4, parent.incrementLocal());
+// Assert.assertEquals("Local counter: ", 4, parent.incrementLocal());
+ Assert.assertEquals("Local counter: ", 4, monitor.incrementLocalNested());
parentInv++;
sleep(getSleepTime()); // should passivate
Assert.assertEquals("Parent passivate count: ",
- getExpectedPassivations(2, parentInv),
- parent.getPrePassivate());
+ getExpectedPassivations(2, parentInv),
+// parent.getPrePassivate());
+ monitor.getParentPassivations());
parentInv++;
Assert.assertEquals("Parent activate count: ",
- getExpectedPassivations(2, parentInv),
- parent.getPostActivate());
+ getExpectedPassivations(2, parentInv),
+// parent.getPostActivate());
+ monitor.getParentActivations());
parentInv++;
Assert.assertEquals("Remote nested passivate count: ",
getExpectedPassivations(2, nestedInv),
- nested.getPrePassivate());
+// nested.getPrePassivate());
+ monitor.getNestedPassivations());
Assert.assertEquals("Remote nested activate count: ",
getExpectedPassivations(2, nestedInv),
- nested.getPostActivate());
+// nested.getPostActivate());
+ monitor.getNestedActivations());
Assert.assertEquals("Local nested passivate count: ",
getExpectedPassivations(2, parentInv),
- parent.getLocalNestedPrePassivate());
+// parent.getLocalNestedPrePassivate());
+ monitor.getLocalNestedPassivations());
parentInv++;
Assert.assertEquals("Local nested activate count: ",
- getExpectedPassivations(2, parentInv),
- parent.getLocalNestedPostActivate());
+ getExpectedPassivations(2, parentInv),
+// parent.getLocalNestedPostActivate());
+ monitor.getLocalNestedActivations());
parentInv++;
// Use the monitor to check the deep nested beans.
@@ -252,15 +272,19 @@
Assert.assertEquals("Local deep nested activate count: ", 2, monitor.getLocalDeepNestedActivations());
parentInv++;
- Assert.assertEquals("Remote counter: ", 5, parent.increment());
+// Assert.assertEquals("Remote counter: ", 5, parent.increment());
+ Assert.assertEquals("Remote counter: ", 5, monitor.incrementParent());
parentInv++;
nestedInv++;
- Assert.assertEquals("Remote counter: ", 6, parent.increment());
+// Assert.assertEquals("Remote counter: ", 6, parent.increment());
+ Assert.assertEquals("Remote counter: ", 6, monitor.incrementParent());
parentInv++;
nestedInv++;
- Assert.assertEquals("Local counter: ", 5, parent.incrementLocal());
+// Assert.assertEquals("Local counter: ", 5, parent.incrementLocal());
+ Assert.assertEquals("Local counter: ", 5, monitor.incrementLocalNested());
parentInv++;
- Assert.assertEquals("Local counter: ", 6, parent.incrementLocal());
+// Assert.assertEquals("Local counter: ", 6, parent.incrementLocal());
+ Assert.assertEquals("Local counter: ", 6, monitor.incrementLocalNested());
parentInv++;
removeBean(parent);
@@ -271,14 +295,17 @@
sleep(getSleepTime());
// Confirm nested still works following parent remove
- Assert.assertEquals("Remote counter (direct): ", 7, nested.increment());
+// Assert.assertEquals("Remote counter (direct): ", 7, nested.increment());
+ Assert.assertEquals("Remote counter (direct): ", 7, monitor.incrementNested());
nestedInv++;
Assert.assertEquals("Remote nested passivate count: ",
getExpectedPassivations(3, nestedInv),
- nested.getPrePassivate());
+// nested.getPrePassivate());
+ monitor.getNestedPassivations());
Assert.assertEquals("Remote nested activate count: ",
getExpectedPassivations(3, nestedInv),
- nested.getPostActivate());
+// nested.getPostActivate());
+ monitor.getNestedActivations());
removeBean(nested);
More information about the jboss-cvs-commits
mailing list