Merged revisions 598106-598232,598234-598286,598288-598323,598325-598361 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1

........
  r598337 | ritchiem | 2007-11-26 16:33:06 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Last commit accidentally caught my failover change that wasn't complete.
........
  r598352 | rupertlssmith | 2007-11-26 17:17:48 +0000 (Mon, 26 Nov 2007) | 1 line
  
  May have broken build with tktest plugin mojo, commented out until fixed.
........
  r598357 | rupertlssmith | 2007-11-26 17:33:14 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Fixed broken plugin.
........
  r598360 | ritchiem | 2007-11-26 17:49:05 +0000 (Mon, 26 Nov 2007) | 1 line
  
  QPID-690 : Missing Test and code update.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598363 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 114 insertions, 0 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java b/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
new file mode 100644
index 0000000000..d3f79f84b6
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
@@ -0,0 +1,114 @@
+package org.apache.qpid.server.failover;
+
+import junit.framework.TestCase;
+import org.apache.qpid.AMQDisconnectedException;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQConnectionURL;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.url.URLSyntaxException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import java.util.concurrent.CountDownLatch;/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+public class FailoverMethodTest extends TestCase implements ExceptionListener
+{
+    private static final Logger _logger = LoggerFactory.getLogger(FailoverMethodTest.class);
+    private CountDownLatch _failoverComplete = new CountDownLatch(1);
+
+    public void setUp() throws AMQVMBrokerCreationException
+    {
+    }
+
+    public void tearDown() throws AMQVMBrokerCreationException
+    {
+    }
+
+    public void testFailoverRoundRobinDelay() throws URLSyntaxException, AMQVMBrokerCreationException, InterruptedException, JMSException
+    {
+        String connectionString = "amqp://guest:guest@/test?brokerlist='vm://:1;tcp://localhost:5670?connectdelay='2000',retries='3''";
+
+        AMQConnectionURL url = new AMQConnectionURL(connectionString);
+        TransportConnection.createVMBroker(1);
+
+        try
+        {
+            long start = System.currentTimeMillis();
+            AMQConnection connection = new AMQConnection(url, null);
+
+            connection.setExceptionListener(this);
+
+            TransportConnection.killAllVMBrokers();
+
+            _failoverComplete.await();
+            long end = System.currentTimeMillis();
+
+            assertTrue("Failover took at over 10seconds", (end - start) > 6000);
+
+        }
+        catch (AMQException e)
+        {
+            fail(e.getMessage());
+        }
+    }
+
+    public void testFailoverSingleDelay() throws URLSyntaxException, AMQVMBrokerCreationException, InterruptedException, JMSException
+    {
+        String connectionString = "amqp://guest:guest@/test?brokerlist='vm://:1?connectdelay='2000',retries='3''";
+
+        AMQConnectionURL url = new AMQConnectionURL(connectionString);
+        TransportConnection.createVMBroker(1);
+
+        try
+        {
+            long start = System.currentTimeMillis();
+            AMQConnection connection = new AMQConnection(url, null);
+
+            connection.setExceptionListener(this);
+
+            TransportConnection.killAllVMBrokers();
+
+            _failoverComplete.await();
+            long end = System.currentTimeMillis();
+
+            assertTrue("Failover took at over 10seconds", (end - start) > 6000);
+
+        }
+        catch (AMQException e)
+        {
+            fail(e.getMessage());
+        }
+    }
+
+
+    public void onException(JMSException e)
+    {
+        if (e.getLinkedException() instanceof AMQDisconnectedException)
+        {
+            _failoverComplete.countDown();
+        }
+    }
+}