Author: pnedonosko Date: 2009-11-09 09:25:48 -0500 (Mon, 09 Nov 2009) New Revision: 512 Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java Log: EXOJCR-201: test for loader update Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java 2009-11-09 14:25:45 UTC (rev 511) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java 2009-11-09 14:25:48 UTC (rev 512) @@ -92,6 +92,8 @@ cache = new DefaultCacheFactory<Serializable, Object>().createCache(jbcConfig); + initJBC(); + // run cache cache.create(); cache.start(); @@ -110,6 +112,11 @@ { jbcConfig = "conf/standalone/test-jbosscache-config-jdbcloader.xml"; } + + protected void initJBC() + { + // empty here + } /** * {@inheritDoc} 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-09 14:25:45 UTC (rev 511) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-09 14:25:48 UTC (rev 512) @@ -14,7 +14,6 @@ import org.jboss.cache.factories.annotations.NonVolatile; import org.picocontainer.Startable; - public class JDBCCacheLoaderTest extends JBossCacheStorageConnectionTest { @@ -23,51 +22,41 @@ */ protected void setUp() throws Exception { - try { - - // JBossCache - initJBCConfig(); - - cache = new DefaultCacheFactory<Serializable, Object>().createCache(jbcConfig ,false); - - - - - WorkspaceDataContainer persistentContainer = new JDBCWorkspaceDataContainerTester(); - - ((CacheSPI<Serializable, Object>)cache).getComponentRegistry().registerComponent(persistentContainer, WorkspaceDataContainer.class); - - // run cache - cache.create(); - cache.start(); - - Node<Serializable, Object> cacheRoot = cache.getRoot(); - - // prepare cache structures - nodes = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.NODES)); - props = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.PROPS)); - - // JCR connection - conn = new JBossCacheStorageConnection(cache, nodes, props); - } catch (Exception e) { + try + { + super.setUp(); + } + catch (Exception e) + { e.printStackTrace(); throw e; } } - + + @Override + protected void initJBC() + { + WorkspaceDataContainer persistentContainer = new JDBCWorkspaceDataContainerTester(); + + ((CacheSPI<Serializable, Object>)cache).getComponentRegistry().registerComponent(persistentContainer, + WorkspaceDataContainer.class); + } + + @Override protected void initJBCConfig() { jbcConfig = "conf/standalone/test-jbosscache-config-exoloader.xml"; } - + public void testAddNode() throws Exception { super.testAddNode(); conn.commit(); } } + @NonVolatile -class JDBCWorkspaceDataContainerTester extends WorkspaceDataContainerBase implements Startable +class JDBCWorkspaceDataContainerTester extends WorkspaceDataContainerBase implements Startable { public JDBCWorkspaceDataContainerTester() @@ -77,13 +66,13 @@ public void start() { // TODO Auto-generated method stub - + } public void stop() { // TODO Auto-generated method stub - + } public boolean isSame(WorkspaceDataContainer another) @@ -127,7 +116,5 @@ // TODO Auto-generated method stub return null; } - - -} +}