[jboss-cvs] JBoss Messaging SVN: r2290 - branches/Branch_Bisocket_Experiment2/tests/src/org/jboss/test/messaging/jms.

[jboss-cvs-commits at lists.jboss.org]

Author: ron_sigal
Date: 2007-02-13 07:14:26 -0500 (Tue, 13 Feb 2007)
New Revision: 2290

Modified:
   branches/Branch_Bisocket_Experiment2/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
   branches/Branch_Bisocket_Experiment2/tests/src/org/jboss/test/messaging/jms/RemotingConnectionConfigurationTest.java
Log:
Integrated bisocket transport.

Modified: branches/Branch_Bisocket_Experiment2/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
===================================================================
--- branches/Branch_Bisocket_Experiment2/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java	2007-02-13 12:13:44 UTC (rev 2289)
+++ branches/Branch_Bisocket_Experiment2/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java	2007-02-13 12:14:26 UTC (rev 2290)
@@ -1386,6 +1386,7 @@
          sessReceive.commit();
 
          cons.close();
+         connReceive.close();
 
 
          connReceive = cf.createConnection();
@@ -2130,7 +2131,8 @@
    public void testTwoConsumersNonTransacted() throws Exception
    {
 
-      consumerSession.close();
+//      consumerSession.close();
+      consumerConnection.close();
 
       TextMessage tm = producerSession.createTextMessage();
       tm.setText("One");
@@ -2164,7 +2166,8 @@
    public void testTwoConsumersTransacted() throws Exception
    {
 
-      consumerSession.close();
+//      consumerSession.close();
+      consumerConnection.close();
 
       TextMessage tm = producerSession.createTextMessage();
       tm.setText("One");

Modified: branches/Branch_Bisocket_Experiment2/tests/src/org/jboss/test/messaging/jms/RemotingConnectionConfigurationTest.java
===================================================================
--- branches/Branch_Bisocket_Experiment2/tests/src/org/jboss/test/messaging/jms/RemotingConnectionConfigurationTest.java	2007-02-13 12:13:44 UTC (rev 2289)
+++ branches/Branch_Bisocket_Experiment2/tests/src/org/jboss/test/messaging/jms/RemotingConnectionConfigurationTest.java	2007-02-13 12:14:26 UTC (rev 2290)
@@ -152,12 +152,17 @@
 
       try
       {
+         String address = InetAddress.getLocalHost().getHostAddress();
+         System.setProperty("jboss.messaging.callback.bind.address", address);
+         
          int freePort = PortUtil.findFreePort(InetAddress.getLocalHost().getHostName());
          System.setProperty("jboss.messaging.callback.bind.port", Integer.toString(freePort));
 
          String pollPeriod = "654";
          System.setProperty("jboss.messaging.callback.pollPeriod", pollPeriod);
 
+         System.setProperty("jboss.messaging.callback.reportPollingStatistics", "true");
+         
          connection = (JBossConnection)cf.createConnection();
          connection.start();
 
@@ -170,7 +175,10 @@
          InvokerLocator locator = (InvokerLocator)field.get(remotingConnection);
          String transport = locator.getProtocol();
 
-         if ("socket".equals(transport))
+         if ("socket".equals(transport)
+               || "sslsocket".equals(transport)
+               || "bisocket".equals(transport)
+               || "sslbisocket".equals(transport))
          {
             field = Client.class.getDeclaredField("callbackConnectors");
             field.setAccessible(true);
@@ -179,6 +187,7 @@
             InvokerCallbackHandler callbackHandler = remotingConnection.getCallbackManager();
             Connector connector = (Connector)callbackConnectors.get(callbackHandler);
             locator = new InvokerLocator(connector.getInvokerLocator());
+            assertEquals(address, locator.getHost());
             assertEquals(freePort, locator.getPort());
          }
          else if ("http".equals(transport))
@@ -195,6 +204,10 @@
             field.setAccessible(true);
 
             assertEquals(pollPeriod, ((Long)field.get(callbackPoller)).toString());
+            
+            field = CallbackPoller.class.getDeclaredField("reportStatistics");
+            field.setAccessible(true);
+            assertEquals(true, ((Boolean) field.get(callbackPoller)).booleanValue());
          }
          else
          {