[infinispan-commits] Infinispan SVN: r1579 - trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-03-09 07:32:57 -0500 (Tue, 09 Mar 2010)
New Revision: 1579

Modified:
   trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java
   trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/PreparableTransactionRunnerTest.java
Log:
Updated tests

Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java	2010-03-09 12:10:49 UTC (rev 1578)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java	2010-03-09 12:32:57 UTC (rev 1579)
@@ -24,6 +24,7 @@
 import org.infinispan.loaders.modifications.Remove;
 import org.infinispan.loaders.modifications.Store;
 import org.infinispan.marshall.TestObjectStreamMarshaller;
+import org.infinispan.test.AbstractInfinispanTest;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
@@ -31,6 +32,7 @@
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Optional;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
 
@@ -61,7 +63,7 @@
  * @since 4.0
  */
 @Test(groups = "unit", enabled = true, testName = "loaders.bdbje.BdbjeLearningTest")
-public class BdbjeLearningTest {
+public class BdbjeLearningTest extends AbstractInfinispanTest {
    Environment env;
 
    private static final String CLASS_CATALOG = "java_class_catalog";
@@ -74,9 +76,9 @@
    private String tmpDirectory;
 
    @BeforeTest
-   @Parameters({"basedir"})
-   protected void setUpTempDir(String basedir) {
-      tmpDirectory = basedir + TestingUtil.TEST_PATH + File.separator + getClass().getSimpleName();
+   @Parameters("basedir")
+   protected void setUpTempDir(@Optional("/tmp") String basedir) {
+      tmpDirectory = TestingUtil.tmpDirectory(basedir, this);
    }
 
    @AfterTest

Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/PreparableTransactionRunnerTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/PreparableTransactionRunnerTest.java	2010-03-09 12:10:49 UTC (rev 1578)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/PreparableTransactionRunnerTest.java	2010-03-09 12:32:57 UTC (rev 1579)
@@ -4,12 +4,15 @@
 import com.sleepycat.collections.TransactionWorker;
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.EnvironmentConfig;
+import com.sleepycat.je.LockConflictException;
 import com.sleepycat.je.LockTimeoutException;
 import com.sleepycat.je.Transaction;
 import com.sleepycat.je.TransactionConfig;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.classextension.EasyMock.*;
+
+import com.sleepycat.je.txn.Locker;
 import org.infinispan.loaders.CacheLoaderException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -51,16 +54,17 @@
 
    @Test
    public void testMoreDeadlocks() throws Exception {
+      Locker mockLocker = createNiceMock(Locker.class);
       worker.doWork();
-      expectLastCall().andThrow(new LockTimeoutException(null, null));
+      expectLastCall().andThrow(new LockTimeoutException(mockLocker, ""));
       transaction.abort();
       expect(env.beginTransaction(null, null)).andReturn(transaction);
       worker.doWork();
-      expectLastCall().andThrow(new LockTimeoutException(null, null));
+      expectLastCall().andThrow(new LockTimeoutException(mockLocker, ""));
       transaction.abort();
       expect(env.beginTransaction(null, null)).andReturn(transaction);
       worker.doWork();
-      expectLastCall().andThrow(new LockTimeoutException(null, null));
+      expectLastCall().andThrow(new LockTimeoutException(mockLocker, ""));
       transaction.abort();
       replayAll();
       runner = new PreparableTransactionRunner(env, 2, null);