Author: borges Date: 2011-10-27 07:39:36 -0400 (Thu, 27 Oct 2011) New Revision: 11609 Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JournalCrashTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageCompressTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java Log: Silence tests Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2011-10-26 14:16:36 UTC (rev 11608) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2011-10-27 11:39:36 UTC (rev 11609) @@ -115,7 +115,6 @@ ArrayList<ClientSession> sessions = new ArrayList<ClientSession>(); for (int i = 0; i < numConsumers; i++) { - System.out.println("created: " + i); ClientSession session1 = sf.createSession(); ClientConsumer consumer = session1.createConsumer("testWindow"); consumers.add(consumer); @@ -131,7 +130,6 @@ ClientMessage sent = senderSession.createMessage(true); sent.putStringProperty("hello", "world"); - System.out.println("sending message"); producer.send(sent); senderSession.commit(); @@ -190,7 +188,6 @@ message = consumer.receiveImmediate(); // message = consumer.receive(1000); // the test will pass if used receive(1000) instead of receiveImmediate assertNotNull(message); - System.out.println(message.getStringProperty("hello")); message.acknowledge(); prod.send(msg); @@ -198,7 +195,6 @@ message = consumer.receive(10000); assertNotNull(message); - System.out.println(message.getStringProperty("hello")); message.acknowledge(); session.close(); @@ -234,7 +230,6 @@ ArrayList<ClientSession> sessions = new ArrayList<ClientSession>(); for (int i = 0; i < numConsumers; i++) { - System.out.println("created: " + i); ClientSession session1 = sf.createSession(); ClientConsumer consumer = session1.createConsumer("testWindow"); consumers.add(consumer); @@ -297,7 +292,6 @@ ArrayList<ClientSession> sessions = new ArrayList<ClientSession>(); for (int i = 0; i < numConsumers; i++) { - System.out.println("created: " + i); ClientSession session1 = sf.createSession(); ClientConsumer consumer = session1.createConsumer("testWindow"); consumers.add(consumer); @@ -916,17 +910,17 @@ { internalTestFlowControlOnRollback(false); } - + public void testFlowControlLargeMessage() throws Exception { internalTestFlowControlOnRollback(true); } - + private void internalTestFlowControlOnRollback(final boolean isLargeMessage) throws Exception { HornetQServer server = createServer(false, isNetty()); - + AddressSettings settings = new AddressSettings(); settings.setMaxDeliveryAttempts(-1); server.getAddressSettingsRepository().addMatch("#", settings); @@ -940,7 +934,7 @@ server.start(); locator.setConsumerWindowSize(300000); - + if (isLargeMessage) { // something to ensure we are using large messages @@ -959,10 +953,10 @@ SimpleString ADDRESS = new SimpleString("some-queue"); session.createQueue(ADDRESS, ADDRESS, true); - - + + ClientProducer producer = session.createProducer(ADDRESS); - + for (int i = 0 ; i < numberOfMessages; i++) { ClientMessage msg = session.createMessage(true); @@ -970,16 +964,15 @@ msg.getBodyBuffer().writeBytes(new byte[1024]); producer.send(msg); } - + session.commit(); - + ClientConsumerInternal consumer = (ClientConsumerInternal)session.createConsumer(ADDRESS); - + session.start(); for (int repeat = 0; repeat < 100; repeat ++) { - System.out.println("Repeat " + repeat); long timeout = System.currentTimeMillis() + 2000; // At least 10 messages on the buffer while (timeout > System.currentTimeMillis() && consumer.getBufferSize() <= 10) @@ -987,20 +980,19 @@ Thread.sleep(10); } assertTrue(consumer.getBufferSize() >= 10); - + ClientMessage msg = consumer.receive(500); msg.getBodyBuffer().readByte(); assertNotNull(msg); msg.acknowledge(); session.rollback(); } - - + + for (int i = 0 ; i < numberOfMessages; i++) { ClientMessage msg = consumer.receive(5000); assertNotNull(msg); - System.out.println("msg " + msg); msg.getBodyBuffer().readByte(); msg.acknowledge(); session.commit(); Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JournalCrashTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JournalCrashTest.java 2011-10-26 14:16:36 UTC (rev 11608) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JournalCrashTest.java 2011-10-27 11:39:36 UTC (rev 11609) @@ -18,7 +18,12 @@ import junit.framework.Assert; import org.hornetq.api.core.SimpleString; -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.ServerLocator; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.journal.PreparedTransactionInfo; @@ -146,8 +151,8 @@ restart.sendMessages(start, end); - System.out.println("....end"); - System.out.flush(); + // System.out.println("....end"); + // System.out.flush(); Runtime.getRuntime().halt(100); } @@ -276,13 +281,13 @@ journal.start(); journal.load(records, transactions, null); - System.out.println("==============================================="); - System.out.println("Journal records at the end:"); - - for (RecordInfo record : records) - { - System.out.println(record.id + ", update = " + record.isUpdate); - } +// System.out.println("==============================================="); +// System.out.println("Journal records at the end:"); +// +// for (RecordInfo record : records) +// { +// System.out.println(record.id + ", update = " + record.isUpdate); +// } journal.stop(); } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageCompressTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageCompressTest.java 2011-10-26 14:16:36 UTC (rev 11608) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageCompressTest.java 2011-10-27 11:39:36 UTC (rev 11609) @@ -28,25 +28,28 @@ import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.client.ServerLocator; import org.hornetq.tests.util.RandomUtil; +import org.hornetq.tests.util.UnitTestCase; /** * A LargeMessageCompressTest * * Just extend the LargeMessageTest - * + * * @author <a href="mailto:hgao@redhat.com">Howard Gao</a> - * * + * */ public class LargeMessageCompressTest extends LargeMessageTest { // Constructors -------------------------------------------------- + @Override protected boolean isNetty() { return false; } + @Override protected ServerLocator createFactory(final boolean isNetty) throws Exception { ServerLocator locator = super.createFactory(isNetty); @@ -85,7 +88,7 @@ ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS); ClientMessage msg1 = consumer.receive(1000); Assert.assertNotNull(msg1); - + for (int i = 0 ; i < messageSize; i++) { byte b = msg1.getBodyBuffer().readByte(); @@ -152,15 +155,15 @@ ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS); ClientMessage msg1 = consumer.receive(1000); Assert.assertNotNull(msg1); - - String testDir = this.getTestDir(); + + String testDir = UnitTestCase.getTestDir(); File testFile = new File(testDir, "async_large_message"); FileOutputStream output = new FileOutputStream(testFile); - + msg1.setOutputStream(output); - msg1.waitOutputStreamCompletion(0); - + msg1.waitOutputStreamCompletion(0); + msg1.acknowledge(); session.commit(); @@ -176,7 +179,7 @@ byte b = (byte)input.read(); assertEquals("position = " + i, getSamplebyte(i), b); } - + testFile.delete(); validateNoFilesOnLargeDir(); } @@ -231,13 +234,13 @@ ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS); ClientMessage msg1 = consumer.receive(1000); Assert.assertNotNull(msg1); - - String testDir = this.getTestDir(); + + String testDir = UnitTestCase.getTestDir(); File testFile = new File(testDir, "async_large_message"); FileOutputStream output = new FileOutputStream(testFile); msg1.saveToOutputStream(output); - + msg1.acknowledge(); session.commit(); @@ -253,7 +256,7 @@ byte b = (byte)input.read(); assertEquals("position = " + i, getSamplebyte(i), b); } - + testFile.delete(); validateNoFilesOnLargeDir(); } @@ -298,7 +301,7 @@ session.createQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS, true); ClientProducer producer = session.createProducer(LargeMessageTest.ADDRESS); - + byte [] msgs = new byte[1024 * 1024]; for (int i = 0 ; i < msgs.length; i++) { @@ -310,23 +313,23 @@ producer.send(clientFile); session.commit(); - + session.close(); - + sf.close(); - + locator.close(); - + server.stop(); - + server = createServer(true, isNetty()); - + server.start(); - + locator = createFactory(isNetty()); - + sf = locator.createSessionFactory(); - + session = sf.createSession(); session.start(); @@ -334,15 +337,15 @@ ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS); ClientMessage msg1 = consumer.receive(1000); Assert.assertNotNull(msg1); - + assertEquals(messageSize, msg1.getBodySize()); - - String testDir = this.getTestDir(); + + String testDir = UnitTestCase.getTestDir(); File testFile = new File(testDir, "async_large_message"); FileOutputStream output = new FileOutputStream(testFile); msg1.saveToOutputStream(output); - + msg1.acknowledge(); session.commit(); @@ -358,7 +361,7 @@ byte b = (byte)input.read(); assertEquals("position = " + i, msgs[i], b); } - + testFile.delete(); validateNoFilesOnLargeDir(); } @@ -383,6 +386,7 @@ } + @Override public void testSendServerMessage() throws Exception { // doesn't make sense as compressed Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java 2011-10-26 14:16:36 UTC (rev 11608) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java 2011-10-27 11:39:36 UTC (rev 11609) @@ -26,7 +26,14 @@ import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; -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.client.impl.ClientConsumerInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; @@ -43,7 +50,7 @@ * A LargeMessageTest * * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * + * * Created 29-Sep-08 4:04:10 PM * * @@ -73,7 +80,7 @@ { return false; } - + public void testRollbackPartiallyConsumedBuffer() throws Exception { for (int i = 0 ; i < 1; i++) @@ -82,28 +89,28 @@ internalTestRollbackPartiallyConsumedBuffer(false); tearDown(); setUp(); - + } - + } - + public void testRollbackPartiallyConsumedBufferWithRedeliveryDelay() throws Exception { internalTestRollbackPartiallyConsumedBuffer(true); } - - + + private void internalTestRollbackPartiallyConsumedBuffer(final boolean redeliveryDelay) throws Exception { final int messageSize = 100 * 1024; - + final ClientSession session; try { server = createServer(true, isNetty()); - + AddressSettings settings = new AddressSettings(); if (redeliveryDelay) { @@ -114,7 +121,7 @@ } } settings.setMaxDeliveryAttempts(-1); - + server.getAddressSettingsRepository().addMatch("#", settings); server.start(); @@ -130,35 +137,35 @@ for (int i = 0 ; i < 20; i++) { Message clientFile = createLargeClientMessage(session, messageSize, true); - + clientFile.putIntProperty("value", i); - + producer.send(clientFile); } session.commit(); session.start(); - + final CountDownLatch latch = new CountDownLatch(1); - + final AtomicInteger errors = new AtomicInteger(0); ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS); - + consumer.setMessageHandler(new MessageHandler() { int counter = 0; public void onMessage(ClientMessage message) { message.getBodyBuffer().readByte(); - System.out.println("message:" + message); + // System.out.println("message:" + message); try { if (counter ++ < 20) { Thread.sleep(100); - System.out.println("Rollback"); + // System.out.println("Rollback"); message.acknowledge(); session.rollback(); } @@ -167,7 +174,7 @@ message.acknowledge(); session.commit(); } - + if (counter == 40) { latch.countDown(); @@ -181,7 +188,7 @@ } } }); - + assertTrue(latch.await(40, TimeUnit.SECONDS)); consumer.close(); @@ -2583,7 +2590,7 @@ } } } - + // JBPAPP-6237 public void testPageOnLargeMessageMultipleQueues() throws Exception { @@ -2779,7 +2786,7 @@ for (int i = 0; i < 100; i++) { ClientMessage message = session.createMessage(true); - + message.putIntProperty("msgID", msgId++); message.putBooleanProperty("TestLarge", false); @@ -2813,34 +2820,34 @@ ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS.concat("-" + ad)); session.start(); - + for (int received = 0 ; received < 5; received++) { for (int i = 0; i < 100; i++) { ClientMessage message2 = consumer.receive(LargeMessageTest.RECEIVE_WAIT_TIME); - + Assert.assertNotNull(message2); - + assertFalse(message2.getBooleanProperty("TestLarge")); - + message2.acknowledge(); - + Assert.assertNotNull(message2); } - + for (int i = 0; i < 10; i++) { ClientMessage messageLarge = consumer.receive(RECEIVE_WAIT_TIME); - + Assert.assertNotNull(messageLarge); - + assertTrue(messageLarge.getBooleanProperty("TestLarge")); - + ByteArrayOutputStream bout = new ByteArrayOutputStream(); - + messageLarge.acknowledge(); - + messageLarge.saveToOutputStream(bout); byte[] body = bout.toByteArray(); assertEquals(numberOfBytesBigMessage, body.length); @@ -2849,7 +2856,7 @@ assertEquals(getSamplebyte(bi), body[bi]); } } - + session.rollback(); } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2011-10-26 14:16:36 UTC (rev 11608) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2011-10-27 11:39:36 UTC (rev 11609) @@ -1087,6 +1087,7 @@ class ConsumerThread extends Thread { + @Override public void run() { try @@ -1137,6 +1138,7 @@ { this.nmsg = nmsg; } + @Override public void run() { ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(server0tc); @@ -1204,7 +1206,6 @@ for (int repeat = 0 ; repeat < totalrepeats; repeat++) { - System.out.println("Repeat " + repeat); ArrayList<Thread> threads = new ArrayList<Thread>(); threads.add(new ConsumerThread());