[jbosscache-commits] JBoss Cache SVN: r6204 - in core/trunk/src: test/java/org/jboss/cache/lock and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-07-08 06:18:31 -0400 (Tue, 08 Jul 2008)
New Revision: 6204

Modified:
   core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java
   core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerRecordingTest.java
   core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerTest.java
Log:
Fixed broken tests

Modified: core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java	2008-07-08 09:59:14 UTC (rev 6203)
+++ core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java	2008-07-08 10:18:31 UTC (rev 6204)
@@ -55,7 +55,7 @@
    private static final boolean trace = log.isTraceEnabled();
 
    @Inject
-   public void injectDataContainer(DataContainer dataContainer, CacheSPI cache, TransactionManager transactionManager, InvocationContextContainer invocationContextContainer)
+   public void injectDependencies(DataContainer dataContainer, CacheSPI cache, TransactionManager transactionManager, InvocationContextContainer invocationContextContainer)
    {
       this.dataContainer = dataContainer;
       this.cache = cache;

Modified: core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerRecordingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerRecordingTest.java	2008-07-08 09:59:14 UTC (rev 6203)
+++ core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerRecordingTest.java	2008-07-08 10:18:31 UTC (rev 6204)
@@ -1,6 +1,7 @@
 package org.jboss.cache.lock;
 
 import org.jboss.cache.Fqn;
+import org.jboss.cache.config.Configuration;
 import org.jboss.cache.factories.context.MVCCContextFactory;
 import org.jboss.cache.invocation.InvocationContextContainer;
 import org.jboss.cache.lock.MVCCLockManager.LockContainer;
@@ -26,7 +27,8 @@
       icc = new InvocationContextContainer();
       MVCCLockManager mvccLockManager = new MVCCLockManager();
       TransactionManager tm = DummyTransactionManager.getInstance();
-      mvccLockManager.injectDataContainer(null, null, tm, icc);
+      mvccLockManager.injectConfiguration(new Configuration());
+      mvccLockManager.injectDependencies(null, null, tm, icc);
       mvccLockManager.startLockManager();
       lm = mvccLockManager;
       contextFactory = new MVCCContextFactory();

Modified: core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerTest.java	2008-07-08 09:59:14 UTC (rev 6203)
+++ core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerTest.java	2008-07-08 10:18:31 UTC (rev 6204)
@@ -3,6 +3,7 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.NodeSPI;
 import org.jboss.cache.UnversionedNode;
+import org.jboss.cache.config.Configuration;
 import org.jboss.cache.factories.context.MVCCContextFactory;
 import org.jboss.cache.invocation.InvocationContextContainer;
 import org.jboss.cache.invocation.NodeInvocationDelegate;
@@ -28,7 +29,8 @@
       icc.injectContextFactory(new MVCCContextFactory());
       lm = new MVCCLockManager();
       TransactionManager tm = getTransactionManager();
-      lm.injectDataContainer(null, null, tm, icc);
+      lm.injectConfiguration(new Configuration());
+      lm.injectDependencies(null, null, tm, icc);
       lm.startLockManager();
    }
 
@@ -45,35 +47,18 @@
 
    public void testUsingReadLocks()
    {
-      // using any READ locks should throw an exception
-      try
-      {
-         lm.isLocked(null, READ);
-         assert false : "Should fail";
-      }
-      catch (Exception e)
-      {
-         // good
-      }
+      // using any READ locks should be no-ops.
+      lm.isLocked(null, READ);
 
-      try
-      {
-         lm.getReadOwners(Fqn.ROOT);
-         assert false : "Should fail";
-      }
-      catch (Exception e)
-      {
-         // good
-      }
+      lm.getReadOwners(Fqn.ROOT);
 
       try
       {
          lm.getReadOwners((NodeSPI) null);
-         assert false : "Should fail";
       }
-      catch (Exception e)
+      catch (NullPointerException npe)
       {
-         // good
+         // since we're passing in a null.
       }
    }