[infinispan-commits] Infinispan SVN: r1347 - in trunk/core/src: test/java/org/infinispan/api and 3 other directories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-01-06 13:18:43 -0500 (Wed, 06 Jan 2010)
New Revision: 1347

Modified:
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
   trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java
   trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
   trunk/core/src/test/java/org/infinispan/test/fwk/TcpMPingEnvironmentTest.java
   trunk/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java
Log:
Removed deprecated API
Genericized tests

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java	2010-01-06 18:09:59 UTC (rev 1346)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java	2010-01-06 18:18:43 UTC (rev 1347)
@@ -209,7 +209,6 @@
       }
 
       channel.setOpt(Channel.LOCAL, false);
-      channel.setOpt(Channel.BLOCK, true);
 
       dispatcher = new CommandAwareRpcDispatcher(channel, this,
                                                  asyncExecutor, inboundInvocationHandler, flushTracker, distributedSyncTimeout);

Modified: trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java	2010-01-06 18:09:59 UTC (rev 1346)
+++ trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java	2010-01-06 18:18:43 UTC (rev 1347)
@@ -1,6 +1,5 @@
 package org.infinispan.api;
 
-import org.infinispan.Cache;
 import org.infinispan.config.Configuration;
 import org.infinispan.config.ConfigurationException;
 import org.infinispan.lifecycle.ComponentStatus;
@@ -269,25 +268,25 @@
 
    public void testConcurrentMapMethods() {
 
-      assert ((Cache<String, String>) cache).putIfAbsent("A", "B") == null;
-      assert ((Cache<String, String>) cache).putIfAbsent("A", "C").equals("B");
-      assert ((Cache<String, String>) cache).get("A").equals("B");
+      assert cache.putIfAbsent("A", "B") == null;
+      assert cache.putIfAbsent("A", "C").equals("B");
+      assert cache.get("A").equals("B");
 
-      assert !((Cache<String, String>) cache).remove("A", "C");
-      assert ((Cache<String, String>) cache).containsKey("A");
-      assert ((Cache<String, String>) cache).remove("A", "B");
-      assert !((Cache<String, String>) cache).containsKey("A");
+      assert !cache.remove("A", "C");
+      assert cache.containsKey("A");
+      assert cache.remove("A", "B");
+      assert !cache.containsKey("A");
 
-      ((Cache<String, String>) cache).put("A", "B");
+      cache.put("A", "B");
 
-      assert !((Cache<String, String>) cache).replace("A", "D", "C");
-      assert ((Cache<String, String>) cache).get("A").equals("B");
-      assert ((Cache<String, String>) cache).replace("A", "B", "C");
-      assert ((Cache<String, String>) cache).get("A").equals("C");
+      assert !cache.replace("A", "D", "C");
+      assert cache.get("A").equals("B");
+      assert cache.replace("A", "B", "C");
+      assert cache.get("A").equals("C");
 
-      assert ((Cache<String, String>) cache).replace("A", "X").equals("C");
-      assert ((Cache<String, String>) cache).replace("X", "A") == null;
-      assert !((Cache<String, String>) cache).containsKey("X");
+      assert cache.replace("A", "X").equals("C");
+      assert cache.replace("X", "A") == null;
+      assert !cache.containsKey("X");
    }
 
    public void testSizeAndContents() throws Exception {
@@ -366,15 +365,15 @@
       Set expKeyEntries = ObjectDuplicator.duplicateSet(expKeys);
       Set expValueEntries = ObjectDuplicator.duplicateSet(expValues);
 
-      Set<String> keys = cache.keySet();
-      for (String key : keys) assert expKeys.remove(key);
+      Set<Object> keys = cache.keySet();
+      for (Object key : keys) assert expKeys.remove(key);
       assert expKeys.isEmpty() : "Did not see keys " + expKeys + " in iterator!";
 
-      Collection<String> values = cache.values();
-      for (String value : values) assert expValues.remove(value);
+      Collection<Object> values = cache.values();
+      for (Object value : values) assert expValues.remove(value);
       assert expValues.isEmpty() : "Did not see keys " + expValues + " in iterator!";
 
-      Set<Map.Entry> entries = cache.entrySet();
+      Set<Map.Entry<Object, Object>> entries = cache.entrySet();
       for (Map.Entry entry : entries) {
          assert expKeyEntries.remove(entry.getKey());
          assert expValueEntries.remove(entry.getValue());
@@ -391,9 +390,9 @@
       m.put(key3, value3);
       cache.putAll(m);
 
-      Set<String> keys = cache.keySet();
-      Collection<String> values = cache.values();
-      Set<Map.Entry> entries = cache.entrySet();
+      Set<Object> keys = cache.keySet();
+      Collection<Object> values = cache.values();
+      Set<Map.Entry<Object, Object>> entries = cache.entrySet();
       Collection[] collections = new Collection[]{keys, values, entries};
       Object newObj = new Object();
       List newObjCol = new ArrayList();

Modified: trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java	2010-01-06 18:09:59 UTC (rev 1346)
+++ trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java	2010-01-06 18:18:43 UTC (rev 1347)
@@ -20,7 +20,7 @@
 @Test
 public abstract class SingleCacheManagerTest extends AbstractCacheTest {
    protected CacheManager cacheManager;
-   protected Cache cache;
+   protected Cache<Object, Object> cache;
 
    @BeforeClass()
    protected void createBeforeClass() throws Exception {

Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TcpMPingEnvironmentTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TcpMPingEnvironmentTest.java	2010-01-06 18:09:59 UTC (rev 1346)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TcpMPingEnvironmentTest.java	2010-01-06 18:18:43 UTC (rev 1347)
@@ -4,7 +4,6 @@
 import org.infinispan.util.logging.LogFactory;
 import org.jgroups.JChannel;
 import org.jgroups.View;
-import static org.testng.Assert.fail;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
@@ -22,6 +21,8 @@
 import java.util.List;
 import java.util.Properties;
 
+import static org.testng.Assert.fail;
+
 /**
  * The purpose of this class is to test that/if tcp + mping works fine in the given environment.
  *
@@ -195,7 +196,6 @@
    private void initiChannel(JChannel channel) throws Exception {
       openedChannles.add(channel);
       channel.setOpt(org.jgroups.Channel.LOCAL, false);
-      channel.setOpt(org.jgroups.Channel.BLOCK, true);
       channel.connect("someChannel");
    }
 }

Modified: trunk/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java	2010-01-06 18:09:59 UTC (rev 1346)
+++ trunk/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java	2010-01-06 18:18:43 UTC (rev 1347)
@@ -77,5 +77,4 @@
       assert cache.get("key").equals("value");
       assert !cache.isEmpty();
    }
-
 }