[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection ...
Ron Sigal
ron_sigal at yahoo.com
Tue Dec 19 01:27:08 EST 2006
User: rsigal
Date: 06/12/19 01:27:08
Modified: src/tests/org/jboss/test/remoting/transport/socket/connection
Tag: remoting_2_x
SocketConnectionCheckTestServer.java
SocketTestServer.java
SocketConnectionCheckTestClient.java
SocketTestClient.java
Log:
JBREM-650: Added getTransport(), and in some cases getPort(), to allow reusing tests with other transports.
Revision Changes Path
No revision
No revision
1.1.2.3 +11 -1 JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/SocketConnectionCheckTestServer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketConnectionCheckTestServer.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/SocketConnectionCheckTestServer.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- SocketConnectionCheckTestServer.java 9 Nov 2006 02:56:43 -0000 1.1.2.2
+++ SocketConnectionCheckTestServer.java 19 Dec 2006 06:27:08 -0000 1.1.2.3
@@ -58,7 +58,7 @@
public void setUp() throws Exception
{
- String locatorURI = transport + "://" + host + ":" + port + "/?" + SocketServerInvoker.CHECK_CONNECTION_KEY + "=" + Boolean.TRUE;
+ String locatorURI = getTransport() + "://" + host + ":" + getPort() + "/?" + SocketServerInvoker.CHECK_CONNECTION_KEY + "=" + Boolean.TRUE;
setupServer(locatorURI);
}
@@ -94,6 +94,16 @@
}
}
+ protected String getTransport()
+ {
+ return transport;
+ }
+
+ protected int getPort()
+ {
+ return port;
+ }
+
/**
* Simple invocation handler implementation.
* This is the code that will be called with the invocation payload from the client.
1.3.4.3 +12 -2 JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/SocketTestServer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketTestServer.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/SocketTestServer.java,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -b -r1.3.4.2 -r1.3.4.3
--- SocketTestServer.java 9 Nov 2006 02:56:43 -0000 1.3.4.2
+++ SocketTestServer.java 19 Dec 2006 06:27:08 -0000 1.3.4.3
@@ -85,7 +85,7 @@
{
//String locatorURI = transport + "://" + host + ":" + port + "/?" + SocketServerInvoker.CHECK_CONNECTION_KEY + "=" + Boolean.TRUE;
//String locatorURI = transport + "://" + host + ":" + port + "/?" + InvokerLocator.SERIALIZATIONTYPE + "=jboss";
- String locatorURI = transport + "://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + getPort();
setupServer(locatorURI);
}
@@ -121,6 +121,16 @@
}
}
+ protected String getTransport()
+ {
+ return transport;
+ }
+
+ protected int getPort()
+ {
+ return port;
+ }
+
/**
* Simple invocation handler implementation.
* This is the code that will be called with the invocation payload from the client.
1.1.2.3 +11 -1 JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/SocketConnectionCheckTestClient.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketConnectionCheckTestClient.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/SocketConnectionCheckTestClient.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- SocketConnectionCheckTestClient.java 9 Nov 2006 02:56:43 -0000 1.1.2.2
+++ SocketConnectionCheckTestClient.java 19 Dec 2006 06:27:08 -0000 1.1.2.3
@@ -23,7 +23,7 @@
{
- String locatorURI = transport + "://" + host + ":" + port + "/?" + SocketServerInvoker.CHECK_CONNECTION_KEY + "=" + Boolean.TRUE;
+ String locatorURI = getTransport() + "://" + host + ":" + getPort() + "/?" + SocketServerInvoker.CHECK_CONNECTION_KEY + "=" + Boolean.TRUE;
// create InvokerLocator with the url type string
// indicating the target remoting server to call upon.
@@ -66,6 +66,16 @@
}
+ protected String getTransport()
+ {
+ return transport;
+ }
+
+ protected int getPort()
+ {
+ return port;
+ }
+
/**
* Can pass transport and port to be used as parameters.
* Valid transports are 'rmi' and 'socket'.
1.4.4.3 +11 -1 JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/SocketTestClient.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketTestClient.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/SocketTestClient.java,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -u -b -r1.4.4.2 -r1.4.4.3
--- SocketTestClient.java 9 Nov 2006 02:56:43 -0000 1.4.4.2
+++ SocketTestClient.java 19 Dec 2006 06:27:08 -0000 1.4.4.3
@@ -53,7 +53,7 @@
//String locatorURI = transport + "://" + host + ":" + port + "/?" + SocketServerInvoker.CHECK_CONNECTION_KEY + "=" + Boolean.TRUE;
//String locatorURI = transport + "://" + host + ":" + port + "/?" + InvokerLocator.SERIALIZATIONTYPE + "=jboss";
- String locatorURI = transport + "://" + host + ":" + port;
+ String locatorURI = getTransport() + "://" + host + ":" + getPort();
// create InvokerLocator with the url type string
// indicating the target remoting server to call upon.
@@ -122,4 +122,14 @@
}
+ protected String getTransport()
+ {
+ return transport;
+ }
+
+ protected int getPort()
+ {
+ return port;
+ }
+
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list