[jbosscache-commits] JBoss Cache SVN: r4709 - core/trunk/src/test/java/org/jboss/cache/lock.
Author: manik.surtani(a)jboss.com
Date: 2007-10-30 19:22:23 -0400 (Tue, 30 Oct 2007)
New Revision: 4709
Modified:
core/trunk/src/test/java/org/jboss/cache/lock/NonBlockingWriterLockTest.java
Log:
Test wasn't cleaning up properly
Modified: core/trunk/src/test/java/org/jboss/cache/lock/NonBlockingWriterLockTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/lock/NonBlockingWriterLockTest.java 2007-10-30
23:19:03 UTC (rev 4708)
+++
core/trunk/src/test/java/org/jboss/cache/lock/NonBlockingWriterLockTest.java 2007-10-30
23:22:23 UTC (rev 4709)
@@ -1,17 +1,16 @@
package org.jboss.cache.lock;
+import org.jboss.cache.misc.TestingUtil;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.fail;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
import java.util.Vector;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
-import org.jboss.cache.misc.TestingUtil;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
/**
* NonBlockingWriterLock is a read/write lock (with upgrade) that has
* non-blocking write lock acquisition on existing read lock(s).
@@ -570,8 +569,10 @@
t2.start();
t1.join(3000);
t2.join(3000);
- assertTrue(checkLockingResult(caseNum + "-t1-WL-1") &&
- checkLockingResult(caseNum + "-t2-RL-0"));
+ assert checkLockingResult(caseNum + "-t1-WL-1");
+ assert checkLockingResult(caseNum + "-t2-RL-0");
+// assertTrue(checkLockingResult(caseNum + "-t1-WL-1") &&
+// checkLockingResult(caseNum + "-t2-RL-0"));
cleanLockingResult();
// possilbe deadlock check
if (t1.isAlive() || t2.isAlive())
@@ -593,8 +594,11 @@
t2.start();
t1.join(3000);
t2.join(3000);
- assertTrue(checkLockingResult(caseNum + "-t1-WL-1") &&
- checkLockingResult(caseNum + "-t2-WL-0"));
+// assertTrue(checkLockingResult(caseNum + "-t1-WL-1") &&
+// checkLockingResult(caseNum + "-t2-WL-0"));
+ assert checkLockingResult(caseNum + "-t1-WL-1");
+ assert checkLockingResult(caseNum + "-t2-WL-0");
+
cleanLockingResult();
// possilbe deadlock check
if (t1.isAlive() || t2.isAlive())