[jbosscache-commits] JBoss Cache SVN: r6631 - in core/trunk/src/test: resources and 1 other directory.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Thu Aug 28 12:24:03 EDT 2008
Author: mircea.markus
Date: 2008-08-28 12:24:02 -0400 (Thu, 28 Aug 2008)
New Revision: 6631
Added:
core/trunk/src/test/java/org/jboss/cache/lock/PessimisticAcquireAllTest.java
Removed:
core/trunk/src/test/java/org/jboss/cache/lock/AcquireAllTest.java
Modified:
core/trunk/src/test/resources/log4j.xml
Log:
this scenario is only acceptable in a pessimistic locking scheme
Deleted: core/trunk/src/test/java/org/jboss/cache/lock/AcquireAllTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/lock/AcquireAllTest.java 2008-08-28 16:21:28 UTC (rev 6630)
+++ core/trunk/src/test/java/org/jboss/cache/lock/AcquireAllTest.java 2008-08-28 16:24:02 UTC (rev 6631)
@@ -1,92 +0,0 @@
-package org.jboss.cache.lock;
-
-import org.jboss.cache.CacheSPI;
-import org.jboss.cache.DefaultCacheFactory;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.NodeSPI;
-import org.jboss.cache.util.TestingUtil;
-import org.jboss.cache.config.Configuration;
-import org.jboss.cache.transaction.DummyTransactionManagerLookup;
-import static org.testng.AssertJUnit.assertEquals;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Test;
-
-/**
- * @author Bela Ban
- * @version $Id$
- */
- at Test(groups = {"functional"})
-public class AcquireAllTest
-{
- CacheSPI<Object, Object> cache = null, cache2;
- final Fqn FQN = Fqn.fromString("/myNode");
- final String KEY = "key";
- final String VALUE = "value";
-
- @AfterMethod(alwaysRun = true)
- public void tearDown() throws Exception
- {
- TestingUtil.killCaches(cache, cache2);
- }
-
-
- public void testAcquireAll() throws Exception
- {
- NodeSPI root;
- Object owner = Thread.currentThread();
-
- cache = createCache(Configuration.CacheMode.LOCAL, IsolationLevel.SERIALIZABLE);
- cache.put("/a/b/c", null);
- cache.put("/1/2/3", null);
-
- root = cache.getRoot();
- NodeLock lock = root.getLock();
-
- lock.acquireAll(owner, 2000, LockType.READ);
- lock.releaseAll(owner);
-
- assertEquals(0, cache.getNumberOfLocksHeld());
-
- lock.acquireAll(owner, 2000, LockType.WRITE);
- lock.releaseAll(owner);
-
- assertEquals(0, cache.getNumberOfLocksHeld());
- }
-
-
- public void testAcquireAllReplicated() throws Exception
- {
- NodeSPI root;
- Object owner = Thread.currentThread();
-
- cache2 = createCache(Configuration.CacheMode.REPL_ASYNC, IsolationLevel.SERIALIZABLE);
- cache2.put("/a/b/c", null);
- cache2.put("/1/2/3", null);
-
- cache = createCache(Configuration.CacheMode.REPL_ASYNC, IsolationLevel.SERIALIZABLE);
- root = cache.getRoot();
- NodeLock lock = root.getLock();
-
- lock.acquireAll(owner, 2000, LockType.READ);
- lock.releaseAll(owner);
-
- assertEquals(0, cache.getNumberOfLocksHeld());
-
- lock.acquireAll(owner, 2000, LockType.WRITE);
- lock.releaseAll(owner);
-
- assertEquals(0, cache.getNumberOfLocksHeld());
- }
-
-
- private CacheSPI<Object, Object> createCache(Configuration.CacheMode mode, IsolationLevel level)
- {
- CacheSPI<Object, Object> c = (CacheSPI<Object, Object>) new DefaultCacheFactory<Object, Object>().createCache(false);
- c.getConfiguration().setCacheMode(mode);
- c.getConfiguration().setIsolationLevel(level);
- c.getConfiguration().setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
- c.create();
- c.start();
- return c;
- }
-}
Copied: core/trunk/src/test/java/org/jboss/cache/lock/PessimisticAcquireAllTest.java (from rev 6621, core/trunk/src/test/java/org/jboss/cache/lock/AcquireAllTest.java)
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/lock/PessimisticAcquireAllTest.java (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/lock/PessimisticAcquireAllTest.java 2008-08-28 16:24:02 UTC (rev 6631)
@@ -0,0 +1,93 @@
+package org.jboss.cache.lock;
+
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.NodeSPI;
+import org.jboss.cache.util.TestingUtil;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.transaction.DummyTransactionManagerLookup;
+import static org.testng.AssertJUnit.assertEquals;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+ at Test(groups = {"functional"})
+public class PessimisticAcquireAllTest
+{
+ CacheSPI<Object, Object> cache = null, cache2;
+ final Fqn FQN = Fqn.fromString("/myNode");
+ final String KEY = "key";
+ final String VALUE = "value";
+
+ @AfterMethod(alwaysRun = true)
+ public void tearDown() throws Exception
+ {
+ TestingUtil.killCaches(cache, cache2);
+ }
+
+
+ public void testAcquireAll() throws Exception
+ {
+ NodeSPI root;
+ Object owner = Thread.currentThread();
+
+ cache = createCache(Configuration.CacheMode.LOCAL, IsolationLevel.SERIALIZABLE);
+ cache.put("/a/b/c", null);
+ cache.put("/1/2/3", null);
+
+ root = cache.getRoot();
+ NodeLock lock = root.getLock();
+
+ lock.acquireAll(owner, 2000, LockType.READ);
+ lock.releaseAll(owner);
+
+ assertEquals(0, cache.getNumberOfLocksHeld());
+
+ lock.acquireAll(owner, 2000, LockType.WRITE);
+ lock.releaseAll(owner);
+
+ assertEquals(0, cache.getNumberOfLocksHeld());
+ }
+
+
+ public void testAcquireAllReplicated() throws Exception
+ {
+ NodeSPI root;
+ Object owner = Thread.currentThread();
+
+ cache2 = createCache(Configuration.CacheMode.REPL_ASYNC, IsolationLevel.SERIALIZABLE);
+ cache2.put("/a/b/c", null);
+ cache2.put("/1/2/3", null);
+
+ cache = createCache(Configuration.CacheMode.REPL_ASYNC, IsolationLevel.SERIALIZABLE);
+ root = cache.getRoot();
+ NodeLock lock = root.getLock();
+
+ lock.acquireAll(owner, 2000, LockType.READ);
+ lock.releaseAll(owner);
+
+ assertEquals(0, cache.getNumberOfLocksHeld());
+
+ lock.acquireAll(owner, 2000, LockType.WRITE);
+ lock.releaseAll(owner);
+
+ assertEquals(0, cache.getNumberOfLocksHeld());
+ }
+
+
+ private CacheSPI<Object, Object> createCache(Configuration.CacheMode mode, IsolationLevel level)
+ {
+ CacheSPI<Object, Object> c = (CacheSPI<Object, Object>) new DefaultCacheFactory<Object, Object>().createCache(false);
+ c.getConfiguration().setNodeLockingScheme(Configuration.NodeLockingScheme.PESSIMISTIC);
+ c.getConfiguration().setCacheMode(mode);
+ c.getConfiguration().setIsolationLevel(level);
+ c.getConfiguration().setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+ c.create();
+ c.start();
+ return c;
+ }
+}
Property changes on: core/trunk/src/test/java/org/jboss/cache/lock/PessimisticAcquireAllTest.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: core/trunk/src/test/resources/log4j.xml
===================================================================
--- core/trunk/src/test/resources/log4j.xml 2008-08-28 16:21:28 UTC (rev 6630)
+++ core/trunk/src/test/resources/log4j.xml 2008-08-28 16:24:02 UTC (rev 6631)
@@ -10,7 +10,7 @@
<!-- A time/date based rolling appender -->
<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
<param name="File" value="../jbosscache.log"/>
- <param name="Append" value="true"/>
+ <param name="Append" value="false"/>
<!-- Rollover at midnight each day -->
<param name="DatePattern" value="'.'yyyy-MM-dd"/>
@@ -46,9 +46,13 @@
<!-- ================ -->
<category name="org.jboss.cache">
- <priority value="WARN"/>
+ <priority value="TRACE"/>
</category>
+ <category name="org.jboss.cache.lock.BreakDeadMemberLocksTest">
+ <priority value="TRACE"/>
+ </category>
+
<category name="org.jboss.cache.factories">
<priority value="WARN"/>
</category>
@@ -66,7 +70,7 @@
<!-- ======================= -->
<root>
- <!--<appender-ref ref="CONSOLE"/>-->
+ <appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
</root>
More information about the jbosscache-commits
mailing list