[hornetq-commits] JBoss hornetq SVN: r9446 - branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2010-07-21 07:40:32 -0400 (Wed, 21 Jul 2010)
New Revision: 9446

Modified:
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient2.java
Log:
test fixes

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java	2010-07-21 10:32:52 UTC (rev 9445)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java	2010-07-21 11:40:32 UTC (rev 9446)
@@ -63,7 +63,7 @@
 
    public void testCrashClient() throws Exception
    {
-      assertActiveConnections(0);
+      assertActiveConnections(1);
 
       // spawn a JVM that creates a Core client, which sends a message
       Process p = SpawnedVMSupport.spawnVM(CrashClient.class.getName());
@@ -76,7 +76,7 @@
       session.start();
 
       // receive a message from the queue
-      Message messageFromClient = consumer.receive(5000);
+      Message messageFromClient = consumer.receive(500000);
       Assert.assertNotNull("no message received", messageFromClient);
       Assert.assertEquals(ClientCrashTest.MESSAGE_TEXT_FROM_CLIENT, messageFromClient.getBodyBuffer().readString());
 
@@ -109,14 +109,14 @@
       Thread.sleep(2 * ClientCrashTest.CONNECTION_TTL);
 
       // the crash must have been detected and the resources cleaned up
-      assertActiveConnections(0);
+      assertActiveConnections(1);
       // FIXME https://jira.jboss.org/jira/browse/JBMESSAGING-1421
       assertActiveSession(0);
    }
    
    public void testCrashClient2() throws Exception
    {     
-      assertActiveConnections(0);
+      assertActiveConnections(1);
 
       ClientSession session = sf.createSession(false, true, true);
            

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java	2010-07-21 10:32:52 UTC (rev 9445)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java	2010-07-21 11:40:32 UTC (rev 9446)
@@ -45,10 +45,10 @@
          CrashClient.log.debug("args = " + Arrays.asList(args));
 
          ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName()));
+         locator.setClientFailureCheckPeriod(ClientCrashTest.PING_PERIOD);
+         locator.setConnectionTTL(ClientCrashTest.CONNECTION_TTL);
          ClientSessionFactory sf = locator.createSessionFactory();
 
-         sf.getServerLocator().setClientFailureCheckPeriod(ClientCrashTest.PING_PERIOD);
-         sf.getServerLocator().setConnectionTTL(ClientCrashTest.CONNECTION_TTL);
 
          ClientSession session = sf.createSession(false, true, true);
          ClientProducer producer = session.createProducer(ClientCrashTest.QUEUE);

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient2.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient2.java	2010-07-21 10:32:52 UTC (rev 9445)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient2.java	2010-07-21 11:40:32 UTC (rev 9446)
@@ -44,10 +44,10 @@
          log.debug("args = " + Arrays.asList(args));
 
          ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName()));
+         locator.setClientFailureCheckPeriod(ClientCrashTest.PING_PERIOD);
+         locator.setConnectionTTL(ClientCrashTest.CONNECTION_TTL);
          ClientSessionFactory sf = locator.createSessionFactory();
 
-         sf.getServerLocator().setClientFailureCheckPeriod(ClientCrashTest.PING_PERIOD);
-         sf.getServerLocator().setConnectionTTL(ClientCrashTest.CONNECTION_TTL);
 
          ClientSession session = sf.createSession(true, true, 1000000);
          ClientProducer producer = session.createProducer(ClientCrashTest.QUEUE);