[hornetq-commits] JBoss hornetq SVN: r12264 - in trunk/tests: integration-tests/src/test/java/org/hornetq/tests/integration/client and 1 other directory.

Author: borges Date: 2012-03-08 11:05:21 -0500 (Thu, 08 Mar 2012) New Revision: 12264 Modified: trunk/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NIOvsOIOTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java Log: Organize imports Modified: trunk/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java =================================================================== --- trunk/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java 2012-03-08 16:04:45 UTC (rev 12263) +++ trunk/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java 2012-03-08 16:05:21 UTC (rev 12264) @@ -17,25 +17,13 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; -import java.util.HashMap; -import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import junit.framework.Assert; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.protocol.stomp.Stomp; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.HornetQServers; -import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.tests.integration.stomp.StompTestBase; -import org.hornetq.tests.util.UnitTestCase; public class ConcurrentStompTest extends StompTestBase { @@ -125,9 +113,9 @@ { byte[] bytes = data.getBytes("UTF-8"); OutputStream outputStream = socket.getOutputStream(); - for (int i = 0; i < bytes.length; i++) + for (byte b : bytes) { - outputStream.write(bytes[i]); + outputStream.write(b); } outputStream.flush(); } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NIOvsOIOTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NIOvsOIOTest.java 2012-03-08 16:04:45 UTC (rev 12263) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/NIOvsOIOTest.java 2012-03-08 16:05:21 UTC (rev 12264) @@ -19,12 +19,16 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; -import junit.framework.TestSuite; - import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.*; +import org.hornetq.api.core.client.ClientConsumer; +import org.hornetq.api.core.client.ClientMessage; +import org.hornetq.api.core.client.ClientProducer; +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.core.client.MessageHandler; +import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; @@ -53,153 +57,153 @@ { testPerf(true); } - + public void testOIOPerf() throws Exception { testPerf(false); } - + private void doTest(String dest) throws Exception { - + final int numSenders = 1; final int numReceivers = 1; - + final int numMessages = 20000; - + Receiver[] receivers = new Receiver[numReceivers]; - + Sender[] senders = new Sender[numSenders]; - + List<ClientSessionFactory> factories = new ArrayList<ClientSessionFactory>(); ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); - + for (int i = 0; i < numReceivers; i++) { ClientSessionFactory sf = locator.createSessionFactory(); - + factories.add(sf); receivers[i] = new Receiver(i, sf, numMessages * numSenders, dest); - + receivers[i].prepare(); - + receivers[i].start(); } - + for (int i = 0; i < numSenders; i++) { ClientSessionFactory sf = locator.createSessionFactory(); factories.add(sf); - + senders[i] = new Sender(i, sf, numMessages, dest); - + senders[i].prepare(); } - + long start = System.currentTimeMillis(); - + for (int i = 0; i < numSenders; i++) - { + { senders[i].start(); } - + for (int i = 0; i < numSenders; i++) - { + { senders[i].join(); } - + for (int i = 0; i < numReceivers; i++) - { + { receivers[i].await(); } - + long end = System.currentTimeMillis(); - + double rate = 1000 * (double)(numMessages * numSenders) / (end - start); - + logAndSystemOut("Rate is " + rate + " msgs sec"); - + for (int i = 0; i < numSenders; i++) - { + { senders[i].terminate(); } - + for (int i = 0; i < numReceivers; i++) - { + { receivers[i].terminate(); } - + for (ClientSessionFactory sf: factories) - { + { sf.close(); } - + locator.close(); } private void testPerf(boolean nio) throws Exception { String acceptorFactoryClassName = "org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory"; - + Configuration conf = createDefaultConfig(); conf.setSecurityEnabled(false); - + Map<String, Object> params = new HashMap<String, Object>(); - + params.put(TransportConstants.USE_NIO_PROP_NAME, nio); conf.getAcceptorConfigurations().add(new TransportConfiguration(acceptorFactoryClassName, params)); HornetQServer server = HornetQServers.newHornetQServer(conf, false); - + AddressSettings addressSettings = new AddressSettings(); - + addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK); - + addressSettings.setMaxSizeBytes(10 * 1024 * 1024); - + final String dest = "test-destination"; - + HierarchicalRepository<AddressSettings> repos = server.getAddressSettingsRepository(); - + repos.addMatch(dest, addressSettings); server.start(); - + for (int i = 0; i < 2; i++) { doTest(dest); - } + } server.stop(); } private class Sender extends Thread { - private ClientSessionFactory sf; + private final ClientSessionFactory sf; - private int numMessages; - - private String dest; + private final int numMessages; + private final String dest; + private ClientSession session; private ClientProducer producer; - - private int id; + private final int id; + Sender(int id, ClientSessionFactory sf, final int numMessages, final String dest) { this.id = id; - + this.sf = sf; - + this.numMessages = numMessages; this.dest = dest; @@ -212,10 +216,11 @@ producer = session.createProducer(dest); } + @Override public void run() { ClientMessage msg = session.createMessage(false); - + for (int i = 0; i < numMessages; i++) { try @@ -226,12 +231,12 @@ { log.error("Caught exception", e); } - + //log.info(id + " sent message " + i); - + } } - + public void terminate() throws Exception { session.close(); @@ -240,26 +245,26 @@ private class Receiver implements MessageHandler { - private ClientSessionFactory sf; + private final ClientSessionFactory sf; - private int numMessages; + private final int numMessages; - private String dest; + private final String dest; private ClientSession session; private ClientConsumer consumer; - - private int id; - + + private final int id; + private String queueName; Receiver(int id, ClientSessionFactory sf, final int numMessages, final String dest) { this.id = id; - + this.sf = sf; - + this.numMessages = numMessages; this.dest = dest; @@ -283,7 +288,7 @@ session.start(); } - private CountDownLatch latch = new CountDownLatch(1); + private final CountDownLatch latch = new CountDownLatch(1); void await() throws Exception { @@ -302,24 +307,24 @@ { log.error("Caught exception", e); } - + count++; - + if (count == numMessages) { latch.countDown(); } - + //log.info(id + " got msg " + count); - + } - + public void terminate() throws Exception { consumer.close(); - + session.deleteQueue(queueName); - + session.close(); } } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java 2012-03-08 16:04:45 UTC (rev 12263) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java 2012-03-08 16:05:21 UTC (rev 12264) @@ -21,11 +21,14 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.*; +import org.hornetq.api.core.client.ClientConsumer; +import org.hornetq.api.core.client.ClientProducer; +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2012-03-08 16:04:45 UTC (rev 12263) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2012-03-08 16:05:21 UTC (rev 12264) @@ -17,12 +17,15 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.*; +import org.hornetq.api.core.client.ClientConsumer; +import org.hornetq.api.core.client.ClientProducer; +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.spi.core.protocol.RemotingConnection; @@ -32,7 +35,7 @@ * A SessionClosedOnRemotingConnectionFailureTest * * @author Tim Fox - + */ public class SessionClosedOnRemotingConnectionFailureTest extends UnitTestCase {