[jboss-cvs] JBoss Messaging SVN: r1873 - branches/Branch_Bisocket_Experiment/tests/src/org/jboss/test/messaging/jms

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

Author: ron_sigal
Date: 2006-12-30 02:21:18 -0500 (Sat, 30 Dec 2006)
New Revision: 1873

Modified:
   branches/Branch_Bisocket_Experiment/tests/src/org/jboss/test/messaging/jms/RemotingConnectionConfigurationTest.java
Log:
JBMESSAGING-694:  Extended test and added support for bisocket transport.

Modified: branches/Branch_Bisocket_Experiment/tests/src/org/jboss/test/messaging/jms/RemotingConnectionConfigurationTest.java
===================================================================
--- branches/Branch_Bisocket_Experiment/tests/src/org/jboss/test/messaging/jms/RemotingConnectionConfigurationTest.java	2006-12-30 07:20:34 UTC (rev 1872)
+++ branches/Branch_Bisocket_Experiment/tests/src/org/jboss/test/messaging/jms/RemotingConnectionConfigurationTest.java	2006-12-30 07:21:18 UTC (rev 1873)
@@ -152,12 +152,18 @@
 
       try
       {
+         String address = InetAddress.getLocalHost().getHostAddress();
+         System.setProperty("jboss.messaging.callback.bind.address", address);
+         log.info("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 +176,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 +188,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))
@@ -193,8 +203,11 @@
 
             field = CallbackPoller.class.getDeclaredField("pollPeriod");
             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
          {