[jboss-cvs] JBossAS SVN: r111315 - projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn.

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

Author: pferraro
Date: 2011-05-09 14:55:19 -0400 (Mon, 09 May 2011)
New Revision: 111315

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManagerTest.java
Log:
Fix use of deprecated code.

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManagerTest.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManagerTest.java	2011-05-09 18:55:00 UTC (rev 111314)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManagerTest.java	2011-05-09 18:55:19 UTC (rev 111315)
@@ -34,6 +34,7 @@
 import org.infinispan.config.Configuration;
 import org.infinispan.config.Configuration.CacheMode;
 import org.infinispan.context.Flag;
+import org.infinispan.distribution.DataLocality;
 import org.infinispan.distribution.DistributionManager;
 import org.infinispan.lifecycle.ComponentStatus;
 import org.infinispan.manager.EmbeddedCacheManager;
@@ -761,23 +762,28 @@
    public void isLocal()
    {
       this.isLocal(null, true);
-      
-      DistributionManager distManager = this.control.createMock(DistributionManager.class);
-      
-      this.isLocal(distManager, true);
-      this.isLocal(distManager, false);
+      this.isLocal(DataLocality.LOCAL, true);
+      this.isLocal(DataLocality.LOCAL_UNCERTAIN, true);
+      this.isLocal(DataLocality.NOT_LOCAL, false);
+      this.isLocal(DataLocality.NOT_LOCAL_UNCERTAIN, true);
    }
    
-   private void isLocal(DistributionManager distManager, boolean local)
+   private void isLocal(DataLocality locality, boolean local)
    {
+      DistributionManager distManager = this.control.createMock(DistributionManager.class);
       String sessionId = "ABC123";
       
       EasyMock.expect(this.sessionCache.getAdvancedCache()).andReturn(this.sessionCache);
-      EasyMock.expect(this.sessionCache.getDistributionManager()).andReturn(distManager);
-      if (distManager != null)
+      
+      if (locality != null)
       {
-         EasyMock.expect(distManager.isLocal(sessionId)).andReturn(local);
+         EasyMock.expect(this.sessionCache.getDistributionManager()).andReturn(distManager);
+         EasyMock.expect(distManager.getLocality(sessionId)).andReturn(locality);
       }
+      else
+      {
+         EasyMock.expect(this.sessionCache.getDistributionManager()).andReturn(null);
+      }
       
       this.control.replay();