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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-05-14 18:59:03 -0400 (Thu, 14 May 2009)
New Revision: 313

Modified:
   trunk/core/src/main/java/org/infinispan/CacheDelegate.java
   trunk/core/src/test/java/org/infinispan/replication/SyncReplLockingTest.java
   trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java
Log:
Re-enabled tests and features for Beta1

Modified: trunk/core/src/main/java/org/infinispan/CacheDelegate.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/CacheDelegate.java	2009-05-14 22:55:01 UTC (rev 312)
+++ trunk/core/src/main/java/org/infinispan/CacheDelegate.java	2009-05-14 22:59:03 UTC (rev 313)
@@ -228,14 +228,12 @@
    }
 
    public void lock(K key) {
-      if (true) throw new UnsupportedOperationException("Not yet implemented");
       if (key == null)
          throw new IllegalArgumentException("Cannot lock null key");
       lock(Collections.singletonList(key));
    }
 
    public void lock(Collection<? extends K> keys) {
-      if (true) throw new UnsupportedOperationException("Not yet implemented");
       if (keys == null || keys.isEmpty())
          throw new IllegalArgumentException("Cannot lock empty list of keys");
       LockControlCommand command = commandsFactory.buildLockControlCommand(keys, true);
@@ -243,14 +241,12 @@
    }
 
    public void unlock(K key) {
-      if (true) throw new UnsupportedOperationException("Not yet implemented");
       if (key == null)
          throw new IllegalArgumentException("Cannot unlock null key");
       unlock(Collections.singletonList(key));
    }
 
    public void unlock(Collection<? extends K> keys) {
-      if (true) throw new UnsupportedOperationException("Not yet implemented");
       if (keys == null || keys.isEmpty())
          throw new IllegalArgumentException("Cannot unlock empty list of keys");
       LockControlCommand command = commandsFactory.buildLockControlCommand(keys, false);

Modified: trunk/core/src/test/java/org/infinispan/replication/SyncReplLockingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/SyncReplLockingTest.java	2009-05-14 22:55:01 UTC (rev 312)
+++ trunk/core/src/test/java/org/infinispan/replication/SyncReplLockingTest.java	2009-05-14 22:59:03 UTC (rev 313)
@@ -22,7 +22,7 @@
 /**
  * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
  */
- at Test(groups = "functional", testName = "replication.SyncReplLockingTest", enabled = false, description = "TODO: Temporarily disabled.  Enable before BETA1")
+ at Test(groups = "functional", testName = "replication.SyncReplLockingTest")
 public class SyncReplLockingTest extends MultipleCacheManagersTest {
    Cache<String, String> cache1, cache2;
    String k = "key", v = "value";

Modified: trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java	2009-05-14 22:55:01 UTC (rev 312)
+++ trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java	2009-05-14 22:59:03 UTC (rev 313)
@@ -10,7 +10,7 @@
 import org.infinispan.test.TestingUtil;
 import org.testng.annotations.Test;
 
- at Test(groups = "functional", testName = "statetransfer.StateTransferCacheLoaderFunctionalTest", enabled = false, description = "TODO fix before BETA1")
+ at Test(groups = "functional", testName = "statetransfer.StateTransferCacheLoaderFunctionalTest")
 public class StateTransferCacheLoaderFunctionalTest extends StateTransferFunctionalTest {
    int id;
    ThreadLocal<Boolean> sharedCacheLoader = new ThreadLocal<Boolean>() {

Modified: trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java	2009-05-14 22:55:01 UTC (rev 312)
+++ trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java	2009-05-14 22:59:03 UTC (rev 313)
@@ -16,7 +16,7 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
- at Test(groups = "functional", testName = "statetransfer.StateTransferFunctionalTest", enabled = false, description = "TODO fix before BETA1")
+ at Test(groups = "functional", testName = "statetransfer.StateTransferFunctionalTest")
 public class StateTransferFunctionalTest extends MultipleCacheManagersTest {
 
    protected static final String ADDRESS_CLASSNAME = Address.class.getName();