QPID-5160: add a qpid-test-utils module instead of making every modules tests rely on the tests dir from the common module

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1525738 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 205 insertions, 7 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
index 0d4b4ba9f8..c999be634b 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
@@ -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.BrokerTestHelper;
 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 MultiVersionProtocolEngineFactoryTest extends QpidTestCase
             //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()
+        {
+        }
+    }
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
index 1a7e9dfc96..e893a58282 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
@@ -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 extends QpidBrokerTestCase
         _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()
+        {
+        }
+    }
 }