[jbosscache-commits] JBoss Cache SVN: r7567 - core/trunk/src/test/java/org/jboss/cache/lock.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Thu Jan 22 04:26:01 EST 2009
Author: mircea.markus
Date: 2009-01-22 04:26:00 -0500 (Thu, 22 Jan 2009)
New Revision: 7567
Modified:
core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java
Log:
commented tests because they rely too heavily on Thread.sleep that do not work anymore
Modified: core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java 2009-01-22 08:28:30 UTC (rev 7566)
+++ core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java 2009-01-22 09:26:00 UTC (rev 7567)
@@ -209,208 +209,194 @@
}
}
- public void testThreadedAccess_RWLock() throws Throwable
- {
- setLevelRW();
- log("testThreadedAccess_RWLock ...");
- final Object o1 = new Object();
- final Object o2 = new Object();
+// public void testThreadedAccess_RWLock() throws Throwable
+// {
+// setLevelRW();
+// log("testThreadedAccess_RWLock ...");
+// final Object o1 = new Object();
+// final Object o2 = new Object();
+//
+// // 1. o1 acquires the lock -- succeeds
+// Thread t1 = new Thread()
+// {
+// public void run()
+// {
+// try
+// {
+// log("o1 acquiring lock");
+// lock_.acquireReadLock(o1, 50);
+// log("o1: OK");
+// }
+// catch (Throwable e)
+// {
+// log("o1: FAIL");
+// thread_ex = e;
+// }
+// }
+// };
+//
+// // 2. o2 wants to acquire the lock -- this will fail and o2 will block for 2 secs
+// Thread t2 = new Thread()
+// {
+// public void run()
+// {
+// try
+// {
+// log("o2 acquiring lock");
+// lock_.acquireWriteLock(o2, 2000);
+// log("o2: OK");
+// }
+// catch (Throwable e)
+// {
+// log("o2: FAIL");
+// thread_ex = e;
+// }
+// }
+// };
+//
+// // 3. o1 acquires the lock a second time -- succeeds
+// Thread t3 = new Thread()
+// {
+// public void run()
+// {
+// try
+// {
+// log("o1 acquiring lock");
+// lock_.acquireWriteLock(o1, 10);
+// log("o1: OK");
+// }
+// catch (Throwable e)
+// {
+// log("o1: FAIL");
+// thread_ex = e;
+// }
+// }
+// };
+//
+// t1.start();
+// TestingUtil.sleepThread(100);
+// t2.start();
+// TestingUtil.sleepThread(1000);
+//
+// // o1 must be the owner of the lock
+// assertTrue(lock_.isOwner(o1));
+// TestingUtil.sleepThread(100);
+// // o1 must still be the owner of the lock
+// assertTrue(lock_.isOwner(o1));
+//
+// t3.start();
+// TestingUtil.sleepThread(100);
+// // o1 must still be the owner of the lock
+// assertTrue(lock_.isOwner(o1));
+//
+// // 4. o1 releases the lock; now o2 will succeed in acquiring the lock
+// log("o1 releasing lock");
+// lock_.release(o1);
+// log("o1: OK");
+//
+// TestingUtil.sleepThread(200);
+// //log("o2: " + o2.hashCode() + ", lock_.getOwner()=" + lock_.getOwner());
+// // assertTrue(lock_.isOwner(o2));
+// // lock_.release(o2);
+//
+// t1.join(20000);
+// t2.join(20000);
+// t3.join(20000);
+// if (thread_ex != null)
+// {
+// throw thread_ex;
+// }
+// }
- // 1. o1 acquires the lock -- succeeds
- Thread t1 = new Thread()
- {
- public void run()
- {
- try
- {
- log("o1 acquiring lock");
- lock_.acquireReadLock(o1, 50);
- log("o1: OK");
- }
- catch (Throwable e)
- {
- log("o1: FAIL");
- thread_ex = e;
- }
- }
- };
- // 2. o2 wants to acquire the lock -- this will fail and o2 will block for 2 secs
- Thread t2 = new Thread()
- {
- public void run()
- {
- try
- {
- log("o2 acquiring lock");
- lock_.acquireWriteLock(o2, 2000);
- log("o2: OK");
- }
- catch (Throwable e)
- {
- log("o2: FAIL");
- thread_ex = e;
- }
- }
- };
+// public void testThreadedAccess_SimpleLock() throws Throwable
+// {
+// setLevelSerial();
+// log("testThreadedAccess_SimpleLock() ...");
+// final Object o1 = new Object();
+// final Object o2 = new Object();
+//
+// // 1. o1 acquires the lock -- succeeds
+// Thread t1 = new Thread()
+// {
+// public void run()
+// {
+// try
+// {
+// log("o1 acquiring lock");
+// lock_.acquireReadLock(o1, 50);
+// log("o1: OK");
+// }
+// catch (Throwable e)
+// {
+// log("o1: FAIL");
+// thread_ex = e;
+// }
+// }
+// };
+//
+// // 2. o2 wants to acquire the lock -- this will fail and o2 will block for 2 secs
+// Thread t2 = new Thread()
+// {
+// public void run()
+// {
+// try
+// {
+// log("o2 acquiring lock");
+// lock_.acquireWriteLock(o2, 2000);
+// log("o2: OK");
+// }
+// catch (Throwable e)
+// {
+// log("o2: FAIL");
+// thread_ex = e;
+// }
+// }
+// };
+//
+// // 3. o1 acquires the lock a second time -- succeeds
+// Thread t3 = new Thread()
+// {
+// public void run()
+// {
+// try
+// {
+// log("o1 acquiring lock");
+// lock_.acquireWriteLock(o1, 10);
+// log("o1: OK");
+// }
+// catch (Throwable e)
+// {
+// log("o1: FAIL");
+// thread_ex = e;
+// }
+// }
+// };
+//
+// t1.start();
+// // make sure t1 has the WL!
+// t1.join();
+//
+// t2.start();
+//
+//
+// // o1 must be the owner of the lock
+// assertTrue(lock_.isOwner(o1));
+//
+// t3.start();
+// assertTrue(lock_.isOwner(o1));
+//
+// log("o1 releasing lock");
+// lock_.release(o1);
+//
+// t2.join(20000);
+// t3.join(20000);
+// if (thread_ex != null)
+// {
+// throw thread_ex;
+// }
+// }
- // 3. o1 acquires the lock a second time -- succeeds
- Thread t3 = new Thread()
- {
- public void run()
- {
- try
- {
- log("o1 acquiring lock");
- lock_.acquireWriteLock(o1, 10);
- log("o1: OK");
- }
- catch (Throwable e)
- {
- log("o1: FAIL");
- thread_ex = e;
- }
- }
- };
-
- t1.start();
- TestingUtil.sleepThread(100);
- t2.start();
- TestingUtil.sleepThread(1000);
-
- // o1 must be the owner of the lock
- assertTrue(lock_.isOwner(o1));
- TestingUtil.sleepThread(100);
- // o1 must still be the owner of the lock
- assertTrue(lock_.isOwner(o1));
-
- t3.start();
- TestingUtil.sleepThread(100);
- // o1 must still be the owner of the lock
- assertTrue(lock_.isOwner(o1));
-
- // 4. o1 releases the lock; now o2 will succeed in acquiring the lock
- log("o1 releasing lock");
- lock_.release(o1);
- log("o1: OK");
-
- TestingUtil.sleepThread(200);
- //log("o2: " + o2.hashCode() + ", lock_.getOwner()=" + lock_.getOwner());
- // assertTrue(lock_.isOwner(o2));
- // lock_.release(o2);
-
- t1.join(20000);
- t2.join(20000);
- t3.join(20000);
- if (thread_ex != null)
- {
- throw thread_ex;
- }
- }
-
-
- @Test (invocationCount = 2, successPercentage = 50) //this relies on threads.sleep fails ocasionally (pass 100 in a row on one thread)
- public void testThreadedAccess_SimpleLock() throws Throwable
- {
- setLevelSerial();
- log("testThreadedAccess_SimpleLock() ...");
- final Object o1 = new Object();
- final Object o2 = new Object();
-
- // 1. o1 acquires the lock -- succeeds
- Thread t1 = new Thread()
- {
- public void run()
- {
- try
- {
- log("o1 acquiring lock");
- lock_.acquireReadLock(o1, 50);
- log("o1: OK");
- }
- catch (Throwable e)
- {
- log("o1: FAIL");
- thread_ex = e;
- }
- }
- };
-
- // 2. o2 wants to acquire the lock -- this will fail and o2 will block for 2 secs
- Thread t2 = new Thread()
- {
- public void run()
- {
- try
- {
- log("o2 acquiring lock");
- lock_.acquireWriteLock(o2, 2000);
- log("o2: OK");
- }
- catch (Throwable e)
- {
- log("o2: FAIL");
- thread_ex = e;
- }
- }
- };
-
- // 3. o1 acquires the lock a second time -- succeeds
- Thread t3 = new Thread()
- {
- public void run()
- {
- try
- {
- log("o1 acquiring lock");
- lock_.acquireWriteLock(o1, 10);
- log("o1: OK");
- }
- catch (Throwable e)
- {
- log("o1: FAIL");
- thread_ex = e;
- }
- }
- };
-
- t1.start();
- // make sure t1 has the WL!
- t1.join();
-
- t2.start();
- TestingUtil.sleepThread(1000);
-
- // o1 must be the owner of the lock
- assertTrue(lock_.isOwner(o1));
- TestingUtil.sleepThread(100);
- // o1 must still be the owner of the lock
- assertTrue(lock_.isOwner(o1));
-
- t3.start();
- TestingUtil.sleepThread(100);
- // o1 must still be the owner of the lock
- assertTrue(lock_.isOwner(o1));
-
- // 4. o1 releases the lock; now o2 will succeed in acquiring the lock
- log("o1 releasing lock");
- lock_.release(o1);
- log("o1: OK");
-
- TestingUtil.sleepThread(200);
- //log("o2: " + o2.hashCode() + ", lock_.getOwner()=" + lock_.getOwner());
- // assertTrue(lock_.isOwner(o2));
- // lock_.release(o2);
-
-// t1.join(20000);
- t2.join(20000);
- t3.join(20000);
- if (thread_ex != null)
- {
- throw thread_ex;
- }
- }
-
public void testReadAndReleaseAll()
{
setLevelRW();
@@ -552,13 +538,8 @@
{
public void run()
{
- long initialTime = System.currentTimeMillis();
for (int i = 0; i < opCount; i++)
{
- if (i % 10 == 0)
- {
- initialTime = System.currentTimeMillis();
- }
try
{
iLock.toString(new StringBuilder(), false);
More information about the jbosscache-commits
mailing list