You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/04/13 13:27:34 UTC
svn commit: r764414 - in /qpid/branches/0.5-fix/qpid: ./
java/broker/src/test/java/org/apache/qpid/server/protocol/
Author: ritchiem
Date: Mon Apr 13 11:27:34 2009
New Revision: 764414
URL: http://svn.apache.org/viewvc?rev=764414&view=rev
Log:
Remove MockIoSession, replace with TestIoSession everywhere.
merged from trunk r743028
Removed:
qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MockIoSession.java
Modified:
qpid/branches/0.5-fix/qpid/ (props changed)
qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
Propchange: qpid/branches/0.5-fix/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 11:27:34 2009
@@ -1 +1 @@
-/qpid/trunk/qpid:742626
+/qpid/trunk/qpid:742626,743028
Modified: qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java?rev=764414&r1=764413&r2=764414&view=diff
==============================================================================
--- qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java (original)
+++ qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java Mon Apr 13 11:27:34 2009
@@ -114,7 +114,7 @@
IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
_protocolSession =
- new AMQMinaProtocolSession(new MockIoSession(), appRegistry.getVirtualHostRegistry(), new AMQCodecFactory(true),
+ new AMQMinaProtocolSession(new TestIoSession(), appRegistry.getVirtualHostRegistry(), new AMQCodecFactory(true),
null);
_protocolSession.setVirtualHost(appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
_channel = new AMQChannel(_protocolSession, 1, _messageStore);
Modified: qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java?rev=764414&r1=764413&r2=764414&view=diff
==============================================================================
--- qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java (original)
+++ qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java Mon Apr 13 11:27:34 2009
@@ -38,7 +38,7 @@
public void testChannels() throws Exception
{
- _session = new AMQMinaProtocolSession(new MockIoSession(), _appRegistry
+ _session = new AMQMinaProtocolSession(new TestIoSession(), _appRegistry
.getVirtualHostRegistry(), new AMQCodecFactory(true), null);
_session.setVirtualHost(_appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
Modified: qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java?rev=764414&r1=764413&r2=764414&view=diff
==============================================================================
--- qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java (original)
+++ qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java Mon Apr 13 11:27:34 2009
@@ -24,6 +24,7 @@
import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
import org.apache.qpid.pool.ReadWriteThreadModel;
+import java.net.InetAddress;
import java.net.SocketAddress;
import java.net.InetSocketAddress;
import java.util.Set;
@@ -37,6 +38,8 @@
public class TestIoSession implements IoSession
{
private final ConcurrentMap attributes = new ConcurrentHashMap();
+ private String _address;
+ private int _port;
public TestIoSession()
{
@@ -139,7 +142,7 @@
public SocketAddress getRemoteAddress()
{
- return new InetSocketAddress("127.0.0.1", 1234);
+ return new InetSocketAddress(getAddress(), getPort());
}
public SocketAddress getLocalAddress()
@@ -282,6 +285,26 @@
return 0;
}
+ public void setAddress(String string)
+ {
+ this._address = string;
+ }
+
+ public String getAddress()
+ {
+ return _address;
+ }
+
+ public void setPort(int _port)
+ {
+ this._port = _port;
+ }
+
+ public int getPort()
+ {
+ return _port;
+ }
+
/**
* Test implementation of IoServiceConfig
*/
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org