[jboss-cvs] JBossAS SVN: r102682 - trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2010-03-21 08:55:26 -0400 (Sun, 21 Mar 2010)
New Revision: 102682

Modified:
   trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionBasedMaxUnreplicatedIntervalTestCase.java
Log:
Eliminate some direct cache operations

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionBasedMaxUnreplicatedIntervalTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionBasedMaxUnreplicatedIntervalTestCase.java	2010-03-21 08:20:30 UTC (rev 102681)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionBasedMaxUnreplicatedIntervalTestCase.java	2010-03-21 12:55:26 UTC (rev 102682)
@@ -30,7 +30,6 @@
 
 import junit.framework.Test;
 
-import org.jboss.cache.Fqn;
 import org.jboss.cache.pojo.PojoCache;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
@@ -39,7 +38,6 @@
 import org.jboss.test.JBossTestCase;
 import org.jboss.test.cluster.testutil.CacheConfigTestSetup;
 import org.jboss.test.cluster.testutil.SessionTestUtil;
-import org.jboss.test.cluster.web.CacheHelper;
 import org.jboss.test.cluster.web.mocks.BasicRequestHandler;
 import org.jboss.test.cluster.web.mocks.MutableObject;
 import org.jboss.test.cluster.web.mocks.SetAttributesRequestHandler;
@@ -256,22 +254,21 @@
       
       SetAttributesRequestHandler setHandler1 = new SetAttributesRequestHandler(allAttributes, false);
       SessionTestUtil.invokeRequest(jbcm0, setHandler1, null);
+
+      String id1 = setHandler1.getSessionId();
       
-      Fqn session1Fqn = Fqn.fromString(SessionTestUtil.getSessionFqn(warname, setHandler1.getSessionId()));
-      
       SetAttributesRequestHandler setHandler2 = new SetAttributesRequestHandler(allAttributes, false);
       SessionTestUtil.invokeRequest(jbcm0, setHandler2, null);
+
+      String id2 = setHandler2.getSessionId();
       
-      Fqn session2Fqn = Fqn.fromString(SessionTestUtil.getSessionFqn(warname, setHandler2.getSessionId()));
-      
       // Overage the sessions
       Thread.sleep(3010);
       // Try to force out the overaged sessions
       jbcm1.backgroundProcess();
       // Confirm they are still there
-      // FIXME -- avoid direct cache operations
-      assertNotNull(pojoCaches[1].getCache().get(session1Fqn, CacheHelper.VERSION_KEY));
-      assertNotNull(pojoCaches[1].getCache().get(session2Fqn, CacheHelper.VERSION_KEY));
+      assertNotNull(jbcm1.getDistributedCacheManager().getSessionData(id1, false));
+      assertNotNull(jbcm1.getDistributedCacheManager().getSessionData(id2, false));
       
       // Access one to prove it gets expired once the manager can see its real timestamp
       BasicRequestHandler getHandler = new BasicRequestHandler(allAttributes.keySet(), false);
@@ -283,8 +280,7 @@
       // The get restored a new fresh session with the first id, but the 2nd 
       // one is still there and overaged. Try to force it out
       jbcm1.backgroundProcess();
-      // FIXME -- avoid direct cache operations
-      assertNull(pojoCaches[1].getCache().get(session2Fqn, CacheHelper.VERSION_KEY));
+      assertNull(jbcm1.getDistributedCacheManager().getSessionData(id2, false));
    }
    
    protected JBossCacheManager[] getCacheManagers(String warname, int maxInactive, int maxUnreplicated)