summaryrefslogtreecommitdiff
path: root/java/client/test/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/client/test/src')
-rw-r--r--java/client/test/src/org/apache/qpid/codec/BasicDeliverTest.java7
-rw-r--r--java/client/test/src/org/apache/qpid/codec/Client.java6
-rw-r--r--java/client/test/src/org/apache/qpid/codec/Server.java7
-rw-r--r--java/client/test/src/org/apache/qpid/test/unit/client/protocol/TestIoSession.java6
4 files changed, 13 insertions, 13 deletions
diff --git a/java/client/test/src/org/apache/qpid/codec/BasicDeliverTest.java b/java/client/test/src/org/apache/qpid/codec/BasicDeliverTest.java
index 892b349cea..ecbf3ad230 100644
--- a/java/client/test/src/org/apache/qpid/codec/BasicDeliverTest.java
+++ b/java/client/test/src/org/apache/qpid/codec/BasicDeliverTest.java
@@ -159,11 +159,6 @@ public class BasicDeliverTest
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- public IoServiceConfig getServiceConfig()
- {
- return null;
- }
-
public IoHandler getHandler()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
@@ -199,7 +194,7 @@ public class BasicDeliverTest
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- public int getScheduledWriteRequests()
+ public int getScheduledWriteMessages()
{
return 0; //To change body of implemented methods use File | Settings | File Templates.
}
diff --git a/java/client/test/src/org/apache/qpid/codec/Client.java b/java/client/test/src/org/apache/qpid/codec/Client.java
index c0de5ab133..b015c08afb 100644
--- a/java/client/test/src/org/apache/qpid/codec/Client.java
+++ b/java/client/test/src/org/apache/qpid/codec/Client.java
@@ -53,7 +53,11 @@ public class Client extends IoHandlerAdapter
AMQDataBlock block = BasicDeliverTest.getDataBlock(size);
InetSocketAddress address = new InetSocketAddress(host, port);
- ConnectFuture future = new SocketConnector().connect(address, this);
+
+ SocketConnector ioConnector = new SocketConnector();
+ ioConnector.setHandler(this);
+ ConnectFuture future = ioConnector.connect(address);
+
future.join();
_session = future.getSession();
diff --git a/java/client/test/src/org/apache/qpid/codec/Server.java b/java/client/test/src/org/apache/qpid/codec/Server.java
index fa4295e0b2..2639656e41 100644
--- a/java/client/test/src/org/apache/qpid/codec/Server.java
+++ b/java/client/test/src/org/apache/qpid/codec/Server.java
@@ -34,7 +34,12 @@ public class Server extends IoHandlerAdapter
{
Server(int port) throws Exception
{
- new SocketAcceptor().bind(new InetSocketAddress(port), this);
+
+ SocketAcceptor acceptor = new SocketAcceptor();
+
+ acceptor.setLocalAddress(new InetSocketAddress(port));
+ acceptor.setHandler(this);
+ acceptor.bind();
System.out.println("Listening on " + port);
}
diff --git a/java/client/test/src/org/apache/qpid/test/unit/client/protocol/TestIoSession.java b/java/client/test/src/org/apache/qpid/test/unit/client/protocol/TestIoSession.java
index e800afc7ba..50940aa166 100644
--- a/java/client/test/src/org/apache/qpid/test/unit/client/protocol/TestIoSession.java
+++ b/java/client/test/src/org/apache/qpid/test/unit/client/protocol/TestIoSession.java
@@ -45,10 +45,6 @@ public class TestIoSession extends BaseIoSession {
return null;
}
- public IoServiceConfig getServiceConfig() {
- return null;
- }
-
public IoHandler getHandler() {
return null;
}
@@ -73,7 +69,7 @@ public class TestIoSession extends BaseIoSession {
return null;
}
- public int getScheduledWriteRequests() {
+ public int getScheduledWriteMessages() {
return 0;
}