[jbosscache-commits] JBoss Cache SVN: r4865 - in core/trunk/src: main/java/org/jboss/cache/interceptors and 3 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Sun Dec 16 09:36:06 EST 2007
Author: manik.surtani at jboss.com
Date: 2007-12-16 09:36:04 -0500 (Sun, 16 Dec 2007)
New Revision: 4865
Modified:
core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLockingInterceptor.java
core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java
core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java
Log:
Updated tests
Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java 2007-12-16 13:55:03 UTC (rev 4864)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java 2007-12-16 14:36:04 UTC (rev 4865)
@@ -44,7 +44,6 @@
import org.jboss.cache.transaction.GlobalTransaction;
import org.jboss.cache.transaction.OptimisticTransactionEntry;
import org.jboss.cache.transaction.TransactionEntry;
-import org.jboss.cache.transaction.TransactionManagerLookup;
import org.jboss.cache.transaction.TransactionTable;
import org.jboss.cache.util.ThreadGate;
import org.jboss.cache.util.concurrent.ConcurrentHashSet;
@@ -143,18 +142,6 @@
private Marshaller marshaller = null;
/**
- * {@link #invokeMethod(org.jboss.cache.marshall.MethodCall,boolean)} will dispatch to this chain of interceptors.
- * In the future, this will be replaced with JBossAop. This is a first step towards refactoring JBossCache.
- */
- private Interceptor interceptor_chain = null;
-
- /**
- * Method to acquire a TransactionManager. By default we use JBossTransactionManagerLookup. Has
- * to be set before calling {@link #start()}
- */
- private TransactionManagerLookup tm_lookup = null;
-
- /**
* Used to get the Transaction associated with the current thread
*/
private TransactionManager transactionManager = null;
@@ -306,22 +293,6 @@
}
/**
- * Used for testing only - sets the interceptor chain.
- */
- public void setInterceptorChain(Interceptor i)
- {
- interceptor_chain = i;
- }
-
- /**
- * @return the list of interceptors.
- */
- public List<Interceptor> getInterceptors()
- {
- return InterceptorChainFactory.getInstance().asList(interceptor_chain);
- }
-
- /**
* Returns the underlying cache loader in use.
*/
public CacheLoader getCacheLoader()
@@ -372,14 +343,6 @@
}
/**
- * Sets the TransactionManagerLookup object
- */
- public void setTransactionManagerLookup(TransactionManagerLookup l)
- {
- this.tm_lookup = l;
- }
-
- /**
* Returns the transaction manager in use.
*/
public TransactionManager getTransactionManager()
@@ -3801,6 +3764,19 @@
throw new UnsupportedOperationException("Not implemented in this release");
}
+ private List<Interceptor> getInterceptors()
+ {
+ Interceptor i = componentRegistry.getComponent(Interceptor.class);
+ InterceptorChainFactory icf = componentRegistry.getComponent(InterceptorChainFactory.class);
+ return icf.asList(i);
+ }
+
+ private void setInterceptorChain(Interceptor startOfNewChain)
+ {
+ componentRegistry.registerComponent(Interceptor.class, startOfNewChain);
+ componentRegistry.updateDependencies();
+ }
+
public synchronized void addInterceptor(Interceptor i, int position)
{
List<Interceptor> interceptors = getInterceptors();
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLockingInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLockingInterceptor.java 2007-12-16 13:55:03 UTC (rev 4864)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLockingInterceptor.java 2007-12-16 14:36:04 UTC (rev 4865)
@@ -63,7 +63,7 @@
boolean isWriteLockNeeded = workspaceNode.isDirty() || (workspaceNode.isChildrenModified() && (configuration.isLockParentForChildInsertRemove() || node.isLockForChildInsertRemove()));
- boolean acquired = node.getLock().acquire(gtx, lockAcquisitionTimeout, isWriteLockNeeded ? WRITE : READ);
+ boolean acquired = node.getLock().acquire(gtx, timeout, isWriteLockNeeded ? WRITE : READ);
if (acquired)
{
if (trace) log.trace("Acquired lock on node " + node.getFqn());
Modified: core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java 2007-12-16 13:55:03 UTC (rev 4864)
+++ core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java 2007-12-16 14:36:04 UTC (rev 4865)
@@ -6,7 +6,6 @@
*/
package org.jboss.cache.loader;
-import org.jboss.cache.CacheImpl;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.interceptors.CacheStoreInterceptor;
@@ -55,9 +54,9 @@
// findCacheStoreInterceptor(cache2).setCache(cache2);
}
- protected CacheStoreInterceptor findCacheStoreInterceptor(CacheImpl cache)
+ protected CacheStoreInterceptor findCacheStoreInterceptor(CacheSPI cache)
{
- Iterator ints = cache.getInterceptors().iterator();
+ Iterator ints = cache.getInterceptorChain().iterator();
CacheStoreInterceptor csi = null;
while (ints.hasNext())
{
Modified: core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java 2007-12-16 13:55:03 UTC (rev 4864)
+++ core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java 2007-12-16 14:36:04 UTC (rev 4865)
@@ -92,6 +92,9 @@
public static void injectInterceptor(CacheSPI<?, ?> cache, Interceptor interceptorToInject, Class<? extends Interceptor> interceptorAfterWhichToInject)
{
System.out.println("Old interceptor chain: " + CachePrinter.printCacheInterceptors(cache));
+ // make sure the new interceptor is wired
+ ComponentRegistry cr = extractComponentRegistry(cache);
+ cr.wireDependencies(interceptorToInject);
interceptorToInject.setCache(cache);
int index = -1;
for (Interceptor i : cache.getInterceptorChain())
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java 2007-12-16 13:55:03 UTC (rev 4864)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java 2007-12-16 14:36:04 UTC (rev 4865)
@@ -1,7 +1,7 @@
package org.jboss.cache.optimistic;
import org.jboss.cache.Cache;
-import org.jboss.cache.CacheImpl;
+import org.jboss.cache.CacheSPI;
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.NodeSPI;
@@ -43,7 +43,7 @@
cache.start();
- loader = ((CacheImpl) cache).getCacheLoader();
+ loader = ((CacheSPI) cache).getCacheLoaderManager().getCacheLoader();
}
@AfterMethod
@@ -65,7 +65,6 @@
{
Fqn f = Fqn.fromString("/one/two/three");
cache.put(f, "k", "v");
-
cache.put(f, "k1", "v1");
@@ -81,8 +80,6 @@
assert ((DefaultDataVersion) dv).getRawVersion() == 3 : "Should have accurate data version";
-
-
// now restart cache instance
cache.stop();
cache.start();
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java 2007-12-16 13:55:03 UTC (rev 4864)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java 2007-12-16 14:36:04 UTC (rev 4865)
@@ -5,12 +5,12 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
-import org.jboss.cache.interceptors.Interceptor;
import org.jboss.cache.interceptors.OptimisticInterceptor;
import org.jboss.cache.interceptors.OptimisticLockingInterceptor;
import org.jboss.cache.lock.NodeLock;
import static org.jboss.cache.lock.NodeLock.LockType.READ;
import static org.jboss.cache.lock.NodeLock.LockType.WRITE;
+import org.jboss.cache.misc.TestingUtil;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -41,18 +41,20 @@
lri = new LockReportInterceptor();
lri.setCache(cache);
- Interceptor i = cache.getInterceptorChain().get(0);
- Interceptor lockInterceptor = i;
- // find the OptimisticLockInterceptor and insert LockReportInterceptor after that.
- while (!(lockInterceptor instanceof OptimisticLockingInterceptor))
- {
- System.out.println("Inspecting " + lockInterceptor.getClass().getSimpleName());
- lockInterceptor = lockInterceptor.getNext();
- }
- Interceptor next = lockInterceptor.getNext();
+ TestingUtil.injectInterceptor(cache, lri, OptimisticLockingInterceptor.class);
- lockInterceptor.setNext(lri);
- lri.setNext(next);
+// Interceptor i = cache.getInterceptorChain().get(0);
+// Interceptor lockInterceptor = i;
+// // find the OptimisticLockInterceptor and insert LockReportInterceptor after that.
+// while (!(lockInterceptor instanceof OptimisticLockingInterceptor))
+// {
+// System.out.println("Inspecting " + lockInterceptor.getClass().getSimpleName());
+// lockInterceptor = lockInterceptor.getNext();
+// }
+// Interceptor next = lockInterceptor.getNext();
+//
+// lockInterceptor.setNext(lri);
+// lri.setNext(next);
cache.put(child, "key", "value");
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java 2007-12-16 13:55:03 UTC (rev 4864)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java 2007-12-16 14:36:04 UTC (rev 4865)
@@ -1,11 +1,10 @@
package org.jboss.cache.optimistic;
import org.jboss.cache.Cache;
-import org.jboss.cache.CacheImpl;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
-import org.jboss.cache.VersionedNode;
+import org.jboss.cache.NodeSPI;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -17,7 +16,7 @@
* @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
* @since 2.0.0
*/
- at Test (groups={"functional"})
+ at Test(groups = {"functional"})
public class ParentVersionTest extends AbstractOptimisticTestCase
{
private Cache<Object, Object> cache;
@@ -40,7 +39,7 @@
}
else cache = createCache();
- tm = ((CacheSPI<Object, Object>)cache).getTransactionManager();
+ tm = ((CacheSPI<Object, Object>) cache).getTransactionManager();
}
@AfterMethod(alwaysRun = true)
@@ -51,7 +50,7 @@
private long getVersion(Node n)
{
- return ((DefaultDataVersion)((VersionedNode)n).getVersion()).getRawVersion();
+ return ((DefaultDataVersion) ((NodeSPI) n).getVersion()).getRawVersion();
}
public void testSimpleAdd()
@@ -60,8 +59,6 @@
long parentVersion = getVersion(cache.getRoot().getChild(parent));
cache.put(child1, "k", "v");
- System.out.println(((CacheImpl)cache).printLockInfo());
-
if (lockParentForChildInsertRemove)
assertEquals(parentVersion + 1, getVersion(cache.getRoot().getChild(parent)));
else assertEquals(parentVersion, getVersion(cache.getRoot().getChild(parent)));
More information about the jbosscache-commits
mailing list