summaryrefslogtreecommitdiff
path: root/qpid/java/client/src/test
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2015-03-12 15:41:46 +0000
committerKeith Wall <kwall@apache.org>2015-03-12 15:41:46 +0000
commit6e98063ae07795f988ad26fdcf49d204d88b39c3 (patch)
tree7fa009399d501d9ad3e9f77f735d85a2b75807cf /qpid/java/client/src/test
parentb66b4f357a756449c7e7184be4d963fb36f5b2d4 (diff)
parent49c02f9fcf8c2dd1b063c887f8948f840ec785c2 (diff)
downloadqpid-python-6e98063ae07795f988ad26fdcf49d204d88b39c3.tar.gz
QPID-6429, QPID-6262, QPID-5818: [Java Broker] Utilise NIO, service connections using a thread pool, AMQP model mutating actions should use task executors
Work of Rob Godfrey and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666224 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src/test')
-rw-r--r--qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java4
-rw-r--r--qpid/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java9
-rw-r--r--qpid/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java16
3 files changed, 12 insertions, 17 deletions
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java
index 8a7e6ab084..2543c5b500 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java
@@ -666,11 +666,11 @@ public class AMQSession_0_10Test extends QpidTestCase
}
}
- class MockSender implements Sender<ProtocolEvent>
+ class MockSender implements ProtocolEventSender
{
private List<ProtocolEvent> _sendEvents = new ArrayList<ProtocolEvent>();
- public void setIdleTimeout(int i)
+ private void setIdleTimeout(int i)
{
}
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java b/qpid/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java
index 7c3988c19a..ee6704bb39 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java
@@ -22,16 +22,11 @@ package org.apache.qpid.client.transport;
import java.nio.ByteBuffer;
-import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.ByteBufferSender;
-public class MockSender implements Sender<ByteBuffer>
+public class MockSender implements ByteBufferSender
{
- public void setIdleTimeout(int i)
- {
-
- }
-
public void send(ByteBuffer msg)
{
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java b/qpid/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java
index c9af1de6a7..cdfa83571b 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java
@@ -20,18 +20,18 @@
*/
package org.apache.qpid.client.transport;
-import java.security.Principal;
-import org.apache.qpid.protocol.ProtocolEngineFactory;
-import org.apache.qpid.ssl.SSLContextFactory;
-import org.apache.qpid.transport.NetworkTransportConfiguration;
-import org.apache.qpid.transport.Sender;
-import org.apache.qpid.transport.network.NetworkConnection;
-
import java.net.BindException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
+import java.security.Principal;
+
+import org.apache.qpid.protocol.ProtocolEngineFactory;
+import org.apache.qpid.ssl.SSLContextFactory;
+import org.apache.qpid.transport.ByteBufferSender;
+import org.apache.qpid.transport.NetworkTransportConfiguration;
+import org.apache.qpid.transport.network.NetworkConnection;
/**
* Test implementation of IoSession, which is required for some tests. Methods not being used are not implemented,
@@ -147,7 +147,7 @@ public class TestNetworkConnection implements NetworkConnection
_remoteAddress = address;
}
- public Sender<ByteBuffer> getSender()
+ public ByteBufferSender getSender()
{
return _sender;
}