From e793d1e216e9c1c5127d64d167df72352ccbef5c Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Tue, 22 Nov 2011 08:37:11 +0000
Subject: QPID-3426: Remove broken/no-value test
 FailoverTest#test4MinuteFailover

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1204858 13f79535-47bb-0310-9956-ffa450edef68
---
 .../qpid/test/client/failover/FailoverTest.java    | 43 ----------------------
 java/test-profiles/CPPExcludes                     |  3 --
 java/test-profiles/JavaExcludes                    |  4 --
 3 files changed, 50 deletions(-)

(limited to 'java')

diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
index 3068deecf8..5b01c28fcc 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
@@ -37,16 +37,13 @@ import javax.naming.NamingException;
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.jms.ConnectionListener;
-import org.apache.qpid.jms.ConnectionURL;
 import org.apache.qpid.test.utils.FailoverBaseCase;
 
 public class FailoverTest extends FailoverBaseCase implements ConnectionListener
 {
     private static final Logger _logger = Logger.getLogger(FailoverTest.class);
 
-    private static final String QUEUE = "queue";
     private static final int DEFAULT_NUM_MESSAGES = 10;
     private static final int DEFAULT_SEED = 20080921;
     protected int numMessages = 0;
@@ -192,7 +189,6 @@ public class FailoverTest extends FailoverBaseCase implements ConnectionListener
     
     protected void runP2PFailover(int totalMessages, boolean consumeAll, boolean produceAll , boolean transacted) throws JMSException, NamingException
     {
-        Message msg = null;
         int toProduce = totalMessages;
         
         _logger.debug("===================================================================");
@@ -280,45 +276,6 @@ public class FailoverTest extends FailoverBaseCase implements ConnectionListener
         assertNotNull("Exception should be thrown", failure);
     } 
 
-    /**
-     * The client used to have a fixed timeout of 4 minutes after which failover would no longer work.
-     * Check that this code has not regressed
-     *
-     * @throws Exception if something unexpected occurs in the test.
-     */
-   
-    public void test4MinuteFailover() throws Exception
-    {
-        ConnectionURL connectionURL = getConnectionFactory().getConnectionURL();
-
-        int RETRIES = 4;
-        int DELAY = 60000;
-
-        //Set up a long delay on and large number of retries
-        BrokerDetails details = connectionURL.getBrokerDetails(1);
-        details.setProperty(BrokerDetails.OPTIONS_RETRY, String.valueOf(RETRIES));
-        details.setProperty(BrokerDetails.OPTIONS_CONNECT_DELAY, String.valueOf(DELAY));
-
-        connection = new AMQConnection(connectionURL);
-
-        ((AMQConnection) connection).setConnectionListener(this);
-
-        //Start the connection
-        connection.start();
-
-        long FAILOVER_DELAY = ((long)RETRIES * (long)DELAY);
-
-        // Use Nano seconds as it is more accurate for comparision.
-        long failTime = System.nanoTime() + FAILOVER_DELAY * 1000000;
-
-        //Fail the first broker
-        causeFailure(getFailingPort(), FAILOVER_DELAY + DEFAULT_FAILOVER_TIME);
-
-        //Reconnection should occur
-        assertTrue("Failover did not take long enough", System.nanoTime() > failTime);
-    }
-
-    
     /**
      * The idea is to run a failover test in a loop by failing over
      * to the other broker each time.
diff --git a/java/test-profiles/CPPExcludes b/java/test-profiles/CPPExcludes
index f81ce1e5aa..da702f96cf 100755
--- a/java/test-profiles/CPPExcludes
+++ b/java/test-profiles/CPPExcludes
@@ -30,9 +30,6 @@ org.apache.qpid.test.unit.client.AMQSSLConnectionTest#*
 org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#*
 org.apache.qpid.client.ResetMessageListenerTest#*
 
-// This test is not finished
-org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover
-
 // Those tests are testing 0.8 specific semantics
 org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P
 org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P
diff --git a/java/test-profiles/JavaExcludes b/java/test-profiles/JavaExcludes
index 023534ed26..9f25fcb7b0 100644
--- a/java/test-profiles/JavaExcludes
+++ b/java/test-profiles/JavaExcludes
@@ -28,10 +28,6 @@ org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy
 //Moved from JavaStandaloneExcludes when it was removed
 ///////////////////////////////////////////////////////
 
-// QPID-3426: The following test is broken.
-// This is a long running test so should exclude from normal runs
-org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover
-
 // This test may use QpidTestCase but it is not using the getConnection and is hardwired to InVM
 org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#*
 
-- 
cgit v1.2.1