[jbosscache-commits] JBoss Cache SVN: r7599 - in core/branches/flat/src: test/java/org/horizon/config/parsing and 1 other directory.

Author: manik.surtani(a)jboss.com Date: 2009-01-27 06:32:29 -0500 (Tue, 27 Jan 2009) New Revision: 7599 Added: core/branches/flat/src/test/java/org/horizon/config/parsing/XMLFileParsingTest.java Modified: core/branches/flat/src/main/java/org/horizon/config/Configuration.java core/branches/flat/src/test/java/org/horizon/config/parsing/ConfigurationParserTest.java core/branches/flat/src/test/java/org/horizon/config/parsing/XmlFileParsingTest.java Log: More parser tests Modified: core/branches/flat/src/main/java/org/horizon/config/Configuration.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/config/Configuration.java 2009-01-27 01:51:15 UTC (rev 7598) +++ core/branches/flat/src/main/java/org/horizon/config/Configuration.java 2009-01-27 11:32:29 UTC (rev 7599) @@ -131,7 +131,7 @@ private boolean inactiveOnStartup = false; @Dynamic private long stateRetrievalTimeout = 10000; - private IsolationLevel isolationLevel = IsolationLevel.REPEATABLE_READ; + private IsolationLevel isolationLevel = IsolationLevel.READ_COMMITTED; @Dynamic private boolean lockParentForChildInsertRemove = false; @Dynamic Modified: core/branches/flat/src/test/java/org/horizon/config/parsing/ConfigurationParserTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/config/parsing/ConfigurationParserTest.java 2009-01-27 01:51:15 UTC (rev 7598) +++ core/branches/flat/src/test/java/org/horizon/config/parsing/ConfigurationParserTest.java 2009-01-27 11:32:29 UTC (rev 7599) @@ -134,28 +134,6 @@ assert !c.isUseReplQueue(); } - /* - - <loaders passivation="true" shared="true" preload="true"> - <loader class="org.horizon.loader.JDBCCacheLoader" async="true" fetchPersistentState="true" - ignoreModifications="false" purgeOnStartup="false"> - <properties> - horizon.jdbc.datasource=HorizonDS - horizon.jdbc.table.name=horizon - horizon.jdbc.table.create=true - horizon.jdbc.table.drop=false - </properties> - <singletonStore enabled="true" class="org.horizon.loader.SingletonStoreCacheLoader"> - <properties> - horizon.singletonStore.pushStateWhenCoordinator=true - horizon.singletonStore.pushStateWhenCoordinatorTimeout=20000 - </properties> - </singletonStore> - </loader> - </loaders> - - */ - public void testCacheLoaders() throws Exception { XmlConfigurationParserImpl parser = new XmlConfigurationParserImpl(); String xml = "<loaders passivation=\"true\" shared=\"true\" preload=\"true\">\n" + Added: core/branches/flat/src/test/java/org/horizon/config/parsing/XMLFileParsingTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/config/parsing/XMLFileParsingTest.java (rev 0) +++ core/branches/flat/src/test/java/org/horizon/config/parsing/XMLFileParsingTest.java 2009-01-27 11:32:29 UTC (rev 7599) @@ -0,0 +1,164 @@ +package org.horizon.config.parsing; + +import org.horizon.config.Configuration; +import org.horizon.config.GlobalConfiguration; +import org.horizon.lock.IsolationLevel; +import org.testng.annotations.Test; + +import java.io.IOException; +import java.util.Map; + +@Test(groups = "unit") +public class XmlFileParsingTest { + public void testNamedCacheFile() throws IOException { + XmlConfigurationParser parser = new XmlConfigurationParserImpl("configs/named-cache-test.xml"); + + GlobalConfiguration gc = parser.parseGlobalConfiguration(); + + assert gc.getAsyncListenerExecutorFactoryClass().equals("org.horizon.executors.DefaultExecutorFactory"); + assert gc.getAsyncListenerExecutorProperties().getProperty("maxThreads").equals("5"); + assert gc.getAsyncListenerExecutorProperties().getProperty("threadNamePrefix").equals("AsyncListenerThread"); + + assert gc.getAsyncSerializationExecutorFactoryClass().equals("org.horizon.executors.DefaultExecutorFactory"); + assert gc.getAsyncSerializationExecutorProperties().getProperty("maxThreads").equals("25"); + assert gc.getAsyncSerializationExecutorProperties().getProperty("threadNamePrefix").equals("AsyncSerializationThread"); + + assert gc.getEvictionScheduledExecutorFactoryClass().equals("org.horizon.executors.DefaultScheduledExecutorFactory"); + assert gc.getEvictionScheduledExecutorProperties().getProperty("threadNamePrefix").equals("EvictionThread"); + + assert gc.getReplicationQueueScheduledExecutorFactoryClass().equals("org.horizon.executors.DefaultScheduledExecutorFactory"); + assert gc.getReplicationQueueScheduledExecutorProperties().getProperty("threadNamePrefix").equals("ReplicationQueueThread"); + + assert gc.getTransportClass().equals("org.horizon.remoting.transport.jgroups.JGroupsTransport"); + assert gc.getTransportProperties().isEmpty(); + + assert gc.getMarshallerClass().equals("org.horizon.marshall.VersionAwareMarshaller"); + assert gc.getMarshallVersionString().equals("1.0"); + assert gc.getObjectOutputStreamPoolSize() == 100; + assert gc.getObjectInputStreamPoolSize() == 100; + + Configuration defaultConfiguration = parser.parseDefaultConfiguration(); + + assert defaultConfiguration.getLockAcquisitionTimeout() == 1000; + assert defaultConfiguration.getConcurrencyLevel() == 100; + assert defaultConfiguration.getIsolationLevel() == IsolationLevel.READ_COMMITTED; + + Map<String, Configuration> namedCaches = parser.parseNamedConfigurations(); + + Configuration c = namedCaches.get("transactional"); + + assert c.getTransactionManagerLookupClass().equals("org.horizon.transaction.GenericTransactionManagerLookup"); + + c = namedCaches.get("syncRepl"); + + assert c.getCacheMode() == Configuration.CacheMode.REPL_SYNC; + assert c.isFetchInMemoryState(); + assert c.getStateRetrievalTimeout() == 15000; + assert c.getSyncReplTimeout() == 15000; + + c = namedCaches.get("asyncRepl"); + + assert c.getCacheMode() == Configuration.CacheMode.REPL_ASYNC; + assert !c.isUseReplQueue(); + assert !c.isUseAsyncSerialization(); + assert c.isFetchInMemoryState(); + assert c.getStateRetrievalTimeout() == 15000; + + c = namedCaches.get("asyncReplQueue"); + + assert c.getCacheMode() == Configuration.CacheMode.REPL_ASYNC; + assert c.isUseReplQueue(); + assert c.isUseAsyncSerialization(); + assert c.isFetchInMemoryState(); + assert c.getStateRetrievalTimeout() == 15000; + + c = namedCaches.get("txSyncRepl"); + + assert c.getTransactionManagerLookupClass().equals("org.horizon.transaction.GenericTransactionManagerLookup"); + assert c.getCacheMode() == Configuration.CacheMode.REPL_SYNC; + assert c.isFetchInMemoryState(); + assert c.getStateRetrievalTimeout() == 15000; + assert c.getSyncReplTimeout() == 15000; + + c = namedCaches.get("overriding"); + + assert c.getTransactionManagerLookupClass() == null; + assert c.getCacheMode() == Configuration.CacheMode.LOCAL; + assert c.getLockAcquisitionTimeout() == 20000; + assert c.getConcurrencyLevel() == 1000; + assert c.getIsolationLevel() == IsolationLevel.REPEATABLE_READ; + } + + public void testConfigurationMerging() throws IOException { + XmlConfigurationParser parser = new XmlConfigurationParserImpl("configs/named-cache-test.xml"); + Configuration defaultCfg = parser.parseDefaultConfiguration(); + Map<String, Configuration> namedCaches = parser.parseNamedConfigurations(); + + Configuration c = defaultCfg.clone(); + c.applyOverrides(namedCaches.get("transactional")); + + assert c.getCacheMode() == Configuration.CacheMode.LOCAL; + assert c.getTransactionManagerLookupClass().equals("org.horizon.transaction.GenericTransactionManagerLookup"); + assert c.getLockAcquisitionTimeout() == 1000; + assert c.getConcurrencyLevel() == 100; + assert c.getIsolationLevel() == IsolationLevel.READ_COMMITTED; + + c = defaultCfg.clone(); + c.applyOverrides(namedCaches.get("syncRepl")); + + assert c.getTransactionManagerLookupClass() == null; + assert c.getCacheMode() == Configuration.CacheMode.REPL_SYNC; + assert c.isFetchInMemoryState(); + assert c.getStateRetrievalTimeout() == 15000; + assert c.getSyncReplTimeout() == 15000; + assert c.getLockAcquisitionTimeout() == 1000; + assert c.getIsolationLevel() == IsolationLevel.READ_COMMITTED; + assert c.getConcurrencyLevel() == 100; + + c = defaultCfg.clone(); + c.applyOverrides(namedCaches.get("asyncRepl")); + + assert c.getTransactionManagerLookupClass() == null; + assert c.getCacheMode() == Configuration.CacheMode.REPL_ASYNC; + assert !c.isUseReplQueue(); + assert !c.isUseAsyncSerialization(); + assert c.isFetchInMemoryState(); + assert c.getStateRetrievalTimeout() == 15000; + assert c.getLockAcquisitionTimeout() == 1000; + assert c.getIsolationLevel() == IsolationLevel.READ_COMMITTED; + assert c.getConcurrencyLevel() == 100; + + c = defaultCfg.clone(); + c.applyOverrides(namedCaches.get("asyncReplQueue")); + + assert c.getTransactionManagerLookupClass() == null; + assert c.getCacheMode() == Configuration.CacheMode.REPL_ASYNC; + assert c.isUseReplQueue(); + assert c.isUseAsyncSerialization(); + assert c.isFetchInMemoryState(); + assert c.getStateRetrievalTimeout() == 15000; + assert c.getLockAcquisitionTimeout() == 1000; + assert c.getIsolationLevel() == IsolationLevel.READ_COMMITTED; + assert c.getConcurrencyLevel() == 100; + + c = defaultCfg.clone(); + c.applyOverrides(namedCaches.get("txSyncRepl")); + assert c.getTransactionManagerLookupClass().equals("org.horizon.transaction.GenericTransactionManagerLookup"); + assert c.getCacheMode() == Configuration.CacheMode.REPL_SYNC; + assert c.isFetchInMemoryState(); + assert c.getStateRetrievalTimeout() == 15000; + assert c.getSyncReplTimeout() == 15000; + assert c.getLockAcquisitionTimeout() == 1000; + assert c.getIsolationLevel() == IsolationLevel.READ_COMMITTED; + assert c.getConcurrencyLevel() == 100; + + c = defaultCfg.clone(); + c.applyOverrides(namedCaches.get("overriding")); + + assert c.getTransactionManagerLookupClass() == null; + assert c.getCacheMode() == Configuration.CacheMode.LOCAL; + assert c.getLockAcquisitionTimeout() == 20000; + assert c.getConcurrencyLevel() == 1000; + assert c.getIsolationLevel() == IsolationLevel.REPEATABLE_READ; + } +} Modified: core/branches/flat/src/test/java/org/horizon/config/parsing/XmlFileParsingTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/config/parsing/XmlFileParsingTest.java 2009-01-27 01:51:15 UTC (rev 7598) +++ core/branches/flat/src/test/java/org/horizon/config/parsing/XmlFileParsingTest.java 2009-01-27 11:32:29 UTC (rev 7599) @@ -2,6 +2,7 @@ import org.horizon.config.Configuration; import org.horizon.config.GlobalConfiguration; +import org.horizon.lock.IsolationLevel; import org.testng.annotations.Test; import java.io.IOException; @@ -40,6 +41,7 @@ assert defaultConfiguration.getLockAcquisitionTimeout() == 1000; assert defaultConfiguration.getConcurrencyLevel() == 100; + assert defaultConfiguration.getIsolationLevel() == IsolationLevel.READ_COMMITTED; Map<String, Configuration> namedCaches = parser.parseNamedConfigurations(); @@ -78,6 +80,85 @@ assert c.getStateRetrievalTimeout() == 15000; assert c.getSyncReplTimeout() == 15000; + c = namedCaches.get("overriding"); + assert c.getTransactionManagerLookupClass() == null; + assert c.getCacheMode() == Configuration.CacheMode.LOCAL; + assert c.getLockAcquisitionTimeout() == 20000; + assert c.getConcurrencyLevel() == 1000; + assert c.getIsolationLevel() == IsolationLevel.REPEATABLE_READ; } + + public void testConfigurationMerging() throws IOException { + XmlConfigurationParser parser = new XmlConfigurationParserImpl("configs/named-cache-test.xml"); + Configuration defaultCfg = parser.parseDefaultConfiguration(); + Map<String, Configuration> namedCaches = parser.parseNamedConfigurations(); + + Configuration c = defaultCfg.clone(); + c.applyOverrides(namedCaches.get("transactional")); + + assert c.getCacheMode() == Configuration.CacheMode.LOCAL; + assert c.getTransactionManagerLookupClass().equals("org.horizon.transaction.GenericTransactionManagerLookup"); + assert c.getLockAcquisitionTimeout() == 1000; + assert c.getConcurrencyLevel() == 100; + assert c.getIsolationLevel() == IsolationLevel.READ_COMMITTED; + + c = defaultCfg.clone(); + c.applyOverrides(namedCaches.get("syncRepl")); + + assert c.getTransactionManagerLookupClass() == null; + assert c.getCacheMode() == Configuration.CacheMode.REPL_SYNC; + assert c.isFetchInMemoryState(); + assert c.getStateRetrievalTimeout() == 15000; + assert c.getSyncReplTimeout() == 15000; + assert c.getLockAcquisitionTimeout() == 1000; + assert c.getIsolationLevel() == IsolationLevel.READ_COMMITTED; + assert c.getConcurrencyLevel() == 100; + + c = defaultCfg.clone(); + c.applyOverrides(namedCaches.get("asyncRepl")); + + assert c.getTransactionManagerLookupClass() == null; + assert c.getCacheMode() == Configuration.CacheMode.REPL_ASYNC; + assert !c.isUseReplQueue(); + assert !c.isUseAsyncSerialization(); + assert c.isFetchInMemoryState(); + assert c.getStateRetrievalTimeout() == 15000; + assert c.getLockAcquisitionTimeout() == 1000; + assert c.getIsolationLevel() == IsolationLevel.READ_COMMITTED; + assert c.getConcurrencyLevel() == 100; + + c = defaultCfg.clone(); + c.applyOverrides(namedCaches.get("asyncReplQueue")); + + assert c.getTransactionManagerLookupClass() == null; + assert c.getCacheMode() == Configuration.CacheMode.REPL_ASYNC; + assert c.isUseReplQueue(); + assert c.isUseAsyncSerialization(); + assert c.isFetchInMemoryState(); + assert c.getStateRetrievalTimeout() == 15000; + assert c.getLockAcquisitionTimeout() == 1000; + assert c.getIsolationLevel() == IsolationLevel.READ_COMMITTED; + assert c.getConcurrencyLevel() == 100; + + c = defaultCfg.clone(); + c.applyOverrides(namedCaches.get("txSyncRepl")); + assert c.getTransactionManagerLookupClass().equals("org.horizon.transaction.GenericTransactionManagerLookup"); + assert c.getCacheMode() == Configuration.CacheMode.REPL_SYNC; + assert c.isFetchInMemoryState(); + assert c.getStateRetrievalTimeout() == 15000; + assert c.getSyncReplTimeout() == 15000; + assert c.getLockAcquisitionTimeout() == 1000; + assert c.getIsolationLevel() == IsolationLevel.READ_COMMITTED; + assert c.getConcurrencyLevel() == 100; + + c = defaultCfg.clone(); + c.applyOverrides(namedCaches.get("overriding")); + + assert c.getTransactionManagerLookupClass() == null; + assert c.getCacheMode() == Configuration.CacheMode.LOCAL; + assert c.getLockAcquisitionTimeout() == 20000; + assert c.getConcurrencyLevel() == 1000; + assert c.getIsolationLevel() == IsolationLevel.REPEATABLE_READ; + } }