Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the evictRemoveAll tests for the optimistic case 

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@14265 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Brian Stansberry 2007-12-24 16:01:02 +00:00
parent 5d96ac4505
commit c053aefa0d
6 changed files with 27 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/AbstractCollectionRegionAccessStrategyTestCase.java vendored
View File

@ -433,7 +433,7 @@ public abstract class AbstractCollectionRegionAccessStrategyTestCase extends Abs
Node regionRoot = localCache.getRoot().getChild(regionFqn);
assertFalse(regionRoot == null);
assertEquals(0, regionRoot.getChildrenNames().size());
assertEquals(0, getValidChildrenCount(regionRoot));
assertTrue(regionRoot.isResident());
if (isUsingOptimisticLocking()) {
@ -442,7 +442,7 @@ public abstract class AbstractCollectionRegionAccessStrategyTestCase extends Abs
regionRoot = remoteCache.getRoot().getChild(regionFqn);
assertFalse(regionRoot == null);
assertEquals(0, regionRoot.getChildrenNames().size());
assertEquals(0, getValidChildrenCount(regionRoot));
assertTrue(regionRoot.isResident());
if (isUsingOptimisticLocking()) {
@ -476,7 +476,7 @@ public abstract class AbstractCollectionRegionAccessStrategyTestCase extends Abs
regionRoot = localCache.getRoot().getChild(regionFqn);
assertFalse(regionRoot == null);
assertEquals(0, regionRoot.getChildrenNames().size());
assertEquals(0, getValidChildrenCount(regionRoot));
assertTrue(regionRoot.isResident());
if (isUsingInvalidation()) {
@ -500,26 +500,27 @@ public abstract class AbstractCollectionRegionAccessStrategyTestCase extends Abs
regionRoot = remoteCache.getRoot().getChild(regionFqn);
assertFalse(regionRoot == null);
if (isUsingInvalidation()) {
// JBC seems broken: see http://www.jboss.com/index.html?module=bb&op=viewtopic&t=121408
// FIXME replace with the following when JBCACHE-1199 and JBCACHE-1200 are done:
//assertFalse(regionRoot.isValid());
checkNodeIsEmpty(regionRoot);
// Region root should have 1 child -- the one we added above
assertEquals(1, getValidChildrenCount(regionRoot));
}
else {
// Same assertion, just different assertion msg
assertEquals(0, regionRoot.getChildrenNames().size());
assertEquals(0, getValidChildrenCount(regionRoot));
}
assertTrue(regionRoot.isResident());
assertNull("local is clean", localAccessStrategy.get(KEY, System.currentTimeMillis()));
assertNull("remote is clean", remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
assertEquals("remote is correct", (isUsingInvalidation() ? VALUE1 : null), remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
}
private void checkNodeIsEmpty(Node node) {
assertEquals(node.getFqn() + " should not have keys", 0, node.getKeys().size());
private int getValidChildrenCount(Node node) {
int result = 0;
for (Iterator it = node.getChildren().iterator(); it.hasNext(); ) {
checkNodeIsEmpty((Node) it.next());
if (((Node) it.next()).isValid()) {
result++;
}
}
return result;
}
private void rollback() {

10
cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticInvalidatedTransactionalTestCase.java vendored
View File

@ -55,15 +55,5 @@ public class OptimisticInvalidatedTransactionalTestCase
assertTrue("Using Optimistic locking", isUsingOptimisticLocking());
assertTrue("Synchronous mode", isSynchronous());
}
// Known failures
public void testEvictAllFailureExpected() {
super.testEvictAll();
}
public void testRemoveAllFailureExpected() {
super.testRemoveAll();
}
}

10
cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticReadOnlyTestCase.java vendored
View File

@ -54,15 +54,5 @@ public class OptimisticReadOnlyTestCase extends AbstractReadOnlyAccessTestCase {
assertTrue("Using Optimistic locking", isUsingOptimisticLocking());
assertTrue("Synchronous mode", isSynchronous());
}
// Known failures
public void testEvictAllFailureExpected() {
super.testEvictAll();
}
public void testRemoveAllFailureExpected() {
super.testRemoveAll();
}
}

26
cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/AbstractEntityRegionAccessStrategyTestCase.java vendored
View File

@ -24,6 +24,7 @@
package org.hibernate.test.cache.jbc2.entity;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@ -640,7 +641,7 @@ public abstract class AbstractEntityRegionAccessStrategyTestCase extends Abstrac
Node regionRoot = localCache.getRoot().getChild(regionFqn);
assertFalse(regionRoot == null);
assertEquals(0, regionRoot.getChildrenNames().size());
assertEquals(0, getValidChildrenCount(regionRoot));
assertTrue(regionRoot.isResident());
if (isUsingOptimisticLocking()) {
@ -649,7 +650,7 @@ public abstract class AbstractEntityRegionAccessStrategyTestCase extends Abstrac
regionRoot = remoteCache.getRoot().getChild(regionFqn);
assertFalse(regionRoot == null);
assertEquals(0, regionRoot.getChildrenNames().size());
assertEquals(0, getValidChildrenCount(regionRoot));
assertTrue(regionRoot.isResident());
if (isUsingOptimisticLocking()) {
@ -685,7 +686,7 @@ public abstract class AbstractEntityRegionAccessStrategyTestCase extends Abstrac
regionRoot = localCache.getRoot().getChild(regionFqn);
assertFalse(regionRoot == null);
assertEquals(0, regionRoot.getChildrenNames().size());
assertEquals(0, getValidChildrenCount(regionRoot));
assertTrue(regionRoot.isResident());
if (isUsingInvalidation()) {
@ -709,26 +710,27 @@ public abstract class AbstractEntityRegionAccessStrategyTestCase extends Abstrac
regionRoot = remoteCache.getRoot().getChild(regionFqn);
assertFalse(regionRoot == null);
if (isUsingInvalidation()) {
// JBC seems broken: see http://www.jboss.com/index.html?module=bb&op=viewtopic&t=121408
// FIXME replace with the following when JBCACHE-1199 and JBCACHE-1200 are done:
//assertFalse(regionRoot.isValid());
checkNodeIsEmpty(regionRoot);
// Region root should have 1 child -- the one we added above
assertEquals(1, getValidChildrenCount(regionRoot));
}
else {
// Same assertion, just different assertion msg
assertEquals(0, regionRoot.getChildrenNames().size());
assertEquals(0, getValidChildrenCount(regionRoot));
}
assertTrue(regionRoot.isResident());
assertNull("local is clean", localAccessStrategy.get(KEY, System.currentTimeMillis()));
assertNull("remote is clean", remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
assertEquals("remote is correct", (isUsingInvalidation() ? VALUE1 : null), remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
}
private void checkNodeIsEmpty(Node node) {
assertEquals(node.getFqn() + " should not have keys", 0, node.getKeys().size());
private int getValidChildrenCount(Node node) {
int result = 0;
for (Iterator it = node.getChildren().iterator(); it.hasNext(); ) {
checkNodeIsEmpty((Node) it.next());
if (((Node) it.next()).isValid()) {
result++;
}
}
return result;
}
protected void rollback() {

9
cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticInvalidatedTransactionalTestCase.java vendored
View File

@ -55,13 +55,4 @@ public class OptimisticInvalidatedTransactionalTestCase extends AbstractTransact
assertTrue("Synchronous mode", isSynchronous());
}
// Known failures
public void testEvictAllFailureExpected() {
super.testEvictAll();
}
public void testRemoveAllFailureExpected() {
super.testRemoveAll();
}
}

10
cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticReadOnlyTestCase.java vendored
View File

@ -54,15 +54,5 @@ public class OptimisticReadOnlyTestCase extends AbstractReadOnlyAccessTestCase {
assertTrue("Using Optimistic locking", isUsingOptimisticLocking());
assertTrue("Synchronous mode", isSynchronous());
}
// Known failures
public void testEvictAllFailureExpected() {
super.testEvictAll();
}
public void testRemoveAllFailureExpected() {
super.testRemoveAll();
}
}