[jbosscache-commits] JBoss Cache SVN: r7846 - core/branches/flat/src/test/java/org/horizon/statetransfer.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-03-04 08:28:08 -0500 (Wed, 04 Mar 2009)
New Revision: 7846

Modified:
   core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferCacheLoaderFunctionalTest.java
   core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferFunctionalTest.java
Log:
Updated tests

Modified: core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferCacheLoaderFunctionalTest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferCacheLoaderFunctionalTest.java	2009-03-04 13:22:46 UTC (rev 7845)
+++ core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferCacheLoaderFunctionalTest.java	2009-03-04 13:28:08 UTC (rev 7846)
@@ -19,6 +19,10 @@
       }
    };
 
+   public StateTransferCacheLoaderFunctionalTest() {
+      cacheName = "nbst-with-loader";
+   }
+
    @Override
    protected CacheManager createCacheManager() {
       // increment the DIMCS store id

Modified: core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferFunctionalTest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferFunctionalTest.java	2009-03-04 13:22:46 UTC (rev 7845)
+++ core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferFunctionalTest.java	2009-03-04 13:28:08 UTC (rev 7846)
@@ -34,7 +34,7 @@
    public static final Integer FORTY = 40;
 
    Configuration config;
-   protected static final String cacheName = "nbst";
+   protected static String cacheName = "nbst";
 
    private volatile int testCount = 0;
 
@@ -198,32 +198,32 @@
    public void testSTWithThirdWritingNonTxCache() throws Exception {
       testCount++;
       log.info("testSTWithThirdWritingNonTxCache start - " + testCount);
-      thirdWritingCacheTest(false, "nbst1");
+      thirdWritingCacheTest(false);
       log.info("testSTWithThirdWritingNonTxCache end - " + testCount);
    }
 
    public void testSTWithThirdWritingTxCache() throws Exception {
       testCount++;
       log.info("testSTWithThirdWritingTxCache start - " + testCount);
-      thirdWritingCacheTest(true, "nbst2");
+      thirdWritingCacheTest(true);
       log.info("testSTWithThirdWritingTxCache end - " + testCount);
    }
 
    public void testSTWithWritingNonTxThread() throws Exception {
       testCount++;
       log.info("testSTWithWritingNonTxThread start - " + testCount);
-      writingThreadTest(false, "nbst3");
+      writingThreadTest(false);
       log.info("testSTWithWritingNonTxThread end - " + testCount);
    }
 
    public void testSTWithWritingTxThread() throws Exception {
       testCount++;
       log.info("testSTWithWritingTxThread start - " + testCount);
-      writingThreadTest(true, "nbst4");
+      writingThreadTest(true);
       log.info("testSTWithWritingTxThread end - " + testCount);
    }
 
-   private void thirdWritingCacheTest(boolean tx, String name) throws InterruptedException {
+   private void thirdWritingCacheTest(boolean tx) throws InterruptedException {
       Cache<Object, Object> cache1, cache2, cache3;
       cache1 = createCacheManager().getCache(cacheName);
       cache3 = createCacheManager().getCache(cacheName);
@@ -266,8 +266,8 @@
       c.put(A_C_AGE, FORTY);
    }
 
-   private void writingThreadTest(boolean tx, String name) throws InterruptedException {
-      Cache<Object, Object> cache1 = null, cache2 = null;
+   private void writingThreadTest(boolean tx) throws InterruptedException {
+      Cache<Object, Object> cache1, cache2;
       cache1 = createCacheManager().getCache(cacheName);
 
       writeInitialData(cache1);