[jbosscache-commits] JBoss Cache SVN: r7447 - in core/trunk/src/test: resources and 1 other directory.
Author: mircea.markus
Date: 2009-01-10 22:49:45 -0500 (Sat, 10 Jan 2009)
New Revision: 7447
Modified:
core/trunk/src/test/java/org/jboss/cache/ResourceCleanupTest.java
core/trunk/src/test/resources/unit-test-cache-service.xml
Log:
revert to TCPPING
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:25:15
UTC (rev 7446)
+++ core/trunk/src/test/java/org/jboss/cache/ResourceCleanupTest.java 2009-01-11 03:49:45
UTC (rev 7447)
@@ -3,19 +3,16 @@
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;
/**
- * Make sure that all files are being deleted after each test run.
+ * Make sure that all files are being deleted after each test run.
*
* @author Mircea.Markus(a)jboss.com
*/
public class ResourceCleanupTest
{
- private GossipRouter router;
-
@BeforeSuite
public void removeTempDir()
{
@@ -28,7 +25,7 @@
}
else
{
- System.out.println("Successfully removed folder: '" +
TestingUtil.TEST_FILES + "'");
+ System.out.println("Successfully removed folder: '" +
TestingUtil.TEST_FILES + "'");
}
}
@@ -52,17 +49,8 @@
System.out.println("~~~~~~~~~~~~~~~~~~~~~~~~~ ENVIRONMENT INFO
~~~~~~~~~~~~~~~~~~~~~~~~~~");
}
-
- @BeforeSuite
- public void startGossipRouter() throws Exception
+ public static void main(String[] args)
{
- router = new GossipRouter(12000, "localhost");
- router.start();
+ System.out.println("System.getProperties() = " +
System.getProperties());
}
-
- @AfterSuite
- public void stopRouter() throws Exception
- {
- router.stop();
- }
}
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:25:15 UTC (rev
7446)
+++ core/trunk/src/test/resources/unit-test-cache-service.xml 2009-01-11 03:49:45 UTC (rev
7447)
@@ -210,8 +210,11 @@
oob_thread_pool.queue_max_size="100"
oob_thread_pool.rejection_policy="run"/>
- <TCPGOSSIP timeout="3000"
initial_hosts="127.0.0.1[12000]" num_initial_members="2"/>
- <MERGE2 max_interval="100000"
+ <TCPPING timeout="3000"
+ initial_hosts="127.0.0.1[7800]"
+ port_range="2"
+ num_initial_members="1"/>
+ <MERGE2 max_interval="100000"
min_interval="20000"/>
<FD_SOCK/>
<!--
@@ -277,7 +280,10 @@
oob_thread_pool.queue_max_size="100"
oob_thread_pool.rejection_policy="run"/>
- <TCPGOSSIP timeout="3000"
initial_hosts="127.0.0.1[12000]" num_initial_members="2" />
+ <TCPPING timeout="3000"
+ initial_hosts="127.0.0.1[7800]"
+ port_range="1"
+ num_initial_members="1"/>
<MERGE2 max_interval="100000"
min_interval="20000"/>
<FD_SOCK/>