Author: jmesnil Date: 2010-09-01 11:52:22 -0400 (Wed, 01 Sep 2010) New Revision: 9627 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/util/ServiceTestBase.java Log: move helper methods to ServiceTestBase 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-09-01 15:01:34 UTC (rev 9626) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-09-01 15:52:22 UTC (rev 9627) @@ -41,10 +41,6 @@ import org.hornetq.core.postoffice.PostOffice; import org.hornetq.core.postoffice.QueueBinding; import org.hornetq.core.postoffice.impl.LocalQueueBinding; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; @@ -1388,51 +1384,6 @@ servers[node] = server; } - protected static Map<String, Object> generateParams(final int node, final boolean netty) - { - Map<String, Object> params = new HashMap<String, Object>(); - - if (netty) - { - params.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, - org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + node); - } - else - { - params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, node); - } - - return params; - } - - protected static TransportConfiguration createTransportConfiguration(boolean netty, boolean acceptor, Map<String, Object> params) - { - String className; - if (netty) - { - if (acceptor) - { - className = NettyAcceptorFactory.class.getName(); - } - else - { - className = NettyConnectorFactory.class.getName(); - } - } else - { - if (acceptor) - { - className = InVMAcceptorFactory.class.getName(); - } - else - { - className = InVMConnectorFactory.class.getName(); - } - } - return new TransportConfiguration(className, params); - } - - protected void clearServer(final int... nodes) { for (int i = 0; i < nodes.length; i++) Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/ServiceTestBase.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-09-01 15:01:34 UTC (rev 9626) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-09-01 15:52:22 UTC (rev 9627) @@ -68,6 +68,50 @@ protected static final String NETTY_CONNECTOR_FACTORY = NettyConnectorFactory.class.getCanonicalName(); + protected static Map<String, Object> generateParams(final int node, final boolean netty) + { + Map<String, Object> params = new HashMap<String, Object>(); + + if (netty) + { + params.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + node); + } + else + { + params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, node); + } + + return params; + } + + protected static TransportConfiguration createTransportConfiguration(boolean netty, boolean acceptor, Map<String, Object> params) + { + String className; + if (netty) + { + if (acceptor) + { + className = NettyAcceptorFactory.class.getName(); + } + else + { + className = NettyConnectorFactory.class.getName(); + } + } else + { + if (acceptor) + { + className = InVMAcceptorFactory.class.getName(); + } + else + { + className = InVMConnectorFactory.class.getName(); + } + } + return new TransportConfiguration(className, params); + } + // Static -------------------------------------------------------- private final Logger log = Logger.getLogger(this.getClass());