[jboss-cvs] JBossAS SVN: r75338 - projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Jul 3 05:33:29 EDT 2008


Author: alesj
Date: 2008-07-03 05:33:29 -0400 (Thu, 03 Jul 2008)
New Revision: 75338

Modified:
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheContextWithFactoryBasicAnnotationsUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheContextWithFactoryBasicMetaDataUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheMetaDataContextWithFactoryAnnotationUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheMetaDataContextWithFactoryMetaDataUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheParentContextWithFactoryBasicAnnotationsUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheParentContextWithFactoryBasicMetaDataUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPSimpleCacheMetaDataContextWithFactoryUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPSimpleCacheParentMetaDataContextWithFactoryUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheContextWithFactoryBasicAnnotationsUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheContextWithFactoryBasicMetaDataUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheMetaDataContextWithFactoryAnnotationUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheMetaDataContextWithFactoryMetaDataUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextWithFactoryBasicAnnotationsUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextWithFactoryBasicMetaDataUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheContextWithFactoryBasicAnnotationsUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheContextWithFactoryBasicMetaDataUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheMetaDataContextWithFactoryAnnotationUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheMetaDataContextWithFactoryMetaDataUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheParentContextWithFactoryBasicAnnotationsUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheParentContextWithFactoryBasicMetaDataUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCSimpleCacheMetaDataContextWithFactoryUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCSimpleCacheParentMetaDataContextWithFactoryUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheMetaDataContextWithFactoryUnitTestCase.java
   projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheParentMetaDataContextWithFactoryUnitTestCase.java
Log:
Fix tests, so that they use single instance of factory.

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheContextWithFactoryBasicAnnotationsUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheContextWithFactoryBasicAnnotationsUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheContextWithFactoryBasicAnnotationsUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -37,7 +37,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new CachePolicyCacheFactory(getPolicy());
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheContextWithFactoryBasicMetaDataUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheContextWithFactoryBasicMetaDataUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheContextWithFactoryBasicMetaDataUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -37,7 +37,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new CachePolicyCacheFactory(getPolicy());
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheMetaDataContextWithFactoryAnnotationUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheMetaDataContextWithFactoryAnnotationUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheMetaDataContextWithFactoryAnnotationUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -37,7 +37,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new CachePolicyCacheFactory(getPolicy());
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheMetaDataContextWithFactoryMetaDataUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheMetaDataContextWithFactoryMetaDataUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheMetaDataContextWithFactoryMetaDataUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -37,7 +37,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new CachePolicyCacheFactory(getPolicy());
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheParentContextWithFactoryBasicAnnotationsUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheParentContextWithFactoryBasicAnnotationsUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheParentContextWithFactoryBasicAnnotationsUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -37,7 +37,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new CachePolicyCacheFactory(getPolicy());
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheParentContextWithFactoryBasicMetaDataUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheParentContextWithFactoryBasicMetaDataUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPCacheParentContextWithFactoryBasicMetaDataUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -37,7 +37,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new CachePolicyCacheFactory(getPolicy());
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPSimpleCacheMetaDataContextWithFactoryUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPSimpleCacheMetaDataContextWithFactoryUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPSimpleCacheMetaDataContextWithFactoryUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -37,7 +37,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new CachePolicyCacheFactory(getPolicy());
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPSimpleCacheParentMetaDataContextWithFactoryUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPSimpleCacheParentMetaDataContextWithFactoryUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CPSimpleCacheParentMetaDataContextWithFactoryUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -37,7 +37,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new CachePolicyCacheFactory(getPolicy());
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheContextWithFactoryBasicAnnotationsUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheContextWithFactoryBasicAnnotationsUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheContextWithFactoryBasicAnnotationsUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -32,6 +32,8 @@
  */
 public abstract class CacheContextWithFactoryBasicAnnotationsUnitTestCase extends CacheContextBasicAnnotationsUnitTestCase
 {
+   private CacheFactory factory;
+
    public CacheContextWithFactoryBasicAnnotationsUnitTestCase(String name)
    {
       super(name);
@@ -42,5 +44,12 @@
       return new CachingMetaDataContext(null, loader, getFactory());
    }
 
-   protected abstract CacheFactory getFactory();
+   private CacheFactory getFactory()
+   {
+      if (factory == null)
+         factory = createFactory();
+      return factory;
+   }
+
+   protected abstract CacheFactory createFactory();
 }
\ No newline at end of file

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheContextWithFactoryBasicMetaDataUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheContextWithFactoryBasicMetaDataUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheContextWithFactoryBasicMetaDataUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -32,6 +32,8 @@
  */
 public abstract class CacheContextWithFactoryBasicMetaDataUnitTestCase extends CacheContextBasicMetaDataUnitTestCase
 {
+   private CacheFactory factory;
+
    public CacheContextWithFactoryBasicMetaDataUnitTestCase(String name)
    {
       super(name);
@@ -42,5 +44,12 @@
       return new CachingMetaDataContext(null, loader, getFactory());
    }
 
-   protected abstract CacheFactory getFactory();
+   private CacheFactory getFactory()
+   {
+      if (factory == null)
+         factory = createFactory();
+      return factory;
+   }
+
+   protected abstract CacheFactory createFactory();
 }
\ No newline at end of file

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheMetaDataContextWithFactoryAnnotationUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheMetaDataContextWithFactoryAnnotationUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheMetaDataContextWithFactoryAnnotationUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -35,6 +35,8 @@
  */
 public abstract class CacheMetaDataContextWithFactoryAnnotationUnitTestCase extends CacheMetaDataContextAnnotationUnitTestCase
 {
+   private CacheFactory factory;
+
    public CacheMetaDataContextWithFactoryAnnotationUnitTestCase(String name)
    {
       super(name);
@@ -45,5 +47,12 @@
       return new CachingMetaDataContext(parent, retrievals, getFactory());
    }
 
-   protected abstract CacheFactory getFactory();
+   private CacheFactory getFactory()
+   {
+      if (factory == null)
+         factory = createFactory();
+      return factory;
+   }
+
+   protected abstract CacheFactory createFactory();
 }
\ No newline at end of file

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheMetaDataContextWithFactoryMetaDataUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheMetaDataContextWithFactoryMetaDataUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheMetaDataContextWithFactoryMetaDataUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -35,6 +35,8 @@
  */
 public abstract class CacheMetaDataContextWithFactoryMetaDataUnitTestCase extends CacheMetaDataContextMetaDataUnitTestCase
 {
+   private CacheFactory factory;
+
    public CacheMetaDataContextWithFactoryMetaDataUnitTestCase(String name)
    {
       super(name);
@@ -45,5 +47,12 @@
       return new CachingMetaDataContext(parent, retrievals, getFactory());
    }
 
-   protected abstract CacheFactory getFactory();
+   private CacheFactory getFactory()
+   {
+      if (factory == null)
+         factory = createFactory();
+      return factory;
+   }
+
+   protected abstract CacheFactory createFactory();
 }
\ No newline at end of file

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextWithFactoryBasicAnnotationsUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextWithFactoryBasicAnnotationsUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextWithFactoryBasicAnnotationsUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -32,6 +32,8 @@
  */
 public abstract class CacheParentContextWithFactoryBasicAnnotationsUnitTestCase extends CacheParentContextBasicAnnotationsUnitTestCase
 {
+   private CacheFactory factory;
+
    public CacheParentContextWithFactoryBasicAnnotationsUnitTestCase(String name)
    {
       super(name);
@@ -42,5 +44,12 @@
       return new CachingMetaDataContext(null, loader, getFactory());
    }
 
-   protected abstract CacheFactory getFactory();
+   private CacheFactory getFactory()
+   {
+      if (factory == null)
+         factory = createFactory();
+      return factory;
+   }
+
+   protected abstract CacheFactory createFactory();
 }
\ No newline at end of file

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextWithFactoryBasicMetaDataUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextWithFactoryBasicMetaDataUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextWithFactoryBasicMetaDataUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -33,6 +33,8 @@
  */
 public abstract class CacheParentContextWithFactoryBasicMetaDataUnitTestCase extends CacheParentContextBasicMetaDataUnitTestCase
 {
+   private CacheFactory factory;
+
    public CacheParentContextWithFactoryBasicMetaDataUnitTestCase(String name)
    {
       super(name);
@@ -48,5 +50,12 @@
       return new CachingMetaDataContext(parent, empty, getFactory());
    }
 
-   protected abstract CacheFactory getFactory();
+   private CacheFactory getFactory()
+   {
+      if (factory == null)
+         factory = createFactory();
+      return factory;
+   }
+
+   protected abstract CacheFactory createFactory();
 }
\ No newline at end of file

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheContextWithFactoryBasicAnnotationsUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheContextWithFactoryBasicAnnotationsUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheContextWithFactoryBasicAnnotationsUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -36,7 +36,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new JBossCacheCacheFactory();
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheContextWithFactoryBasicMetaDataUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheContextWithFactoryBasicMetaDataUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheContextWithFactoryBasicMetaDataUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -21,10 +21,8 @@
 */
 package org.jboss.test.metadata.context.cache.test;
 
-import org.jboss.metadata.plugins.context.CachingMetaDataContext;
 import org.jboss.metadata.plugins.cache.CacheFactory;
 import org.jboss.metadata.plugins.cache.JBossCacheCacheFactory;
-import org.jboss.metadata.spi.loader.MetaDataLoader;
 
 /**
  * CacheContextWithFactoryBasicMetaDataUnitTestCase.
@@ -38,13 +36,8 @@
       super(name);
    }
 
-   protected CachingMetaDataContext createContext(MetaDataLoader loader)
+   protected CacheFactory createFactory()
    {
-      return new CachingMetaDataContext(null, loader, getFactory());
-   }
-
-   protected CacheFactory getFactory()
-   {
       return new JBossCacheCacheFactory();
    }
 }
\ No newline at end of file

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheMetaDataContextWithFactoryAnnotationUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheMetaDataContextWithFactoryAnnotationUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheMetaDataContextWithFactoryAnnotationUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -36,7 +36,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new JBossCacheCacheFactory();
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheMetaDataContextWithFactoryMetaDataUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheMetaDataContextWithFactoryMetaDataUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheMetaDataContextWithFactoryMetaDataUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -36,7 +36,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new JBossCacheCacheFactory();
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheParentContextWithFactoryBasicAnnotationsUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheParentContextWithFactoryBasicAnnotationsUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheParentContextWithFactoryBasicAnnotationsUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -36,7 +36,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new JBossCacheCacheFactory();
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheParentContextWithFactoryBasicMetaDataUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheParentContextWithFactoryBasicMetaDataUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCCacheParentContextWithFactoryBasicMetaDataUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -36,7 +36,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new JBossCacheCacheFactory();
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCSimpleCacheMetaDataContextWithFactoryUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCSimpleCacheMetaDataContextWithFactoryUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCSimpleCacheMetaDataContextWithFactoryUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -36,7 +36,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new JBossCacheCacheFactory();
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCSimpleCacheParentMetaDataContextWithFactoryUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCSimpleCacheParentMetaDataContextWithFactoryUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/JBCSimpleCacheParentMetaDataContextWithFactoryUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -36,7 +36,7 @@
       super(name);
    }
 
-   protected CacheFactory getFactory()
+   protected CacheFactory createFactory()
    {
       return new JBossCacheCacheFactory();
    }

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheMetaDataContextWithFactoryUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheMetaDataContextWithFactoryUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheMetaDataContextWithFactoryUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -35,6 +35,8 @@
  */
 public abstract class SimpleCacheMetaDataContextWithFactoryUnitTestCase extends SimpleCacheMetaDataContextUnitTestCase
 {
+   private CacheFactory factory;
+
    public SimpleCacheMetaDataContextWithFactoryUnitTestCase(String name)
    {
       super(name);
@@ -45,5 +47,12 @@
       return new CachingMetaDataContext(parent, retrievals, getFactory());
    }
 
-   protected abstract CacheFactory getFactory();
+   private CacheFactory getFactory()
+   {
+      if (factory == null)
+         factory = createFactory();
+      return factory;
+   }
+
+   protected abstract CacheFactory createFactory();
 }
\ No newline at end of file

Modified: projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheParentMetaDataContextWithFactoryUnitTestCase.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheParentMetaDataContextWithFactoryUnitTestCase.java	2008-07-03 09:11:31 UTC (rev 75337)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/metadata/context/cache/test/SimpleCacheParentMetaDataContextWithFactoryUnitTestCase.java	2008-07-03 09:33:29 UTC (rev 75338)
@@ -35,6 +35,8 @@
  */
 public abstract class SimpleCacheParentMetaDataContextWithFactoryUnitTestCase extends SimpleCacheParentMetaDataContextUnitTestCase
 {
+   private CacheFactory factory;
+
    public SimpleCacheParentMetaDataContextWithFactoryUnitTestCase(String name)
    {
       super(name);
@@ -45,5 +47,12 @@
       return new CachingMetaDataContext(parent, retrievals, getFactory());
    }
 
-   protected abstract CacheFactory getFactory();
+   private CacheFactory getFactory()
+   {
+      if (factory == null)
+         factory = createFactory();
+      return factory;
+   }
+
+   protected abstract CacheFactory createFactory();
 }
\ No newline at end of file




More information about the jboss-cvs-commits mailing list