[infinispan-commits] Infinispan SVN: r1061 - trunk/core/src/test/java/org/infinispan/distribution.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2009-10-29 07:29:52 -0400 (Thu, 29 Oct 2009)
New Revision: 1061

Added:
   trunk/core/src/test/java/org/infinispan/distribution/DisabledL1Test.java
Modified:
   trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
Log:
[ISPN-240] (Removals not working as expected when L1 is disabled) Failing test added.

Modified: trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java	2009-10-29 10:12:39 UTC (rev 1060)
+++ trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java	2009-10-29 11:29:52 UTC (rev 1061)
@@ -35,6 +35,7 @@
    protected boolean sync = true;
    protected boolean tx = false;
    protected boolean testRetVals = true;
+   protected boolean l1CacheEnabled = true;
 
    protected void createCacheManagers() throws Throwable {
       cacheName = "dist";
@@ -47,6 +48,7 @@
       }
       configuration.setSyncReplTimeout(60, TimeUnit.SECONDS);
       configuration.setLockAcquisitionTimeout(45, TimeUnit.SECONDS);
+      configuration.setL1CacheEnabled(l1CacheEnabled);
       caches = createClusteredCaches(4, cacheName, configuration);
 
       reorderBasedOnCHPositions();
@@ -332,6 +334,8 @@
     * cache (plus however many additional caches in the hash space)
     */
    public static class MagicKey implements Serializable {
+      /** The serialVersionUID */
+      private static final long serialVersionUID = -835275755945753954L;
       String name = null;
       int hashcode;
       String address;

Added: trunk/core/src/test/java/org/infinispan/distribution/DisabledL1Test.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DisabledL1Test.java	                        (rev 0)
+++ trunk/core/src/test/java/org/infinispan/distribution/DisabledL1Test.java	2009-10-29 11:29:52 UTC (rev 1061)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and
+ * individual contributors as indicated by the @author tags. See the
+ * copyright.txt file in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.infinispan.distribution;
+
+import org.infinispan.Cache;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.testng.annotations.Test;
+
+ at Test(groups = "functional", testName = "distribution.DisabledL1Test")
+public class DisabledL1Test extends BaseDistFunctionalTest {
+
+   public DisabledL1Test () {
+      sync = true;
+      tx = false;
+      testRetVals = false;
+      l1CacheEnabled = false;
+   }
+   
+   public void testRemoveFromNonOwner() {
+      for (Cache<Object, String> c : caches) assert c.isEmpty();
+      
+      Object retval = getFirstNonOwner("k1").put("k1", "value");
+      asyncWait("k1", PutKeyValueCommand.class, getSecondNonOwner("k1"));
+      if (testRetVals) assert retval == null;
+      
+      retval = getOwners("k1")[0].remove("k1");
+      asyncWait("k1", RemoveCommand.class, getFirstNonOwner("k1"));
+      if (testRetVals) assert "value".equals(retval);
+
+      assertOnAllCachesAndOwnership("k1", null);
+   }
+
+}