[jboss-cvs] JBoss Messaging SVN: r2142 - in trunk: tests/src/org/jboss/test/thirdparty/remoting and 1 other directory.

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

Author: ovidiu.feodorov at jboss.com
Date: 2007-02-02 06:24:06 -0500 (Fri, 02 Feb 2007)
New Revision: 2142

Modified:
   trunk/lib/jboss-remoting.jar
   trunk/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/PureAsynchronousCallTest.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/SocketTransportCausalityTest.java
Log:
modified thirdparty remoting tests to use a purely remoting configuration, with no interference from JBM

Modified: trunk/lib/jboss-remoting.jar
===================================================================
(Binary files differ)

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java	2007-02-02 09:45:42 UTC (rev 2141)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java	2007-02-02 11:24:06 UTC (rev 2142)
@@ -181,9 +181,6 @@
       }
    }
 
-
-
-
    // Package protected ----------------------------------------------------------------------------
 
    // Protected ------------------------------------------------------------------------------------

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/PureAsynchronousCallTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/PureAsynchronousCallTest.java	2007-02-02 09:45:42 UTC (rev 2141)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/PureAsynchronousCallTest.java	2007-02-02 11:24:06 UTC (rev 2142)
@@ -9,12 +9,14 @@
 import org.jboss.test.messaging.MessagingTestCase;
 import org.jboss.test.messaging.tools.ServerManagement;
 import org.jboss.test.messaging.tools.jmx.ServiceContainer;
+import org.jboss.test.messaging.tools.jmx.ServiceAttributeOverrides;
 import org.jboss.test.thirdparty.remoting.util.OnewayCallbackTrigger;
 import org.jboss.test.thirdparty.remoting.util.RemotingTestSubsystemService;
 import org.jboss.logging.Logger;
 import org.jboss.remoting.InvokerLocator;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.transport.PortUtil;
 import org.jboss.remoting.callback.InvokerCallbackHandler;
 import org.jboss.remoting.callback.Callback;
 import org.jboss.remoting.callback.HandleCallbackException;
@@ -189,8 +191,16 @@
    {
       super.setUp();
 
-      ServerManagement.start(0, "remoting", null, true, false);
+      // start "raw" remoting, don't use JBM configuration
 
+      String addr = ServiceContainer.getCurrentAddress();
+      int port = PortUtil.findFreePort(addr);
+      String serviceLocatorString = "socket://" + addr + ":" + port ;
+      ServiceAttributeOverrides sao = new ServiceAttributeOverrides();
+      sao.put(ServiceContainer.REMOTING_OBJECT_NAME, "LocatorURI", serviceLocatorString);
+
+      ServerManagement.start(0, "remoting", sao, true, false);
+
       String s = (String)ServerManagement.
          getAttribute(ServiceContainer.REMOTING_OBJECT_NAME, "InvokerLocator");
 

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/SocketTransportCausalityTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/SocketTransportCausalityTest.java	2007-02-02 09:45:42 UTC (rev 2141)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/SocketTransportCausalityTest.java	2007-02-02 11:24:06 UTC (rev 2142)
@@ -13,9 +13,11 @@
 import org.jboss.logging.Logger;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.transport.PortUtil;
 import org.jboss.test.messaging.MessagingTestCase;
 import org.jboss.test.messaging.tools.ServerManagement;
 import org.jboss.test.messaging.tools.jmx.ServiceContainer;
+import org.jboss.test.messaging.tools.jmx.ServiceAttributeOverrides;
 import org.jboss.test.thirdparty.remoting.util.RemotingTestSubsystemService;
 
 /**
@@ -76,9 +78,7 @@
 
             client.connect();
             
-            Sender sender = new Sender(NUM_INVOCATIONS, client, i);
-            
-            threads[i] = sender;
+            threads[i] = new Sender(NUM_INVOCATIONS, client, i);
          }
          
          for (int i = 0; i < NUM_THREADS; i++)
@@ -194,8 +194,20 @@
    {
       super.setUp();
 
-      ServerManagement.start(0, "remoting", null, true, false);
+      // start "raw" remoting, don't use JBM configuration, with one exception: make sure the
+      // server uses DirectThreadPool
 
+      String addr = ServiceContainer.getCurrentAddress();
+      int port = PortUtil.findFreePort(addr);
+
+      String serviceLocatorString = "socket://" + addr + ":" + port +
+         "/?onewayThreadPool=org.jboss.jms.server.remoting.DirectThreadPool";
+
+      ServiceAttributeOverrides sao = new ServiceAttributeOverrides();
+      sao.put(ServiceContainer.REMOTING_OBJECT_NAME, "LocatorURI", serviceLocatorString);
+
+      ServerManagement.start(0, "remoting", sao, true, false);
+
       String s = (String)ServerManagement.
          getAttribute(ServiceContainer.REMOTING_OBJECT_NAME, "InvokerLocator");