[jboss-cvs] JBossAS SVN: r87536 - branches/Branch_5_x/testsuite/src/main/org/jboss/test/cluster/lock.

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

Author: bstansberry at jboss.com
Date: 2009-04-19 13:22:24 -0400 (Sun, 19 Apr 2009)
New Revision: 87536

Modified:
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/cluster/lock/ClusteredLockManagerTestBase.java
Log:
Use the correct AbstractClusterLockManager subclass

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/cluster/lock/ClusteredLockManagerTestBase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/cluster/lock/ClusteredLockManagerTestBase.java	2009-04-19 17:14:29 UTC (rev 87535)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/cluster/lock/ClusteredLockManagerTestBase.java	2009-04-19 17:22:24 UTC (rev 87536)
@@ -34,7 +34,6 @@
 import org.jboss.ha.framework.interfaces.HAPartition;
 import org.jboss.ha.framework.server.ClusterNodeImpl;
 import org.jboss.ha.framework.server.lock.AbstractClusterLockSupport;
-import org.jboss.ha.framework.server.lock.YieldingGloballyExclusiveClusterLockSupport;
 import org.jboss.ha.framework.server.lock.LocalLockHandler;
 import org.jboss.ha.framework.server.lock.RemoteLockResponse;
 import org.jboss.ha.framework.server.lock.AbstractClusterLockSupport.RpcTarget;
@@ -123,21 +122,21 @@
       
       try
       {
-         new YieldingGloballyExclusiveClusterLockSupport(null, haPartition, handler);
+         createClusteredLockManager(null, haPartition, handler);
          fail("Null serviceHAName should prevent construction");
       }
       catch (IllegalArgumentException good) {}
       
       try
       {
-         new YieldingGloballyExclusiveClusterLockSupport("test", null, handler);
+         createClusteredLockManager("test", null, handler);
          fail("Null HAPartition should prevent construction");
       }
       catch (IllegalArgumentException good) {}     
       
       try
       {
-         new YieldingGloballyExclusiveClusterLockSupport("test", haPartition, null);
+         createClusteredLockManager("test", haPartition, null);
          fail("Null LocalLockHandler should prevent construction");
       }
       catch (IllegalArgumentException good) {}  
@@ -148,7 +147,7 @@
       replay(haPartition);
       replay(handler);
       
-      YieldingGloballyExclusiveClusterLockSupport testee = new YieldingGloballyExclusiveClusterLockSupport("test", haPartition, handler);
+      T testee = createClusteredLockManager("test", haPartition, handler);
       
       assertEquals("test", testee.getServiceHAName());
       assertEquals("TestPartition", testee.getPartitionName());
@@ -164,7 +163,7 @@
       replay(haPartition);
       replay(handler);      
       
-      YieldingGloballyExclusiveClusterLockSupport testee = new YieldingGloballyExclusiveClusterLockSupport("test", haPartition, handler);
+      T testee = createClusteredLockManager("test", haPartition, handler);
       
       try
       {
@@ -306,7 +305,7 @@
       expect(partition.callMethodOnCluster(eq("test"), 
                                            eq("remoteLock"), 
                                            eqLockParams(node1, 200000), 
-                                           aryEq(YieldingGloballyExclusiveClusterLockSupport.REMOTE_LOCK_TYPES), 
+                                           aryEq(AbstractClusterLockSupport.REMOTE_LOCK_TYPES), 
                                            eq(true))).andReturn(rspList);
       
       handler.lockFromCluster(eq("test"), eq(node1), anyLong());
@@ -341,7 +340,7 @@
       expect(partition.callMethodOnCluster(eq("test"), 
                                            eq("remoteLock"), 
                                            eqLockParams(node1, 200000), 
-                                           aryEq(YieldingGloballyExclusiveClusterLockSupport.REMOTE_LOCK_TYPES), 
+                                           aryEq(AbstractClusterLockSupport.REMOTE_LOCK_TYPES), 
                                            eq(true))).andReturn(rspList).atLeastOnce();
       
       replay(partition);
@@ -374,7 +373,7 @@
       expect(partition.callMethodOnCluster(eq("test"), 
                                            eq("remoteLock"), 
                                            eqLockParams(node1, 200000), 
-                                           aryEq(YieldingGloballyExclusiveClusterLockSupport.REMOTE_LOCK_TYPES), 
+                                           aryEq(AbstractClusterLockSupport.REMOTE_LOCK_TYPES), 
                                            eq(true))).andReturn(rspList);
 
       
@@ -391,7 +390,7 @@
       expect(partition.callMethodOnCluster(eq("test"), 
                                            eq("remoteLock"), 
                                            eqLockParams(node1, 200000), 
-                                           aryEq(YieldingGloballyExclusiveClusterLockSupport.REMOTE_LOCK_TYPES), 
+                                           aryEq(AbstractClusterLockSupport.REMOTE_LOCK_TYPES), 
                                            eq(true))).andReturn(rspList);
       
       handler.lockFromCluster(eq("test"), eq(node1), anyLong());      
@@ -429,7 +428,7 @@
       expect(partition.callMethodOnCluster(eq("test"), 
                                            eq("remoteLock"), 
                                            eqLockParams(node1, 200000), 
-                                           aryEq(YieldingGloballyExclusiveClusterLockSupport.REMOTE_LOCK_TYPES), 
+                                           aryEq(AbstractClusterLockSupport.REMOTE_LOCK_TYPES), 
                                            eq(true))).andReturn(rspList);
       
       // When caller 1 invokes, block before giving response 
@@ -507,7 +506,7 @@
       expect(partition.callMethodOnCluster(eq("test"), 
                                            eq("remoteLock"), 
                                            eqLockParams(node1, 200000), 
-                                           aryEq(YieldingGloballyExclusiveClusterLockSupport.REMOTE_LOCK_TYPES), 
+                                           aryEq(AbstractClusterLockSupport.REMOTE_LOCK_TYPES), 
                                            eq(true))).andAnswer(caller1Answer).atLeastOnce();
       
       handler.lockFromCluster(eq("test"), eq(superiorCaller), anyLong());   
@@ -585,7 +584,7 @@
       expect(partition.callMethodOnCluster(eq("test"), 
                                            eq("remoteLock"), 
                                            eqLockParams(node1, 200000), 
-                                           aryEq(YieldingGloballyExclusiveClusterLockSupport.REMOTE_LOCK_TYPES), 
+                                           aryEq(AbstractClusterLockSupport.REMOTE_LOCK_TYPES), 
                                            eq(true))).andAnswer(caller1Answer);  
       
       expect(partition.callMethodOnCluster(eq("test"), 
@@ -601,7 +600,7 @@
       expect(partition.callMethodOnCluster(eq("test"), 
                                            eq("remoteLock"), 
                                            eqLockParams(node1, 200000), 
-                                           aryEq(YieldingGloballyExclusiveClusterLockSupport.REMOTE_LOCK_TYPES), 
+                                           aryEq(AbstractClusterLockSupport.REMOTE_LOCK_TYPES), 
                                            eq(true))).andReturn(rspList);  
       
       handler.lockFromCluster(eq("test"), eq(node1), anyLong());
@@ -668,7 +667,7 @@
       expect(partition.callMethodOnCluster(eq("test"), 
                                            eq("remoteLock"), 
                                            eqLockParams(node1, 200000), 
-                                           aryEq(YieldingGloballyExclusiveClusterLockSupport.REMOTE_LOCK_TYPES), 
+                                           aryEq(AbstractClusterLockSupport.REMOTE_LOCK_TYPES), 
                                            eq(true))).andReturn(rspList);
       
       handler.lockFromCluster(eq("test"), eq(node1), anyLong());