[hornetq-commits] JBoss hornetq SVN: r9542 - branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution.

[do-not-reply at jboss.org]

Author: jmesnil
Date: 2010-08-13 11:01:37 -0400 (Fri, 13 Aug 2010)
New Revision: 9542

Modified:
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
Log:
simplified test setup...

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2010-08-13 15:01:21 UTC (rev 9541)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2010-08-13 15:01:37 UTC (rev 9542)
@@ -1313,40 +1313,18 @@
       configuration.setClustered(true);
       configuration.setBackup(backup);
 
-      TransportConfiguration nettyBackuptc = null;
-
       configuration.getAcceptorConfigurations().clear();
 
       Map<String, Object> params = generateParams(node, netty);
 
-      if (netty)
-      {
-         TransportConfiguration nettytc = new TransportConfiguration(ServiceTestBase.NETTY_ACCEPTOR_FACTORY, params);
-         configuration.getAcceptorConfigurations().add(nettytc);
-      }
-      else
-      {
-         TransportConfiguration invmtc = new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY, params);
-         configuration.getAcceptorConfigurations().add(invmtc);
-      }
+      configuration.getAcceptorConfigurations().add(createTransportConfiguration(netty, true, params));
 
+      TransportConfiguration connector = createTransportConfiguration(netty, false, params);
+      configuration.getConnectorConfigurations().put(connector.getName(), connector);
+
       List<String> connectorPairs = new ArrayList<String>();
+      connectorPairs.add(connector.getName());
 
-      if (netty)
-      {
-         TransportConfiguration nettytc_c = new TransportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY, params);
-         configuration.getConnectorConfigurations().put(nettytc_c.getName(), nettytc_c);
-
-         connectorPairs.add(nettytc_c.getName());
-      }
-      else
-      {
-         TransportConfiguration invmtc_c = new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY, params);
-         configuration.getConnectorConfigurations().put(invmtc_c.getName(), invmtc_c);
-
-         connectorPairs.add(invmtc_c.getName());
-      }
-
       BroadcastGroupConfiguration bcConfig = new BroadcastGroupConfiguration("bg1",
                                                                              null,
                                                                              -1,