Increase the timeout to allow statistics to sync up

Author: jeanouii

activemq-unit-tests/src/test/java/org/apache/activemq/network/NetworkAdvancedStatisticsTest.java

@@ -110,7 +110,7 @@ protected String getLocalBrokerURI() {
     }
 
     //Added for AMQ-9437 test advancedStatistics for networkEnqueue and networkDequeue
-    @Test(timeout = 60 * 1000)
+    @Test(timeout = 120 * 1000)
     public void testNetworkAdvancedStatistics() throws Exception {
 
         // create a remote durable consumer to create demand
@@ -159,13 +159,11 @@ public boolean isSatisified() throws Exception {
                 // The number of message that remain is due to the exclude queue
                 return receivedMessages.size() == MESSAGE_COUNT;
             }
-        }, 10000, 500));
+        }, 30000, 500));
 
         assertTrue(receivedExceptions.isEmpty());
         assertEquals(Integer.valueOf(MESSAGE_COUNT), Integer.valueOf(receivedMessages.size()));
 
-        waitForIncludedStatsToUpdate();
-
         //Make sure stats are correct for local -> remote
         assertEquals(MESSAGE_COUNT, localBroker.getDestination(includedDestination).getDestinationStatistics().getEnqueues().getCount());
         assertEquals(MESSAGE_COUNT, localBroker.getDestination(includedDestination).getDestinationStatistics().getDequeues().getCount());
@@ -238,37 +236,19 @@ public boolean isSatisified() throws Exception {
                 public boolean isSatisified() throws Exception {
                     return localBroker.getSystemUsage().getMemoryUsage().getUsage() == 0;
                 }
-            }, 10000, 500));
+            }, 30000, 500));
         } else {
             assertTrue(Wait.waitFor(new Condition() {
                 @Override
                 public boolean isSatisified() throws Exception {
                     // The number of message that remain is due to the exclude queue
                     return localBroker.getAdminView().getTotalMessageCount() == MESSAGE_COUNT;
                 }
-            }, 10000, 500));
+            }, 30000, 500));
         }
         remoteConsumer.close();
     }
 
-    private void waitForIncludedStatsToUpdate() throws Exception {
-        assertTrue("Included destination stats did not reach expected counts",
-            Wait.waitFor(new Condition() {
-                @Override
-                public boolean isSatisified() throws Exception {
-                    return MESSAGE_COUNT == localBroker.getDestination(includedDestination).getDestinationStatistics().getEnqueues().getCount()
-                        && MESSAGE_COUNT == localBroker.getDestination(includedDestination).getDestinationStatistics().getDequeues().getCount()
-                        && MESSAGE_COUNT == localBroker.getDestination(includedDestination).getDestinationStatistics().getForwards().getCount()
-                        && MESSAGE_COUNT == localBroker.getDestination(includedDestination).getDestinationStatistics().getNetworkDequeues().getCount()
-                        && 0 == localBroker.getDestination(includedDestination).getDestinationStatistics().getNetworkEnqueues().getCount()
-                        && MESSAGE_COUNT == remoteBroker.getDestination(includedDestination).getDestinationStatistics().getEnqueues().getCount()
-                        && 0 == remoteBroker.getDestination(includedDestination).getDestinationStatistics().getForwards().getCount()
-                        && MESSAGE_COUNT == remoteBroker.getDestination(includedDestination).getDestinationStatistics().getNetworkEnqueues().getCount()
-                        && 0 == remoteBroker.getDestination(includedDestination).getDestinationStatistics().getNetworkDequeues().getCount();
-                }
-            }, 20000, 500));
-    }
-
     protected void assertNetworkBridgeStatistics(final long expectedLocalSent, final long expectedRemoteSent) throws Exception {
 
         final NetworkBridge localBridge = localBroker.getNetworkConnectors().get(0).activeBridges().iterator().next();
@@ -285,4 +265,4 @@ public boolean isSatisified() throws Exception {
         }));
     }
 
-}
+}