Author: jason.greene(a)jboss.com Date: 2007-11-26 13:14:21 -0500 (Mon, 26 Nov 2007) New Revision: 4774 Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java Log: Add tolerance for new tx checking added in JBCACHE-923 Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java =================================================================== --- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java 2007-11-22 10:27:48 UTC (rev 4773) +++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java 2007-11-26 18:14:21 UTC (rev 4774) @@ -33,7 +33,7 @@ */ @Test(groups = {"functional"}) -public class ListUndoTest +public class ListUndoTest { Log log_ = LogFactory.getLog(ListUndoTest.class); PojoCache cache_; @@ -71,7 +71,13 @@ list.add("test1"); setTxRollback(true); - cache_.attach("/a", list); + try + { + cache_.attach("/a", list); + } + catch (Exception e) + { + } assertFalse("Should not have cache interceptor ", isProxy(list)); cache_.attach("/a", list); @@ -88,7 +94,13 @@ test.setLanguages(list); setTxRollback(true); - cache_.attach("/a", test); + try + { + cache_.attach("/a", test); + } + catch (Exception e) + { + } assertFalse("Should not have cache interceptor ", isProxy(test.getLanguages())); cache_.attach("/a", test); @@ -113,13 +125,15 @@ cache_.attach("/a", test); setTxRollback(true); - cache_.detach("/a"); + try + { + cache_.detach("/a"); + } + catch (Exception e) + { + } assertTrue("Should still have cache interceptor ", isProxy(test.getLanguages())); cache_.detach("/a"); } - - - - } Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java =================================================================== --- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java 2007-11-22 10:27:48 UTC (rev 4773) +++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java 2007-11-26 18:14:21 UTC (rev 4774) @@ -33,7 +33,7 @@ */ @Test(groups = {"functional"}) -public class LocalUndoTest +public class LocalUndoTest { Log log_ = LogFactory.getLog(LocalUndoTest.class); PojoCache cache_; @@ -73,7 +73,13 @@ test.setAge(10); setTxRollback(true); - cache_.attach("/a", test); + try + { + cache_.attach("/a", test); + } + catch (Exception e) + { + } assertFalse("Should not have cache interceptor ", hasCacheInterceptor(test)); } @@ -97,7 +103,13 @@ cache_.attach("/a", test); setTxRollback(true); - cache_.detach("/a"); + try + { + cache_.detach("/a"); + } + catch (Exception e) + { + } assertTrue("Should still have cache interceptor ", hasCacheInterceptor(test)); } Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java =================================================================== --- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java 2007-11-22 10:27:48 UTC (rev 4773) +++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java 2007-11-26 18:14:21 UTC (rev 4774) @@ -33,7 +33,7 @@ */ @Test(groups = {"functional"}) -public class MapUndoTest +public class MapUndoTest { Log log_ = LogFactory.getLog(MapUndoTest.class); PojoCache cache_; @@ -71,7 +71,13 @@ map.put("1", "test1"); setTxRollback(true); - cache_.attach("/a", map); + try + { + cache_.attach("/a", map); + } + catch (Exception e) + { + } assertFalse("Should not have cache interceptor ", isProxy(map)); cache_.attach("/a", map); @@ -88,7 +94,13 @@ test.setHobbies(map); setTxRollback(true); - cache_.attach("/a", test); + try + { + cache_.attach("/a", test); + } + catch (Exception e) + { + } assertFalse("Should not have cache interceptor ", isProxy(test.getHobbies())); cache_.attach("/a", test); @@ -113,7 +125,13 @@ cache_.attach("/a", test); setTxRollback(true); - cache_.detach("/a"); + try + { + cache_.detach("/a"); + } + catch (Exception e) + { + } assertTrue("Should still have cache interceptor ", isProxy(test.getHobbies())); cache_.detach("/a"); Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java =================================================================== --- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java 2007-11-22 10:27:48 UTC (rev 4773) +++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java 2007-11-26 18:14:21 UTC (rev 4774) @@ -33,7 +33,7 @@ */ @Test(groups = {"functional"}) -public class SetUndoTest +public class SetUndoTest { Log log_ = LogFactory.getLog(SetUndoTest.class); PojoCache cache_; @@ -71,7 +71,13 @@ set.add("test1"); setTxRollback(true); - cache_.attach("/a", set); + try + { + cache_.attach("/a", set); + } + catch (Exception e) + { + } assertFalse("Should not have cache interceptor ", isProxy(set)); cache_.attach("/a", set); @@ -88,7 +94,12 @@ test.setSkills(set); setTxRollback(true); - cache_.attach("/a", test); + try + { + cache_.attach("/a", test); + } catch (Exception e) + { + } assertFalse("Should not have cache interceptor ", isProxy(test.getSkills())); cache_.attach("/a", test); @@ -113,13 +124,14 @@ cache_.attach("/a", test); setTxRollback(true); - cache_.detach("/a"); + try + { + cache_.detach("/a"); + } catch (Exception e) + { + } assertTrue("Should still have cache interceptor ", isProxy(test.getSkills())); cache_.detach("/a"); } - - - - }