[exo-jcr-commits] exo-jcr SVN: r784 - in jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage: jbosscache and 1 other directory.

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2009-11-20 04:48:12 -0500 (Fri, 20 Nov 2009)
New Revision: 784

Modified:
   jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCWorkspaceDataContainerTestBase.java
   jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java
Log:
EXOJCR-203 : The test JDBCCacheLoaderTest was fixed.

Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCWorkspaceDataContainerTestBase.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCWorkspaceDataContainerTestBase.java	2009-11-20 08:28:44 UTC (rev 783)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCWorkspaceDataContainerTestBase.java	2009-11-20 09:48:12 UTC (rev 784)
@@ -72,7 +72,7 @@
       System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.exoplatform.services.naming.SimpleContextFactory");
 
       // Create data source. Will be created new data source to new test. 
-      String dataSourceName = "jdbcjcr_" + IdGenerator.generate();
+      String dataSourceName = getDataSourceName();
       createNewDataSource(dataSourceName);
 
       WorkspaceEntry ws =
@@ -86,6 +86,10 @@
 
       persistentContainer = new JDBCWorkspaceDataContainer(ws, re, null, valueStoragePluginProvider);
    }
+   
+   protected String getDataSourceName() {
+      return "jdbcjcr_" + IdGenerator.generate();
+   } 
 
    protected WorkspaceEntry getNewWs(String wsName, boolean isMultiDb, String dsName, String vsPath, ContainerEntry entry)
       throws Exception

Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java	2009-11-20 08:28:44 UTC (rev 783)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java	2009-11-20 09:48:12 UTC (rev 784)
@@ -56,8 +56,6 @@
 public class JDBCCacheLoaderTest extends AbstractCacheLoaderTest
 {
 
-   private JDBCWorkspaceDataContainer persistentContainer;
-
    private JDBCCacheLoader loader;
 
    /**