[infinispan-commits] Infinispan SVN: r2117 - in trunk/core/src/test/java/org/infinispan: test and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-07-29 17:00:05 -0400 (Thu, 29 Jul 2010)
New Revision: 2117

Modified:
   trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterPartitionMergeTest.java
   trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
Log:
[ISPN-531] (Add test helpers to enable DELAY and DISCARD JGroups protocols) - trunk

Modified: trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterPartitionMergeTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterPartitionMergeTest.java	2010-07-29 20:49:15 UTC (rev 2116)
+++ trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterPartitionMergeTest.java	2010-07-29 21:00:05 UTC (rev 2117)
@@ -6,14 +6,9 @@
 import org.infinispan.notifications.Listener;
 import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
 import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
-import org.infinispan.remoting.transport.Transport;
-import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
-import org.jgroups.Channel;
 import org.jgroups.protocols.DISCARD;
-import org.jgroups.protocols.TP;
-import org.jgroups.stack.ProtocolStack;
 import org.testng.annotations.Test;
 
 import java.util.List;
@@ -32,19 +27,10 @@
 
       c1 = caches.get(0);
       c2 = caches.get(1);
-      d1 = getDiscardForCache(c1);
-      d2 = getDiscardForCache(c2);
+      d1 = TestingUtil.getDiscardForCache(c1);
+      d2 = TestingUtil.getDiscardForCache(c2);
    }
 
-   private DISCARD getDiscardForCache(Cache<?, ?> c) throws Exception {
-      JGroupsTransport jgt = (JGroupsTransport) TestingUtil.extractComponent(c, Transport.class);
-      Channel ch = jgt.getChannel();
-      ProtocolStack ps = ch.getProtocolStack();
-      DISCARD discard = new DISCARD();
-      ps.insertProtocol(discard, ProtocolStack.ABOVE, TP.class);
-      return discard;
-   }
-
    public void testCachePartition() {
       c1.put("1", "value");
       c2.put("2", "value");

Modified: trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/TestingUtil.java	2010-07-29 20:49:15 UTC (rev 2116)
+++ trunk/core/src/test/java/org/infinispan/test/TestingUtil.java	2010-07-29 21:00:05 UTC (rev 2117)
@@ -28,9 +28,16 @@
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.remoting.ReplicationQueue;
 import org.infinispan.remoting.transport.Address;
+import org.infinispan.remoting.transport.Transport;
+import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
 import org.infinispan.util.concurrent.locks.LockManager;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
+import org.jgroups.Channel;
+import org.jgroups.protocols.DELAY;
+import org.jgroups.protocols.DISCARD;
+import org.jgroups.protocols.TP;
+import org.jgroups.stack.ProtocolStack;
 
 import javax.transaction.TransactionManager;
 import java.io.File;
@@ -767,6 +774,26 @@
       }
       return values;
    }
+   
+   public static DISCARD getDiscardForCache(Cache<?, ?> c) throws Exception {
+      JGroupsTransport jgt = (JGroupsTransport) TestingUtil.extractComponent(c, Transport.class);
+      Channel ch = jgt.getChannel();
+      ProtocolStack ps = ch.getProtocolStack();
+      DISCARD discard = new DISCARD();
+      ps.insertProtocol(discard, ProtocolStack.ABOVE, TP.class);
+      return discard;
+   }
+   
+   public static DELAY setDelayForCache(Cache<?, ?> c, int in_delay, int out_delay) throws Exception {
+      JGroupsTransport jgt = (JGroupsTransport) TestingUtil.extractComponent(c, Transport.class);
+      Channel ch = jgt.getChannel();
+      ProtocolStack ps = ch.getProtocolStack();
+      DELAY delay = new DELAY();
+      delay.setInDelay(in_delay);
+      delay.setOutDelay(out_delay);
+      ps.insertProtocol(delay, ProtocolStack.ABOVE, TP.class);
+      return delay;
+   }
 
    /**
     * Creates a path to a temp directory based on a base directory and a test.