[jbosscache-commits] JBoss Cache SVN: r4864 - in core/trunk/src/test/java/org/jboss/cache: misc and 1 other directories.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2007-12-16 08:55:03 -0500 (Sun, 16 Dec 2007)
New Revision: 4864

Modified:
   core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
   core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java
   core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java
Log:
Updated tests

Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java	2007-12-14 18:23:38 UTC (rev 4863)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java	2007-12-16 13:55:03 UTC (rev 4864)
@@ -56,8 +56,7 @@
    @AfterMethod(alwaysRun = true)
    public void tearDown()
    {
-      if (cache != null) cache.stop();
-      if (rootNode != null) rootNode = null;
+      TestingUtil.killCaches(cache);
    }
 
    @Test(groups = {"functional"})

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-14 18:23:38 UTC (rev 4863)
+++ core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java	2007-12-16 13:55:03 UTC (rev 4864)
@@ -543,6 +543,6 @@
    public static RemoteCacheInvocationDelegate getRemoteDelegate(CacheSPI cache)
    {
       ComponentRegistry cr = extractComponentRegistry(cache);
-      return cr.getComponent(RemoteCacheInvocationDelegate.class);
+      return cr.getComponent("remoteDelegate", RemoteCacheInvocationDelegate.class);
    }
 }

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java	2007-12-14 18:23:38 UTC (rev 4863)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java	2007-12-16 13:55:03 UTC (rev 4864)
@@ -1,6 +1,5 @@
 package org.jboss.cache.optimistic;
 
-import org.jboss.cache.CacheImpl;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
@@ -54,7 +53,7 @@
          {
 
          }
-      cache.stop();
+         cache.stop();
       }
    }
 
@@ -204,10 +203,9 @@
 
    private WorkspaceNode getWorkspaceNode(Fqn fqn) throws Exception
    {
-      CacheImpl ci = (CacheImpl) cache;
-      Transaction tx = ci.getTransactionManager().getTransaction();
-      GlobalTransaction gtx = ci.getTransactionTable().get(tx);
-      OptimisticTransactionEntry te = (OptimisticTransactionEntry) ci.getTransactionTable().get(gtx);
+      Transaction tx = cache.getTransactionManager().getTransaction();
+      GlobalTransaction gtx = cache.getTransactionTable().get(tx);
+      OptimisticTransactionEntry te = (OptimisticTransactionEntry) cache.getTransactionTable().get(gtx);
       TransactionWorkspace tw = te.getTransactionWorkSpace();
       return tw.getNode(fqn);
    }