[jboss-cvs] JBoss Messaging SVN: r5973 - trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Mar 3 12:47:52 EST 2009


Author: jmesnil
Date: 2009-03-03 12:47:51 -0500 (Tue, 03 Mar 2009)
New Revision: 5973

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientCrashTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientTestBase.java
Log:
"fixed" ClientCrashTest & ClientExitTest

* removed connection and session assertions: the QUIT message must be properly implemented for these assertions to make sense

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientCrashTest.java	2009-03-03 17:44:23 UTC (rev 5972)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientCrashTest.java	2009-03-03 17:47:51 UTC (rev 5973)
@@ -88,62 +88,58 @@
 
    // Public --------------------------------------------------------
 
-//   public void testCrashClient() throws Exception
-//   {
-//      assertActiveConnections(0);
-//      
-//      // spawn a JVM that creates a JMS client, which waits to receive a test
-//      // message
-//      Process p = SpawnedVMSupport.spawnVM(CrashClient.class.getName());
-//      
-//      ClientSession session = sf.createSession(false, true, true);
-//      session.createQueue(QUEUE, QUEUE, null, false, false);
-//      ClientConsumer consumer = session.createConsumer(QUEUE);
-//      ClientProducer producer = session.createProducer(QUEUE);
-//      
-//      session.start();
-//      
-//      // send the message to the queue
-//      Message messageFromClient = consumer.receive(5000);
-//      assertNotNull("no message received", messageFromClient);
-//      assertEquals(MESSAGE_TEXT_FROM_CLIENT, messageFromClient.getBody().readString());
-//      
-//      assertActiveConnections(1 + 1); // One local and one from the other vm
-//      assertActiveSession(1 + 1);
-//      
-//      ClientMessage message = session.createClientMessage(JBossTextMessage.TYPE,
-//                                                          false,
-//                                                          0,
-//                                                          System.currentTimeMillis(),
-//                                                          (byte)1);
-//      message.getBody().writeString(ClientCrashTest.MESSAGE_TEXT_FROM_SERVER);
-//      producer.send(message);
-//      session.close();
-//
-//      Thread.sleep(1000);
-//      
-//      assertActiveConnections(1);
-//      assertActiveSession(1);      
-//
-//      log.debug("waiting for the client VM to crash ...");
-//      p.waitFor();
-//      
-//      assertEquals(9, p.exitValue());
-//      
-//      System.out.println("VM Exited");
-//
-//      assertActiveConnections(1);
-//      assertActiveSession(1);      
-//
-//      Thread.sleep(2 * PING_PERIOD + 2 * CONNECTION_TTL);
-//      // the crash must have been detected and the resources cleaned up
-//      assertActiveConnections(0);
-//      assertActiveSession(0);      
-//   }
-   
-   public void testfoo()
+   public void testCrashClient() throws Exception
    {
+      assertActiveConnections(0);
       
+      // spawn a JVM that creates a JMS client, which waits to receive a test
+      // message
+      Process p = SpawnedVMSupport.spawnVM(CrashClient.class.getName());
+      
+      ClientSession session = sf.createSession(false, true, true);
+      session.createQueue(QUEUE, QUEUE, null, false, false);
+      ClientConsumer consumer = session.createConsumer(QUEUE);
+      ClientProducer producer = session.createProducer(QUEUE);
+      
+      session.start();
+      
+      // send the message to the queue
+      Message messageFromClient = consumer.receive(5000);
+      assertNotNull("no message received", messageFromClient);
+      assertEquals(MESSAGE_TEXT_FROM_CLIENT, messageFromClient.getBody().readString());
+      
+      assertActiveConnections(1 + 1); // One local and one from the other vm
+      assertActiveSession(1 + 1);
+      
+      ClientMessage message = session.createClientMessage(JBossTextMessage.TYPE,
+                                                          false,
+                                                          0,
+                                                          System.currentTimeMillis(),
+                                                          (byte)1);
+      message.getBody().writeString(ClientCrashTest.MESSAGE_TEXT_FROM_SERVER);
+      producer.send(message);
+      
+      log.debug("waiting for the client VM to crash ...");
+      p.waitFor();
+      
+      assertEquals(9, p.exitValue());
+      
+      System.out.println("VM Exited");
+
+      Thread.sleep(1000);
+      
+      assertActiveConnections(1);
+      // FIXME https://jira.jboss.org/jira/browse/JBMESSAGING-1421
+      // assertActiveSession(1);      
+
+      session.close();
+
+      Thread.sleep(1000);
+
+      // the crash must have been detected and the resources cleaned up
+      assertActiveConnections(0);
+      // FIXME https://jira.jboss.org/jira/browse/JBMESSAGING-1421
+      // assertActiveSession(0);      
    }
 
    // Package protected ---------------------------------------------
@@ -153,28 +149,28 @@
    {
       super.setUp();
 
-//      sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.integration.transports.netty.NettyConnectorFactory"),
-//                                        null,
-//                                        DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
-//                                        PING_PERIOD,
-//                                        CONNECTION_TTL,
-//                                        DEFAULT_CALL_TIMEOUT,
-//                                        DEFAULT_CONSUMER_WINDOW_SIZE,
-//                                        DEFAULT_CONSUMER_MAX_RATE,
-//                                        DEFAULT_SEND_WINDOW_SIZE,
-//                                        DEFAULT_PRODUCER_MAX_RATE,
-//                                        DEFAULT_MIN_LARGE_MESSAGE_SIZE,
-//                                        DEFAULT_BLOCK_ON_ACKNOWLEDGE,
-//                                        DEFAULT_BLOCK_ON_PERSISTENT_SEND,
-//                                        DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
-//                                        DEFAULT_AUTO_GROUP,
-//                                        DEFAULT_MAX_CONNECTIONS,
-//                                        DEFAULT_PRE_ACKNOWLEDGE,
-//                                        DEFAULT_ACK_BATCH_SIZE,                                 
-//                                        DEFAULT_RETRY_INTERVAL,
-//                                        DEFAULT_RETRY_INTERVAL_MULTIPLIER,                                        
-//                                        DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
-//                                        DEFAULT_MAX_RETRIES_AFTER_FAILOVER);
+      sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.integration.transports.netty.NettyConnectorFactory"),
+                                        null,
+                                        DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
+                                        PING_PERIOD,
+                                        CONNECTION_TTL,
+                                        DEFAULT_CALL_TIMEOUT,
+                                        DEFAULT_CONSUMER_WINDOW_SIZE,
+                                        DEFAULT_CONSUMER_MAX_RATE,
+                                        DEFAULT_SEND_WINDOW_SIZE,
+                                        DEFAULT_PRODUCER_MAX_RATE,
+                                        DEFAULT_MIN_LARGE_MESSAGE_SIZE,
+                                        DEFAULT_BLOCK_ON_ACKNOWLEDGE,
+                                        DEFAULT_BLOCK_ON_PERSISTENT_SEND,
+                                        DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+                                        DEFAULT_AUTO_GROUP,
+                                        DEFAULT_MAX_CONNECTIONS,
+                                        DEFAULT_PRE_ACKNOWLEDGE,
+                                        DEFAULT_ACK_BATCH_SIZE,                                 
+                                        DEFAULT_RETRY_INTERVAL,
+                                        DEFAULT_RETRY_INTERVAL_MULTIPLIER,                                        
+                                        DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
+                                        DEFAULT_MAX_RETRIES_AFTER_FAILOVER);
 
    }
 

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java	2009-03-03 17:44:23 UTC (rev 5972)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java	2009-03-03 17:47:51 UTC (rev 5973)
@@ -69,40 +69,40 @@
 
    // Public ---------------------------------------------------------------------------------------
 
-//   public void testGracefulClientExit() throws Exception
-//   {
-//      // spawn a JVM that creates a JMS client, which sends a test message
-//      Process p = SpawnedVMSupport.spawnVM(GracefulClient.class.getName(), QUEUE.toString(), MESSAGE_TEXT);
-//
-//      // read the message from the queue
-//
-//      Message message = consumer.receive(15000);
-//
-//      assertNotNull(message);
-//      assertEquals(MESSAGE_TEXT, message.getBody().readString());
-//
-//      // the client VM should exit by itself. If it doesn't, that means we have a problem
-//      // and the test will timeout
-//      log.debug("waiting for the client VM to exit ...");
-//      p.waitFor();
-//
-//      assertEquals(0, p.exitValue());
+   public void testGracefulClientExit() throws Exception
+   {
+      // spawn a JVM that creates a JMS client, which sends a test message
+      Process p = SpawnedVMSupport.spawnVM(GracefulClient.class.getName(), QUEUE.toString(), MESSAGE_TEXT);
+
+      // read the message from the queue
+
+      Message message = consumer.receive(15000);
+
+      assertNotNull(message);
+      assertEquals(MESSAGE_TEXT, message.getBody().readString());
+
+      // the client VM should exit by itself. If it doesn't, that means we have a problem
+      // and the test will timeout
+      log.debug("waiting for the client VM to exit ...");
+      p.waitFor();
+
+      assertEquals(0, p.exitValue());
+      
+      // FIXME https://jira.jboss.org/jira/browse/JBMESSAGING-1421
+//      Thread.sleep(1000);
 //      
 //      // the local session
 //      assertActiveConnections(1);
-//      assertActiveSession(1);
-//      
-//      session.close();
-//      
+//      // assertActiveSession(1);
+      
+      session.close();
+      
+      // FIXME https://jira.jboss.org/jira/browse/JBMESSAGING-1421
 //      Thread.sleep(1000);
 //      assertActiveConnections(0);
-//      assertActiveSession(0);
-//   }
+//      // assertActiveSession(0);
+   }
    
-   public void testFoo()
-   {      
-   }
-
    // Package protected ----------------------------------------------------------------------------
 
    @Override
@@ -110,11 +110,11 @@
    {
       super.setUp();
       
-//      ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName()));
-//      session = sf.createSession(false, true, true);
-//      session.createQueue(QUEUE, QUEUE, null, false, false);
-//      consumer = session.createConsumer(QUEUE);
-//      session.start();
+      ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName()));
+      session = sf.createSession(false, true, true);
+      session.createQueue(QUEUE, QUEUE, null, false, false);
+      consumer = session.createConsumer(QUEUE);
+      session.start();
    }
 
    // Protected ------------------------------------------------------------------------------------

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientTestBase.java	2009-03-03 17:44:23 UTC (rev 5972)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientTestBase.java	2009-03-03 17:47:51 UTC (rev 5973)
@@ -58,30 +58,30 @@
    {
       super.setUp();
 
-//      Configuration config = createDefaultConfig(true);
-//      config.setSecurityEnabled(false);
-//      messagingService = createService(false, config);
-//      messagingService.start();
+      Configuration config = createDefaultConfig(true);
+      config.setSecurityEnabled(false);
+      messagingService = createService(false, config);
+      messagingService.start();
    }
 
    @Override
    protected void tearDown() throws Exception
    {
-     // messagingService.stop();
+      messagingService.stop();
 
       super.tearDown();
    }
    
-//   protected void assertActiveConnections(int expectedActiveConnections) throws Exception
-//   {
-//      assertEquals(expectedActiveConnections, messagingService.getServer().getServerManagement().getConnectionCount());
-//   }
-//
-//   protected void assertActiveSession(int expectedActiveSession) throws Exception
-//   {
-//      assertEquals(expectedActiveSession, messagingService.getServer().getSessions().size());
-//   }
+   protected void assertActiveConnections(int expectedActiveConnections) throws Exception
+   {
+      assertEquals(expectedActiveConnections, messagingService.getServer().getServerManagement().getConnectionCount());
+   }
 
+   protected void assertActiveSession(int expectedActiveSession) throws Exception
+   {
+      assertEquals(expectedActiveSession, messagingService.getServer().getSessions().size());
+   }
+
    // Private -------------------------------------------------------
 
    // Inner classes -------------------------------------------------




More information about the jboss-cvs-commits mailing list