[hornetq-commits] JBoss hornetq SVN: r11026 - in branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster: failover and 1 other directory.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-07-22 09:59:26 -0400 (Fri, 22 Jul 2011)
New Revision: 11026

Modified:
   branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
   branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
   branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FileStorageDiscoveryClusterWithBackupFailoverTest.java
Log:
clean up

Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2011-07-22 13:58:45 UTC (rev 11025)
+++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2011-07-22 13:59:26 UTC (rev 11026)
@@ -1549,21 +1549,21 @@
       configuration.setJournalCompactMinFiles(0);
       configuration.setBackup(true);
 
+      // add acceptor
       configuration.getAcceptorConfigurations().clear();
       TransportConfiguration acceptorConfig = createTransportConfiguration(netty, true, generateParams(node, netty));
       configuration.getAcceptorConfigurations().add(acceptorConfig);
-      //add backup connector
+
+
+      // add backup connector
       TransportConfiguration liveConfig = createTransportConfiguration(netty, false, generateParams(liveNode, netty));
       configuration.getConnectorConfigurations().put(liveConfig.getName(), liveConfig);
       TransportConfiguration backupConfig = createTransportConfiguration(netty, false, generateParams(node, netty));
       configuration.getConnectorConfigurations().put(backupConfig.getName(), backupConfig);
 
       configuration.setLiveConnectorName(liveConfig.getName());
-      HornetQServer server;
 
-      server = createInVMFailoverServer(fileStorage, configuration, nodeManager);
-
-      servers[node] = server;
+      servers[node] = createInVMFailoverServer(fileStorage, configuration, nodeManager);
    }
 
    protected void setupLiveServerWithDiscovery(final int node,

Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java	2011-07-22 13:58:45 UTC (rev 11025)
+++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java	2011-07-22 13:59:26 UTC (rev 11026)
@@ -369,7 +369,7 @@
 
       ClientMessage message = consumer.receiveImmediate();
 
-      Assert.assertNull(message);
+      Assert.assertNull("null message", message);
 
       session.close();
 
@@ -1582,7 +1582,7 @@
 
       ClientMessage message = consumer.receiveImmediate();
 
-      Assert.assertNull(message);
+      Assert.assertNull("Null message", message);
 
       session2.close();
 

Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FileStorageDiscoveryClusterWithBackupFailoverTest.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FileStorageDiscoveryClusterWithBackupFailoverTest.java	2011-07-22 13:58:45 UTC (rev 11025)
+++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FileStorageDiscoveryClusterWithBackupFailoverTest.java	2011-07-22 13:59:26 UTC (rev 11026)
@@ -26,8 +26,6 @@
  * A FileStorageClusterWithBackupFailoverTest
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- *
  */
 public class FileStorageDiscoveryClusterWithBackupFailoverTest extends DiscoveryClusterWithBackupFailoverTest
 {