[jbosscache-commits] JBoss Cache SVN: r7444 - in core/trunk/src/test: java/org/jboss/cache/util/internals/replicationlisteners and 2 other directories.

Author: mircea.markus Date: 2009-01-10 22:11:46 -0500 (Sat, 10 Jan 2009) New Revision: 7444 Modified: core/trunk/src/test/java/org/jboss/cache/ResourceCleanupTest.java core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java core/trunk/src/test/resources/configs/integration/web-session-cache-configs.xml core/trunk/src/test/resources/unit-test-cache-service.xml Log: run tests on TCPGOSSIP Modified: core/trunk/src/test/java/org/jboss/cache/ResourceCleanupTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/ResourceCleanupTest.java 2009-01-11 03:08:46 UTC (rev 7443) +++ core/trunk/src/test/java/org/jboss/cache/ResourceCleanupTest.java 2009-01-11 03:11:46 UTC (rev 7444) @@ -3,6 +3,7 @@ import org.testng.annotations.BeforeSuite; import org.testng.annotations.AfterSuite; import org.jboss.cache.util.TestingUtil; +import org.jgroups.stack.GossipRouter; import java.io.File; @@ -13,6 +14,8 @@ */ public class ResourceCleanupTest { + private GossipRouter router; + @BeforeSuite public void removeTempDir() { @@ -49,8 +52,17 @@ System.out.println("~~~~~~~~~~~~~~~~~~~~~~~~~ ENVIRONMENT INFO ~~~~~~~~~~~~~~~~~~~~~~~~~~"); } - public static void main(String[] args) + + @BeforeSuite + public void startGossipRouter() throws Exception { - System.out.println("System.getProperties() = " + System.getProperties()); + router = new GossipRouter(12000, "localhost"); + router.start(); } + + @AfterSuite + public void stopRouter() throws Exception + { + router.stop(); + } } Modified: core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java 2009-01-11 03:08:46 UTC (rev 7443) +++ core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java 2009-01-11 03:11:46 UTC (rev 7444) @@ -14,6 +14,7 @@ import org.jboss.cache.config.parsing.XmlConfigurationParser2x; import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; +import org.jgroups.stack.GossipRouter; import java.io.IOException; import java.io.InputStream; @@ -62,7 +63,7 @@ @Override protected String initialValue() { - return uniqueAddr.getAndAdd(10) + ""; + return uniqueAddr.getAndAdd(50) + ""; } }; @@ -361,12 +362,15 @@ throw new IllegalStateException(); } - // replace mcast_port - pattern = Pattern.compile("initial_hosts=[^;]*"); - m = pattern.matcher(clusterConfig); - if (m.find()) + if (clusterConfig.indexOf("TCPGOSSIP") < 0) //onluy adjust for TCPPING { - clusterConfig = m.replaceFirst("initial_hosts=" + "127.0.0.1[" + newStartPort + "]"); + // replace mcast_port + pattern = Pattern.compile("initial_hosts=[^;]*"); + m = pattern.matcher(clusterConfig); + if (m.find()) + { + clusterConfig = m.replaceFirst("initial_hosts=" + "127.0.0.1[" + newStartPort + "]"); + } } return clusterConfig; @@ -412,4 +416,12 @@ } return null; } + + + public static void main(String[] args) throws Exception + { + GossipRouter router = new GossipRouter(12000, "localhost"); + router.start(); + + } } \ No newline at end of file Modified: core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java 2009-01-11 03:08:46 UTC (rev 7443) +++ core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java 2009-01-11 03:11:46 UTC (rev 7444) @@ -224,13 +224,21 @@ { realOne.setParameters(commandId, parameters); } + + @Override + public String toString() + { + return "ReplicableCommandDelegate{" + + "realOne=" + realOne + + '}'; + } } protected void postNonVisitableExecution(ReplicableCommand realOne) { expectedCommands.remove(realOne.getClass()); } - + protected void postReplicateExecution(ReplicateCommand realOne) { Iterator<Class<? extends ReplicableCommand>> it = expectedCommands.iterator(); @@ -364,11 +372,17 @@ { if (this.expectedCommands == null) { + this.expectedCommands = new ArrayList<Class<? extends ReplicableCommand>>(); } this.expectedCommands.addAll(Arrays.asList(expectedCommands)); } + public void reset() + { + if (expectedCommands != null) expectedCommands.clear(); + } + protected boolean isRemoteCommand(Class clazz) { return clazz.equals(AnnounceBuddyPoolNameCommand.class) || clazz.equals(AssignToBuddyGroupCommand.class) || Modified: core/trunk/src/test/resources/configs/integration/web-session-cache-configs.xml =================================================================== --- core/trunk/src/test/resources/configs/integration/web-session-cache-configs.xml 2009-01-11 03:08:46 UTC (rev 7443) +++ core/trunk/src/test/resources/configs/integration/web-session-cache-configs.xml 2009-01-11 03:11:46 UTC (rev 7444) @@ -341,26 +341,26 @@ </attribute> <!-- Cache Loader for session passivation --> - <attribute name="CacheLoaderConfig"> - <config> - <passivation>true</passivation> - <shared>false</shared> + <!--<attribute name="CacheLoaderConfig">--> + <!--<config>--> + <!--<passivation>true</passivation>--> + <!--<shared>false</shared>--> - <purgeOnStartup>true</purgeOnStartup> + <!--<purgeOnStartup>true</purgeOnStartup>--> - <cacheloader> - <class>org.jboss.cache.loader.FileCacheLoader</class> - <properties> - location=${java.io.tmpdir}${/}session - </properties> - <async>false</async> - <fetchPersistentState>true</fetchPersistentState> - <ignoreModifications>false</ignoreModifications> - <checkCharacterPortability>false</checkCharacterPortability> - </cacheloader> + <!--<cacheloader>--> + <!--<class>org.jboss.cache.loader.FileCacheLoader</class>--> + <!--<properties>--> + <!--location=${java.io.tmpdir}${/}session--> + <!--</properties>--> + <!--<async>false</async>--> + <!--<fetchPersistentState>true</fetchPersistentState>--> + <!--<ignoreModifications>false</ignoreModifications>--> + <!--<checkCharacterPortability>false</checkCharacterPortability>--> + <!--</cacheloader>--> - </config> - </attribute> + <!--</config>--> + <!--</attribute>--> <!-- JBoss Cache eviction is not needed; webapp or SFSB container Modified: core/trunk/src/test/resources/unit-test-cache-service.xml =================================================================== --- core/trunk/src/test/resources/unit-test-cache-service.xml 2009-01-11 03:08:46 UTC (rev 7443) +++ core/trunk/src/test/resources/unit-test-cache-service.xml 2009-01-11 03:11:46 UTC (rev 7444) @@ -210,11 +210,8 @@ oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="run"/> - <TCPPING timeout="3000" - initial_hosts="127.0.0.1[7800]" - port_range="2" - num_initial_members="1"/> - <MERGE2 max_interval="100000" + <TCPGOSSIP timeout="3000" initial_hosts="127.0.0.1[12000]" num_initial_members="2"/> + <MERGE2 max_interval="100000" min_interval="20000"/> <FD_SOCK/> <!-- @@ -280,10 +277,7 @@ oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="run"/> - <TCPPING timeout="3000" - initial_hosts="127.0.0.1[7800]" - port_range="1" - num_initial_members="1"/> + <TCPGOSSIP timeout="3000" initial_hosts="127.0.0.1[12000]" num_initial_members="2" /> <MERGE2 max_interval="100000" min_interval="20000"/> <FD_SOCK/>