From 772b12b454ed4f20bdddbfc03e7c373e23e07dd0 Mon Sep 17 00:00:00 2001
From: Brian Stansberry <brian.stansberry@jboss.com>
Date: Sun, 23 Dec 2007 14:53:06 +0000
Subject: [PATCH] Update evict/removeAll tests to reflect JBCACHE-1251 problem

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@14261 1b8cb986-b30d-0410-93ca-fae66ebed9b2
---
 .../AbstractGeneralDataRegionTestCase.java    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/AbstractGeneralDataRegionTestCase.java b/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/AbstractGeneralDataRegionTestCase.java
index 4ddd38f2d3..e8a70b341c 100644
--- a/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/AbstractGeneralDataRegionTestCase.java
+++ b/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/AbstractGeneralDataRegionTestCase.java
@@ -26,6 +26,7 @@ package org.hibernate.test.cache.jbc2;
 import java.util.Iterator;
 import java.util.Set;
 
+import org.hibernate.cache.CacheException;
 import org.hibernate.cache.GeneralDataRegion;
 import org.hibernate.cache.QueryResultsRegion;
 import org.hibernate.cache.Region;
@@ -215,6 +216,24 @@ public abstract class AbstractGeneralDataRegionTestCase extends AbstractRegionIm
         assertFalse(regionRoot == null);
         assertEquals(0, regionRoot.getChildrenNames().size());
         assertTrue(regionRoot.isResident());
+
+        if (CacheHelper.isClusteredInvalidation(remoteCache)) {
+           // With invalidation, a node that removes the region root cannot reestablish
+           // it on remote nodes, since the only message the propagates is "invalidate".
+           // So, we have to reestablish it ourselves
+           
+           // First, do a get to help test whether a get messes up the optimistic version
+           String msg = "Known issue JBCACHE-1251 -- problem reestablishing invalidated region root";
+           try {
+              assertEquals(null, remoteRegion.get(KEY));
+           }
+           catch (CacheException ce) {
+              log.error(msg, ce);
+              fail(msg + " -- cause: " + ce);
+           }
+           remoteRegion.put(KEY, VALUE1);
+           assertEquals(msg, VALUE1, remoteRegion.get(KEY));
+        }
     
         regionRoot = remoteCache.getRoot().getChild(regionFqn);
         assertFalse(regionRoot == null);