[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/bisocket ...
Ron Sigal
ron_sigal at yahoo.com
Tue Dec 19 01:13:07 EST 2006
User: rsigal
Date: 06/12/19 01:13:07
Modified: src/tests/org/jboss/test/remoting/transport/bisocket Tag:
remoting_2_x BisocketTestCase.java
Log:
JBREM-650: (1) Added getTransport(), addExtraClientConfig(), addExtraServerConfig(). (2) Used Bisocket.IS_CALLBACK_SERVER.
Revision Changes Path
No revision
No revision
1.1.2.2 +76 -63 JBossRemoting/src/tests/org/jboss/test/remoting/transport/bisocket/Attic/BisocketTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BisocketTestCase.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/bisocket/Attic/BisocketTestCase.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- BisocketTestCase.java 14 Dec 2006 01:08:02 -0000 1.1.2.1
+++ BisocketTestCase.java 19 Dec 2006 06:13:07 -0000 1.1.2.2
@@ -48,7 +48,6 @@
import org.jboss.remoting.callback.ServerInvokerCallbackHandler;
import org.jboss.remoting.transport.ClientInvoker;
import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.PortUtil;
import org.jboss.remoting.transport.bisocket.Bisocket;
import org.jboss.remoting.transport.bisocket.BisocketClientInvoker;
import org.jboss.remoting.transport.bisocket.BisocketServerInvoker;
@@ -56,7 +55,7 @@
/**
* @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1.2.1 $
+ * @version $Revision: 1.1.2.2 $
* <p>
* Copyright Nov 25, 2006
* </p>
@@ -87,14 +86,14 @@
*/
public void setUp() throws Exception
{
- String locatorURI = "bisocket://" + InetAddress.getLocalHost().getHostAddress() + ":" + port;
+ String locatorURI = getTransport() + "://" + InetAddress.getLocalHost().getHostAddress() + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
System.out.println("Starting remoting server with locator uri of: " + locatorURI);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
- config.put(Bisocket.START_SECONDARY_PORT, "true");
config.put(Bisocket.PING_FREQUENCY, TEST_PING_FREQUENCY_STRING);
config.put(MicroSocketClientInvoker.MAX_POOL_SIZE_FLAG, TEST_MAX_POOL_SIZE_STRING);
+ addExtraServerConfig(config);
connector = new Connector(serverLocator, config);
connector.create();
invocationHandler = new SampleInvocationHandler();
@@ -117,12 +116,12 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
log.info("client is connected");
@@ -146,12 +145,13 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
log.info("client is connected");
@@ -195,12 +195,13 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
log.info("client is connected");
@@ -231,12 +232,13 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
log.info("client is connected");
@@ -310,19 +312,19 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
assertTrue(client.getInvoker() instanceof BisocketClientInvoker);
log.info("client is connected");
- int freePort = PortUtil.findFreePort(host);
- String callbackLocatorURI = "bisocket://" + host + ":" + freePort;
+ String callbackLocatorURI = getTransport() + "://" + host + ":1";
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
Connector callbackConnector = new Connector(callbackLocatorURI, config);
callbackConnector.start();
DelayedCallbackHandler callbackHandler = new DelayedCallbackHandler();
@@ -365,19 +367,19 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
log.info("client is connected");
assertTrue(client.getInvoker() instanceof BisocketClientInvoker);
- int freePort = PortUtil.findFreePort(host);
- String callbackLocatorURI = "bisocket://" + host + ":" + freePort;
+ String callbackLocatorURI = getTransport() + "://" + host + ":1";
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
Connector callbackConnector = new Connector(callbackLocatorURI, config);
callbackConnector.start();
@@ -471,24 +473,22 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
assertTrue(client.getInvoker() instanceof BisocketClientInvoker);
log.info("client is connected");
- int freePort = PortUtil.findFreePort(host);
- String callbackLocatorURI1 = "bisocket://" + host + ":" + freePort;
- config.put(Bisocket.START_SECONDARY_PORT, "true");
+ String callbackLocatorURI1 = getTransport() + "://" + host + ":1";
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
Connector callbackConnector1 = new Connector(callbackLocatorURI1, config);
callbackConnector1.start();
- freePort = PortUtil.findFreePort(host);
- String callbackLocatorURI2 = "bisocket://" + host + ":" + freePort;
+ String callbackLocatorURI2 = getTransport() + "://" + host + ":2";
Connector callbackConnector2 = new Connector(callbackLocatorURI2, config);
callbackConnector2.start();
@@ -554,24 +554,22 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
log.info("client is connected");
assertTrue(client.getInvoker() instanceof BisocketClientInvoker);
- int freePort = PortUtil.findFreePort(host);
- String callbackLocatorURI1 = "bisocket://" + host + ":" + freePort;
- config.put(Bisocket.START_SECONDARY_PORT, "true");
+ String callbackLocatorURI1 = getTransport() + "://" + host + ":1";
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
Connector callbackConnector1 = new Connector(callbackLocatorURI1, config);
callbackConnector1.start();
- freePort = PortUtil.findFreePort(host);
- String callbackLocatorURI2 = "bisocket://" + host + ":" + freePort;
+ String callbackLocatorURI2 = getTransport() + "://" + host + ":2";
Connector callbackConnector2 = new Connector(callbackLocatorURI2, config);
callbackConnector2.start();
@@ -668,12 +666,12 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(config);
Client client1 = new Client(serverLocator, config);
client1.connect();
Client client2 = new Client(serverLocator, config);
@@ -682,8 +680,8 @@
assertTrue(client1.getInvoker() instanceof BisocketClientInvoker);
assertTrue(client2.getInvoker() instanceof BisocketClientInvoker);
- int freePort = PortUtil.findFreePort(host);
- String callbackLocatorURI = "bisocket://" + host + ":" + freePort;
+ String callbackLocatorURI = getTransport() + "://" + host + ":1";
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
Connector callbackConnector = new Connector(callbackLocatorURI, config);
callbackConnector.start();
@@ -737,20 +735,19 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
log.info("client is connected");
assertTrue(client.getInvoker() instanceof BisocketClientInvoker);
- int freePort = PortUtil.findFreePort(host);
- String callbackLocatorURI = "bisocket://" + host + ":" + freePort;
- config.put(Bisocket.START_SECONDARY_PORT, "true");
+ String callbackLocatorURI = getTransport() + "://" + host + ":1";
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
Connector callbackConnector = new Connector(callbackLocatorURI, config);
callbackConnector.start();
@@ -842,12 +839,12 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(config);
Client client1 = new Client(serverLocator, config);
client1.connect();
Client client2 = new Client(serverLocator, config);
@@ -856,13 +853,11 @@
assertTrue(client1.getInvoker() instanceof BisocketClientInvoker);
assertTrue(client2.getInvoker() instanceof BisocketClientInvoker);
- int freePort = PortUtil.findFreePort(host);
- String callbackLocatorURI1 = "bisocket://" + host + ":" + freePort;
- config.put(Bisocket.START_SECONDARY_PORT, "true");
+ String callbackLocatorURI1 = getTransport() + "://" + host + ":1";
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
Connector callbackConnector1 = new Connector(callbackLocatorURI1, config);
callbackConnector1.start();
- freePort = PortUtil.findFreePort(host);
- String callbackLocatorURI2 = "bisocket://" + host + ":" + freePort;
+ String callbackLocatorURI2 = getTransport() + "://" + host + ":2";
Connector callbackConnector2 = new Connector(callbackLocatorURI2, config);
callbackConnector2.start();
@@ -943,24 +938,22 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
log.info("client is connected");
assertTrue(client.getInvoker() instanceof BisocketClientInvoker);
- int freePort = PortUtil.findFreePort(host);
- String callbackLocatorURI1 = "bisocket://" + host + ":" + freePort;
- config.put(Bisocket.START_SECONDARY_PORT, "true");
+ String callbackLocatorURI1 = getTransport() + "://" + host + ":1";
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
Connector callbackConnector1 = new Connector(callbackLocatorURI1, config);
callbackConnector1.start();
- freePort = PortUtil.findFreePort(host);
- String callbackLocatorURI2 = "bisocket://" + host + ":" + freePort;
+ String callbackLocatorURI2 = getTransport() + "://" + host + ":2";
Connector callbackConnector2 = new Connector(callbackLocatorURI2, config);
callbackConnector2.start();
@@ -1054,13 +1047,14 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
config.put(Bisocket.PING_FREQUENCY, TEST_PING_FREQUENCY_STRING);
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
log.info("client is connected");
@@ -1120,13 +1114,14 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
config.put(Bisocket.PING_FREQUENCY, TEST_PING_FREQUENCY_STRING);
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
log.info("client is connected");
@@ -1166,13 +1161,14 @@
{
log.info("entering " + getName());
String host = InetAddress.getLocalHost().getHostName();
- int port = BisocketPerformanceTestServer.port;
- String locatorURI = "bisocket://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + port;
InvokerLocator serverLocator = new InvokerLocator(locatorURI);
log.info("Connecting to: " + serverLocator);
HashMap config = new HashMap();
config.put(InvokerLocator.FORCE_REMOTE, "true");
+ config.put(Bisocket.IS_CALLBACK_SERVER, "true");
config.put(Bisocket.PING_FREQUENCY, TEST_PING_FREQUENCY_STRING);
+ addExtraClientConfig(config);
Client client = new Client(serverLocator, config);
client.connect();
log.info("client is connected");
@@ -1243,6 +1239,23 @@
}
}
+
+ protected String getTransport()
+ {
+ return "bisocket";
+ }
+
+
+ protected void addExtraClientConfig(Map config)
+ {
+ }
+
+
+ protected void addExtraServerConfig(Map config)
+ {
+ }
+
+
/**
* Simple invocation handler implementation. When callback client's are registered, will
* generate callbacks periodically.
More information about the jboss-cvs-commits
mailing list