Author: robbie
Date: Mon Sep 23 23:42:30 2013
New Revision: 1525738
URL: http://svn.apache.org/r1525738
Log:
QPID-5160: add a qpid-test-utils module instead of making every modules tests
rely on the tests dir from the common module
Added:
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/transport/
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java
- copied, changed from r1525736,
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/MockSender.java
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java
- copied, changed from r1525736,
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkConnection.java
qpid/trunk/qpid/java/qpid-test-utils/
qpid/trunk/qpid/java/qpid-test-utils/build.xml
- copied, changed from r1525736,
qpid/trunk/qpid/java/broker-core/build.xml
qpid/trunk/qpid/java/qpid-test-utils/src/
qpid/trunk/qpid/java/qpid-test-utils/src/main/
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
- copied, changed from r1525736,
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/PortHelper.java
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
- copied, changed from r1525736,
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
- copied, changed from r1525736,
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java
- copied, changed from r1525736,
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestSSLConstants.java
Removed:
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/MockSender.java
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkConnection.java
Modified:
qpid/trunk/qpid/java/bdbstore/build.xml
qpid/trunk/qpid/java/bdbstore/jmx/build.xml
qpid/trunk/qpid/java/broker-core/build.xml
qpid/trunk/qpid/java/broker-plugins/access-control/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml
qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml
qpid/trunk/qpid/java/broker-plugins/management-http/build.xml
qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml
qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml
qpid/trunk/qpid/java/broker/build.xml
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/build.xml
qpid/trunk/qpid/java/client/build.xml
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
qpid/trunk/qpid/java/common/build.xml
qpid/trunk/qpid/java/perftests/build.xml
qpid/trunk/qpid/java/systests/build.xml
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
Modified: qpid/trunk/qpid/java/bdbstore/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/build.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/build.xml Mon Sep 23 23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="bdbstore" xmlns:ivy="antlib:org.apache.ivy.ant" default="build">
<property name="module.depends" value="common broker-core
broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol" />
- <property name="module.test.depends" value="client common/tests
broker-core/tests management/common systests broker-plugins/management-jmx
broker-plugins/memory-store broker-plugins/amqp-0-8-protocol
broker-plugins/amqp-0-10-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10" />
+ <property name="module.test.depends" value="client qpid-test-utils
broker-core/tests management/common systests broker-plugins/management-jmx
broker-plugins/memory-store broker-plugins/amqp-0-8-protocol
broker-plugins/amqp-0-10-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided -Sqpid-broker-plugins-amqp-0-8-protocol=provided
-Sje=provided"/>
Modified: qpid/trunk/qpid/java/bdbstore/jmx/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/jmx/build.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/jmx/build.xml Mon Sep 23 23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="bdbstore-jmx" default="build">
<property name="module.depends" value="common broker-core
broker-plugins/management-jmx management/common bdbstore" />
- <property name="module.test.depends" value="broker-core/tests common/tests
management/common client systests bdbstore/tests broker-plugins/memory-store" />
+ <property name="module.test.depends" value="broker-core/tests
qpid-test-utils management/common client systests bdbstore/tests
broker-plugins/memory-store" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided -Sqpid-broker-plugins-management-jmx=provided
-Sqpid-management-common=provided -Sqpid-bdbstore=provided -Sje=provided"/>
Modified: qpid/trunk/qpid/java/broker-core/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/build.xml (original)
+++ qpid/trunk/qpid/java/broker-core/build.xml Mon Sep 23 23:42:30 2013
@@ -20,7 +20,7 @@
-->
<project name="AMQ Broker" default="build">
<property name="module.depends" value="management/common common"/>
- <property name="module.test.depends" value="common/tests" />
+ <property name="module.test.depends" value="qpid-test-utils" />
<property name="module.genpom" value="true"/>
<import file="../module.xml"/>
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/build.xml Mon Sep 23
23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins Access Control" default="build">
<property name="module.depends" value="common broker-core" />
- <property name="module.test.depends" value="common/tests broker-core/tests
management/common" />
+ <property name="module.test.depends" value="qpid-test-utils
broker-core/tests management/common" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided"/>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml Mon Sep 23
23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins AMQP 0-10 Protocol" default="build">
<property name="module.depends" value="common broker-core" />
- <property name="module.test.depends" value="common/tests
broker-core/tests" />
+ <property name="module.test.depends" value="qpid-test-utils
broker-core/tests" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided"/>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml Mon Sep 23
23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins AMQP 0-8 Protocol" default="build">
<property name="module.depends" value="common broker-core" />
- <property name="module.test.depends" value="common/tests
broker-core/tests" />
+ <property name="module.test.depends" value="qpid-test-utils
broker-core/tests" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided"/>
Modified:
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
Mon Sep 23 23:42:30 2013
@@ -20,38 +20,38 @@
*/
package org.apache.qpid.server.protocol.v0_8;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import javax.security.auth.Subject;
+
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQMessage;
import org.apache.qpid.server.message.MessageContentSource;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolEngine;
+import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter;
import org.apache.qpid.server.queue.QueueEntry;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.subscription.ClientDeliveryMethod;
import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.protocol.v0_8.SubscriptionImpl;
import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.transport.TestNetworkConnection;
-
-import javax.security.auth.Subject;
-
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
+import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.network.NetworkConnection;
public class InternalTestProtocolSession extends AMQProtocolEngine implements
ProtocolOutputConverter
{
@@ -266,4 +266,95 @@ public class InternalTestProtocolSession
}
}
}
+
+ private static class TestNetworkConnection implements NetworkConnection
+ {
+ private String _remoteHost = "127.0.0.1";
+ private String _localHost = "127.0.0.1";
+ private int _port = 1;
+ private final Sender<ByteBuffer> _sender;
+
+ public TestNetworkConnection()
+ {
+ _sender = new Sender<ByteBuffer>()
+ {
+ public void setIdleTimeout(int i)
+ {
+ }
+
+ public void send(ByteBuffer msg)
+ {
+ }
+
+ public void flush()
+ {
+ }
+
+ public void close()
+ {
+ }
+ };
+ }
+
+ @Override
+ public SocketAddress getLocalAddress()
+ {
+ return new InetSocketAddress(_localHost, _port);
+ }
+
+ @Override
+ public SocketAddress getRemoteAddress()
+ {
+ return new InetSocketAddress(_remoteHost, _port);
+ }
+
+ @Override
+ public void setMaxReadIdle(int idleTime)
+ {
+ }
+
+ @Override
+ public void setPeerPrincipal(Principal principal)
+ {
+ }
+
+ @Override
+ public Principal getPeerPrincipal()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxReadIdle()
+ {
+ return 0;
+ }
+
+ @Override
+ public int getMaxWriteIdle()
+ {
+ return 0;
+ }
+
+ @Override
+ public void setMaxWriteIdle(int idleTime)
+ {
+ }
+
+ @Override
+ public void close()
+ {
+ }
+
+ @Override
+ public Sender<ByteBuffer> getSender()
+ {
+ return _sender;
+ }
+
+ @Override
+ public void start()
+ {
+ }
+ }
}
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml Mon Sep 23
23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins AMQP 1.0 Protocol" default="build">
<property name="module.depends" value="common broker-core amqp-1-0-common"
/>
- <property name="module.test.depends" value="common/tests
broker-core/tests" />
+ <property name="module.test.depends" value="qpid-test-utils
broker-core/tests" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided"/>
Modified:
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml
(original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml Mon
Sep 23 23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins AMQP 0.8 to 1.0 MessageConversion"
default="build">
<property name="module.depends" value="common broker-core amqp-1-0-common
broker-plugins/amqp-1-0-protocol broker-plugins/amqp-0-10-protocol" />
- <property name="module.test.depends" value="common/tests
broker-core/tests" />
+ <property name="module.test.depends" value="qpid-test-utils
broker-core/tests" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided -Sqpid-amqp-1-0-common=provided
-Sqpid-broker-plugins-amqp-0-10-protocol=provided
-Sqpid-broker-plugins-amqp-1-0-protocol=provided"/>
Modified:
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
(original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml Mon
Sep 23 23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins AMQP 0.8 to 0.10 MessageConversion"
default="build">
<property name="module.depends" value="common broker-core
broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol" />
- <property name="module.test.depends" value="common/tests
broker-core/tests" />
+ <property name="module.test.depends" value="qpid-test-utils
broker-core/tests" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided -Sqpid-broker-plugins-amqp-0-10-protocol=provided
-Sqpid-broker-plugins-amqp-0-8-protocol=provided"/>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
(original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml Mon
Sep 23 23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins AMQP 0.8 to 1.0 MessageConversion"
default="build">
<property name="module.depends" value="common broker-core amqp-1-0-common
broker-plugins/amqp-0-8-protocol broker-plugins/amqp-1-0-protocol" />
- <property name="module.test.depends" value="common/tests
broker-core/tests" />
+ <property name="module.test.depends" value="qpid-test-utils
broker-core/tests" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided -Sqpid-amqp-1-0-common=provided
-Sqpid-broker-plugins-amqp-1-0-protocol=provided
-Sqpid-broker-plugins-amqp-0-8-protocol=provided"/>
Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml Mon Sep 23
23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins Derby Store" default="build">
<property name="module.depends" value="common broker-core" />
- <property name="module.test.depends" value="common/tests
broker-core/tests" />
+ <property name="module.test.depends" value="qpid-test-utils
broker-core/tests" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided"/>
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml Mon Sep 23
23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins JDBC Store" default="build">
<property name="module.depends" value="common broker-core" />
- <property name="module.test.depends" value="common/tests
broker-core/tests" />
+ <property name="module.test.depends" value="qpid-test-utils
broker-core/tests" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided"/>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/build.xml Mon Sep 23
23:42:30 2013
@@ -19,7 +19,7 @@
<project name="Qpid Broker-Plugins Management HTTP" default="build">
<property name="module.depends" value="common broker-core" />
- <property name="module.test.depends" value="broker-core/tests common/tests
management/common client" />
+ <property name="module.test.depends" value="broker-core/tests
qpid-test-utils management/common client" />
<property name="module.genpom" value="true" />
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided" />
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml Mon Sep 23
23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins Management JMX" default="build">
<property name="module.depends" value="common broker-core
management/common" />
- <property name="module.test.depends" value="broker-core/tests common/tests
management/common client" />
+ <property name="module.test.depends" value="broker-core/tests
qpid-test-utils management/common client" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided -Sqpid-management-common=provided"/>
Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml Mon Sep 23
23:42:30 2013
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins Memory Store" default="build">
<property name="module.depends" value="common broker-core" />
- <property name="module.test.depends" value="common/tests
broker-core/tests" />
+ <property name="module.test.depends" value="qpid-test-utils
broker-core/tests" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker-core=provided"/>
Modified: qpid/trunk/qpid/java/broker/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/build.xml (original)
+++ qpid/trunk/qpid/java/broker/build.xml Mon Sep 23 23:42:30 2013
@@ -20,7 +20,7 @@
-->
<project name="Broker" default="build">
<property name="module.depends" value="broker-core common"/>
- <property name="module.test.depends" value="common/tests" />
+ <property name="module.test.depends" value="qpid-test-utils" />
<property name="module.main" value="org.apache.qpid.server.Main"/>
<property name="module.genpom" value="true"/>
Modified: qpid/trunk/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Mon Sep 23 23:42:30 2013
@@ -96,6 +96,7 @@ client-example.test.libs=${test.libs}
tools.test.libs=
systests.libs=${test.libs}
perftests.test.libs=${test.libs}
+qpid-test-utils.libs = ${test.libs} ${geronimo-jms}
broker-plugins-access-control.test.libs=${test.libs}
broker-plugins-management-http.test.libs=${test.libs}
Modified: qpid/trunk/qpid/java/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Mon Sep 23 23:42:30 2013
@@ -34,7 +34,7 @@
<findSubProjects name="broker-plugins" dir="broker-plugins"
excludes="${broker-plugins-exclude}"/>
<findSubProjects name="client-plugins" dir="client-plugins"/>
- <property name="modules.core" value="common management/common
amqp-1-0-common broker-core broker client amqp-1-0-client amqp-1-0-client-jms
tools"/>
+ <property name="modules.core" value="qpid-test-utils common
management/common amqp-1-0-common broker-core broker client amqp-1-0-client
amqp-1-0-client-jms tools"/>
<property name="modules.examples" value="client/example management/example
amqp-1-0-client/example amqp-1-0-client-jms/example"/>
<property name="modules.tests" value="systests perftests"/>
<property name="modules.plugin" value="${broker-plugins}
${client-plugins}"/>
Modified: qpid/trunk/qpid/java/client/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/build.xml (original)
+++ qpid/trunk/qpid/java/client/build.xml Mon Sep 23 23:42:30 2013
@@ -21,7 +21,7 @@
<project name="AMQ Client" default="build">
<property name="module.depends" value="common"/>
- <property name="module.test.depends" value="common/tests" />
+ <property name="module.test.depends" value="qpid-test-utils" />
<property name="module.genpom" value="true"/>
<property name="module.genpom.args"
value="-Sgeronimo-jms_1.1_spec=provided"/>
Modified:
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
(original)
+++
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
Mon Sep 23 23:42:30 2013
@@ -21,10 +21,10 @@
package org.apache.qpid.client;
import org.apache.qpid.AMQException;
+import org.apache.qpid.client.transport.TestNetworkConnection;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.amqp_0_91.QueueDeclareOkBodyImpl;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.TestNetworkConnection;
import org.apache.qpid.transport.network.NetworkConnection;
import org.apache.qpid.url.AMQBindingURL;
Modified:
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
(original)
+++
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
Mon Sep 23 23:42:30 2013
@@ -28,12 +28,12 @@ import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQAuthenticationException;
import org.apache.qpid.client.MockAMQConnection;
import org.apache.qpid.client.state.AMQState;
+import org.apache.qpid.client.transport.TestNetworkConnection;
import org.apache.qpid.framing.AMQBody;
import org.apache.qpid.framing.AMQFrame;
import org.apache.qpid.framing.AMQMethodBody;
import org.apache.qpid.framing.amqp_8_0.BasicRecoverOkBodyImpl;
import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.transport.TestNetworkConnection;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
Copied:
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java
(from r1525736,
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/MockSender.java)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java?p2=qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java&p1=qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/MockSender.java&r1=1525736&r2=1525738&rev=1525738&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/MockSender.java
(original)
+++
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/transport/MockSender.java
Mon Sep 23 23:42:30 2013
@@ -18,10 +18,12 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.client.transport;
import java.nio.ByteBuffer;
+import org.apache.qpid.transport.Sender;
+
public class MockSender implements Sender<ByteBuffer>
{
Copied:
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java
(from r1525736,
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkConnection.java)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java?p2=qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java&p1=qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkConnection.java&r1=1525736&r2=1525738&rev=1525738&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkConnection.java
(original)
+++
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java
Mon Sep 23 23:42:30 2013
@@ -18,11 +18,13 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+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;
Modified: qpid/trunk/qpid/java/common/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build.xml (original)
+++ qpid/trunk/qpid/java/common/build.xml Mon Sep 23 23:42:30 2013
@@ -20,6 +20,7 @@
-->
<project name="AMQ Common" default="build">
+ <property name="module.test.depends" value="qpid-test-utils" />
<property name="module.genpom" value="true"/>
<import file="../module.xml"/>
Modified: qpid/trunk/qpid/java/perftests/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/build.xml (original)
+++ qpid/trunk/qpid/java/perftests/build.xml Mon Sep 23 23:42:30 2013
@@ -33,7 +33,7 @@
</condition>
<property name="module.depends" value="client common"/>
- <property name="module.test.depends" value="systests broker-core
broker-plugins/memory-store broker-plugins/derby-store common/tests
management/common broker-plugins/amqp-0-8-protocol
broker-plugins/amqp-0-10-protocol broker-plugins/amqp-1-0-protocol
${perftests.optional.test.depends}"/>
+ <property name="module.test.depends" value="systests broker-core
broker-plugins/memory-store broker-plugins/derby-store qpid-test-utils
management/common broker-plugins/amqp-0-8-protocol
broker-plugins/amqp-0-10-protocol broker-plugins/amqp-1-0-protocol
${perftests.optional.test.depends}"/>
<import file="../module.xml"/>
Copied: qpid/trunk/qpid/java/qpid-test-utils/build.xml (from r1525736,
qpid/trunk/qpid/java/broker-core/build.xml)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-test-utils/build.xml?p2=qpid/trunk/qpid/java/qpid-test-utils/build.xml&p1=qpid/trunk/qpid/java/broker-core/build.xml&r1=1525736&r2=1525738&rev=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/build.xml (original)
+++ qpid/trunk/qpid/java/qpid-test-utils/build.xml Mon Sep 23 23:42:30 2013
@@ -18,16 +18,9 @@
- under the License.
-
-->
-<project name="AMQ Broker" default="build">
- <property name="module.depends" value="management/common common"/>
- <property name="module.test.depends" value="common/tests" />
- <property name="module.genpom" value="true"/>
+<project name="QpidTestUtils" default="build">
+ <property name="module.depends" value=""/>
+ <property name="module.test.depends" value="" />
<import file="../module.xml"/>
-
- <import file="${project.root}/broker-core/build-generate-sources.xml"/>
-
- <target name="precompile" depends="generate-logmessages"/>
-
- <target name="bundle" depends="bundle-tasks"/>
</project>
Copied:
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
(from r1525736,
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/PortHelper.java)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java?p2=qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java&p1=qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/PortHelper.java&r1=1525736&r2=1525738&rev=1525738&view=diff
==============================================================================
(empty)
Copied:
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
(from r1525736,
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?p2=qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java&p1=qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java&r1=1525736&r2=1525738&rev=1525738&view=diff
==============================================================================
(empty)
Copied:
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
(from r1525736,
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java?p2=qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java&p1=qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java&r1=1525736&r2=1525738&rev=1525738&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java
(original)
+++
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
Mon Sep 23 23:42:30 2013
@@ -23,15 +23,14 @@ package org.apache.qpid.test.utils;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.io.FileOutputStream;
import junit.framework.TestCase;
-import org.apache.qpid.util.FileUtils;
-
/**
- * Utility methods intended to be used in unit tests that manipulate files
+ * Utility methods intended to be used in tests that manipulate files
*/
public class TestFileUtils
{
@@ -55,7 +54,7 @@ public class TestFileUtils
File testDir = new File(SYSTEM_TMP_DIR, dirNameStem + "-" +
System.currentTimeMillis());
if (testDir.exists())
{
- FileUtils.delete(testDir, true);
+ delete(testDir, true);
}
testDir.mkdirs();
@@ -102,7 +101,7 @@ public class TestFileUtils
InputStream in = testCase.getClass().getResourceAsStream(resourceName);
try
{
- FileUtils.copy(in, dst);
+ copy(in, dst);
}
catch (Exception e)
{
@@ -150,4 +149,85 @@ public class TestFileUtils
}
return file;
}
+
+ /**
+ * Delete a given file/directory,
+ * A directory will always require the recursive flag to be set.
+ * if a directory is specified and recursive set then delete the whole tree
+ *
+ * @param file the File object to start at
+ * @param recursive boolean to recurse if a directory is specified.
+ *
+ * @return <code>true</code> if and only if the file or directory is
+ * successfully deleted; <code>false</code> otherwise
+ */
+ public static boolean delete(File file, boolean recursive)
+ {
+ boolean success = true;
+
+ if (file.isDirectory())
+ {
+ if (recursive)
+ {
+ File[] files = file.listFiles();
+
+ // This can occur if the file is deleted outside the JVM
+ if (files == null)
+ {
+ return false;
+ }
+
+ for (int i = 0; i < files.length; i++)
+ {
+ success = delete(files[i], true) && success;
+ }
+
+ return success && file.delete();
+ }
+
+ return false;
+ }
+
+ return file.delete();
+ }
+
+ /**
+ * Copies the specified InputStream to the specified destination file. If
the destination file does not exist,
+ * it is created.
+ *
+ * @param in The InputStream
+ * @param dst The destination file name.
+ * @throws IOException
+ */
+ public static void copy(InputStream in, File dst) throws IOException
+ {
+ try
+ {
+ if (!dst.exists())
+ {
+ dst.createNewFile();
+ }
+
+ OutputStream out = new FileOutputStream(dst);
+
+ try
+ {
+ // Transfer bytes from in to out
+ byte[] buf = new byte[1024];
+ int len;
+ while ((len = in.read(buf)) > 0)
+ {
+ out.write(buf, 0, len);
+ }
+ }
+ finally
+ {
+ out.close();
+ }
+ }
+ finally
+ {
+ in.close();
+ }
+ }
}
Copied:
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java
(from r1525736,
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestSSLConstants.java)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java?p2=qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java&p1=qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestSSLConstants.java&r1=1525736&r2=1525738&rev=1525738&view=diff
==============================================================================
(empty)
Modified: qpid/trunk/qpid/java/systests/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/build.xml?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/build.xml (original)
+++ qpid/trunk/qpid/java/systests/build.xml Mon Sep 23 23:42:30 2013
@@ -34,7 +34,7 @@ nn - or more contributor license agreeme
<!-- The jca module is unusual in that it produces a jar with the name ra
rather than jca. Unfortunately this means we
need to add both jca (finds jca's jar dependencies) and ra (to find
the qpid-ra jar file itself). -->
- <property name="module.depends" value="client management/common
broker-core broker-core/tests common amqp-1-0-common common/tests jca ra
broker-plugins/access-control broker-plugins/management-http
broker-plugins/management-jmx broker-plugins/memory-store
broker-plugins/derby-store broker-plugins/amqp-0-8-protocol
broker-plugins/amqp-0-10-protocol broker-plugins/amqp-1-0-protocol
broker-plugins/amqp-msg-conv-0-8-to-0-10
broker-plugins/amqp-msg-conv-0-8-to-1-0
broker-plugins/amqp-msg-conv-0-10-to-1-0 ${systests.optional.depends}"/>
+ <property name="module.depends" value="qpid-test-utils client
management/common broker-core broker-core/tests common amqp-1-0-common
common/tests jca ra broker-plugins/access-control
broker-plugins/management-http broker-plugins/management-jmx
broker-plugins/memory-store broker-plugins/derby-store
broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol
broker-plugins/amqp-1-0-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10
broker-plugins/amqp-msg-conv-0-8-to-1-0
broker-plugins/amqp-msg-conv-0-10-to-1-0 ${systests.optional.depends}"/>
<property name="module.test.src" location="src/main/java"/>
<property name="module.test.excludes"
value="**/DropInTest.java,**/TestClientControlledTest.java"/>
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
Mon Sep 23 23:42:30 2013
@@ -22,7 +22,10 @@ package org.apache.qpid.server.protocol;
import static org.mockito.Mockito.when;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
import java.nio.ByteBuffer;
+import java.security.Principal;
import java.util.EnumSet;
import java.util.Set;
@@ -32,7 +35,8 @@ import org.apache.qpid.server.util.Broke
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.TestNetworkConnection;
+import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.network.NetworkConnection;
public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase
{
@@ -202,4 +206,95 @@ public class MultiVersionProtocolEngineF
//expected
}
}
+
+ private static class TestNetworkConnection implements NetworkConnection
+ {
+ private String _remoteHost = "127.0.0.1";
+ private String _localHost = "127.0.0.1";
+ private int _port = 1;
+ private final Sender<ByteBuffer> _sender;
+
+ public TestNetworkConnection()
+ {
+ _sender = new Sender<ByteBuffer>()
+ {
+ public void setIdleTimeout(int i)
+ {
+ }
+
+ public void send(ByteBuffer msg)
+ {
+ }
+
+ public void flush()
+ {
+ }
+
+ public void close()
+ {
+ }
+ };
+ }
+
+ @Override
+ public SocketAddress getLocalAddress()
+ {
+ return new InetSocketAddress(_localHost, _port);
+ }
+
+ @Override
+ public SocketAddress getRemoteAddress()
+ {
+ return new InetSocketAddress(_remoteHost, _port);
+ }
+
+ @Override
+ public void setMaxReadIdle(int idleTime)
+ {
+ }
+
+ @Override
+ public void setPeerPrincipal(Principal principal)
+ {
+ }
+
+ @Override
+ public Principal getPeerPrincipal()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxReadIdle()
+ {
+ return 0;
+ }
+
+ @Override
+ public int getMaxWriteIdle()
+ {
+ return 0;
+ }
+
+ @Override
+ public void setMaxWriteIdle(int idleTime)
+ {
+ }
+
+ @Override
+ public void close()
+ {
+ }
+
+ @Override
+ public Sender<ByteBuffer> getSender()
+ {
+ return _sender;
+ }
+
+ @Override
+ public void start()
+ {
+ }
+ }
}
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java?rev=1525738&r1=1525737&r2=1525738&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
Mon Sep 23 23:42:30 2013
@@ -20,17 +20,20 @@
*/
package org.apache.qpid.test.unit.client.protocol;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.security.Principal;
+
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.protocol.AMQProtocolHandler;
import org.apache.qpid.client.protocol.AMQProtocolSession;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
-import org.apache.qpid.transport.TestNetworkConnection;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.net.UnknownHostException;
+import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.network.NetworkConnection;
public class AMQProtocolSessionTest extends QpidBrokerTestCase
{
@@ -97,4 +100,104 @@ public class AMQProtocolSessionTest exte
_testSession.getNetworkConnection().setLocalAddress(address);
assertEquals("Wrong queue name", queueName,
_testSession.genQueueName().asString());
}
+
+ private static class TestNetworkConnection implements NetworkConnection
+ {
+ private String _remoteHost = "127.0.0.1";
+ private String _localHost = "127.0.0.1";
+ private int _port = 1;
+ private SocketAddress _localAddress = null;
+ private final Sender<ByteBuffer> _sender;
+
+ public TestNetworkConnection()
+ {
+ _sender = new Sender<ByteBuffer>()
+ {
+
+ public void setIdleTimeout(int i)
+ {
+
+ }
+
+ public void send(ByteBuffer msg)
+ {
+
+ }
+
+ public void flush()
+ {
+
+ }
+
+ public void close()
+ {
+
+ }
+ };
+ }
+
+ @Override
+ public SocketAddress getLocalAddress()
+ {
+ return (_localAddress != null) ? _localAddress : new
InetSocketAddress(_localHost, _port);
+ }
+
+ @Override
+ public SocketAddress getRemoteAddress()
+ {
+ return new InetSocketAddress(_remoteHost, _port);
+ }
+
+ @Override
+ public void setMaxReadIdle(int idleTime)
+ {
+ }
+
+ @Override
+ public void setPeerPrincipal(Principal principal)
+ {
+ }
+
+ @Override
+ public Principal getPeerPrincipal()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxReadIdle()
+ {
+ return 0;
+ }
+
+ @Override
+ public int getMaxWriteIdle()
+ {
+ return 0;
+ }
+
+ @Override
+ public void setMaxWriteIdle(int idleTime)
+ {
+ }
+
+ @Override
+ public void close()
+ {
+ }
+
+ public void setLocalAddress(SocketAddress address)
+ {
+ _localAddress = address;
+ }
+
+ public Sender<ByteBuffer> getSender()
+ {
+ return _sender;
+ }
+
+ public void start()
+ {
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
