[jboss-cvs] JBoss Messaging SVN: r5208 - in branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests: stress/chunk and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 29 12:55:19 EDT 2008
Author: clebert.suconic at jboss.com
Date: 2008-10-29 12:55:18 -0400 (Wed, 29 Oct 2008)
New Revision: 5208
Added:
branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java
Modified:
branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/stress/chunk/MessageChunkStressTest.java
Log:
Separating stress tests from chunk-test
Added: branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java
===================================================================
--- branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java (rev 0)
+++ branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java 2008-10-29 16:55:18 UTC (rev 5208)
@@ -0,0 +1,375 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+
+package org.jboss.messaging.tests.integration.chunkmessage;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+
+import org.jboss.messaging.core.client.ClientConsumer;
+import org.jboss.messaging.core.client.ClientMessage;
+import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.client.ClientSessionFactory;
+import org.jboss.messaging.core.client.FileClientMessage;
+import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
+import org.jboss.messaging.tests.util.ServiceTestBase;
+import org.jboss.messaging.util.DataConstants;
+import org.jboss.messaging.util.SimpleString;
+
+/**
+ * A ChunkTestBase
+ *
+ * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ *
+ * Created Oct 29, 2008 11:43:52 AM
+ *
+ *
+ */
+public class ChunkTestBase extends ServiceTestBase
+{
+
+
+ // Constants -----------------------------------------------------
+ private static final Logger log = Logger.getLogger(ChunkTestBase.class);
+
+ protected final SimpleString ADDRESS = new SimpleString("SimpleAddress");
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ protected void testChunks(final boolean realFiles,
+ final boolean useFile,
+ final int numberOfMessages,
+ final int numberOfIntegers,
+ final boolean sendingBlocking,
+ final int waitOnConsumer,
+ final long delayDelivery) throws Exception
+ {
+
+ clearData();
+
+ messagingService = createService(realFiles);
+ messagingService.start();
+
+ try
+ {
+ ClientSessionFactory sf = createInVMFactory();
+
+ if (sendingBlocking)
+ {
+ sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnAcknowledge(true);
+ }
+
+ ClientSession session = sf.createSession(false, true, true, false);
+
+ session.createQueue(ADDRESS, ADDRESS, null, true, false);
+
+ ClientProducer producer = session.createProducer(ADDRESS);
+
+ if (useFile)
+ {
+ File tmpData = createLargeFile(temporaryDir, "someFile.dat", numberOfIntegers);
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ ClientMessage message = session.createFileMessage(true);
+ ((FileClientMessage)message).setFile(tmpData);
+ message.putIntProperty(new SimpleString("counter-message"), i);
+ if (delayDelivery > 0)
+ {
+ message.putLongProperty(new SimpleString("original-time"), System.currentTimeMillis());
+ producer.send(message, System.currentTimeMillis() + delayDelivery);
+ }
+ else
+ {
+ producer.send(message);
+ }
+ }
+ }
+ else
+ {
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ ClientMessage message = session.createClientMessage(true);
+ message.putIntProperty(new SimpleString("counter-message"), i);
+ message.setBody(createLargeBuffer(numberOfIntegers));
+ if (delayDelivery > 0)
+ {
+ message.putLongProperty(new SimpleString("original-time"), System.currentTimeMillis());
+ producer.send(message, System.currentTimeMillis() + delayDelivery);
+ }
+ else
+ {
+ producer.send(message);
+ }
+ }
+ }
+
+
+ session.close();
+
+ if (realFiles)
+ {
+ messagingService.stop();
+
+ messagingService = createService(realFiles);
+ messagingService.start();
+
+ sf = createInVMFactory();
+ }
+
+ session = sf.createSession(false, true, true, false);
+
+ ClientConsumer consumer = null;
+
+ if (realFiles)
+ {
+ consumer = session.createFileConsumer(new File(clientLargeMessagesDir), ADDRESS);
+ }
+ else
+ {
+ consumer = session.createConsumer(ADDRESS);
+ }
+
+ session.start();
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ ClientMessage message = consumer.receive(waitOnConsumer + delayDelivery);
+
+ assertNotNull(message);
+
+
+ if (delayDelivery > 0)
+ {
+ long originalTime = (Long)message.getProperty(new SimpleString("original-time"));
+ assertTrue("difference = "+ (System.currentTimeMillis() - originalTime), System.currentTimeMillis() - originalTime >= delayDelivery);
+ }
+
+ message.acknowledge();
+
+ assertNotNull(message);
+
+ System.out.println("msg on client = " + message.getMessageID());
+
+
+ if (delayDelivery <= 0)
+ { // right now there is no guarantee of ordered delivered on multiple scheduledMessages
+ assertEquals(i, ((Integer)message.getProperty(new SimpleString("counter-message"))).intValue());
+ }
+
+ if (message instanceof FileClientMessage)
+ {
+ checkFileRead(((FileClientMessage)message).getFile(), numberOfIntegers);
+ }
+ else
+ {
+ MessagingBuffer buffer = message.getBody();
+ buffer.rewind();
+ assertEquals(numberOfIntegers * DataConstants.SIZE_INT, buffer.limit());
+ for (int b = 0; b < numberOfIntegers; b++)
+ {
+ assertEquals(b, buffer.getInt());
+ }
+ }
+ }
+
+ session.close();
+
+ File largemsgsFile = new File(this.largeMessagesDir);
+ assertEquals(0, largemsgsFile.list().length);
+ }
+ finally
+ {
+ try
+ {
+ messagingService.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+ }
+
+ protected MessagingBuffer createLargeBuffer(int numberOfIntegers)
+ {
+ ByteBuffer ioBuffer = ByteBuffer.allocate(DataConstants.SIZE_INT * numberOfIntegers);
+ MessagingBuffer body = new ByteBufferWrapper(ioBuffer);
+
+ for (int i = 0; i < numberOfIntegers; i++)
+ {
+ body.putInt(i);
+ }
+ body.flip();
+
+ return body;
+
+ }
+
+ protected FileClientMessage createLargeClientMessage(final ClientSession session, final int numberOfIntegers) throws Exception
+ {
+
+ FileClientMessage clientMessage = session.createFileMessage(true);
+
+ File tmpFile = createLargeFile(temporaryDir, "tmpUpload.data", numberOfIntegers);
+
+ clientMessage.setFile(tmpFile);
+
+ return clientMessage;
+ }
+
+ /**
+ * @param name
+ * @param numberOfIntegers
+ * @return
+ * @throws FileNotFoundException
+ * @throws IOException
+ */
+ protected File createLargeFile(String directory, String name, final int numberOfIntegers) throws FileNotFoundException, IOException
+ {
+ File tmpFile = new File(directory + "/" + name);
+
+ log.info("Creating file " + tmpFile);
+
+ RandomAccessFile random = new RandomAccessFile(tmpFile, "rw");
+ FileChannel channel = random.getChannel();
+
+ ByteBuffer buffer = ByteBuffer.allocate(4 * 1000);
+
+ for (int i = 0; i < numberOfIntegers; i++)
+ {
+ if (buffer.position() > 0 && i % 1000 == 0)
+ {
+ buffer.flip();
+ channel.write(buffer);
+ buffer.clear();
+ }
+ buffer.putInt(i);
+ }
+
+ if (buffer.position() > 0)
+ {
+ buffer.flip();
+ channel.write(buffer);
+ }
+
+ channel.close();
+ random.close();
+
+ log.info("file " + tmpFile + " created");
+
+ return tmpFile;
+ }
+
+ /**
+ * @param session
+ * @param queueToRead
+ * @param numberOfIntegers
+ * @throws MessagingException
+ * @throws FileNotFoundException
+ * @throws IOException
+ */
+ protected void readMessage(final ClientSession session, final SimpleString queueToRead, final int numberOfIntegers) throws MessagingException,
+ FileNotFoundException,
+ IOException
+ {
+ session.start();
+
+ ClientConsumer consumer = session.createFileConsumer(new File(clientLargeMessagesDir), queueToRead);
+
+ ClientMessage clientMessage = consumer.receive(100000);
+
+ if (!(clientMessage instanceof FileClientMessage))
+ {
+ System.out.println("Size = " + clientMessage.getBodySize());
+ }
+
+ assertTrue(clientMessage instanceof FileClientMessage);
+
+ FileClientMessage fileClientMessage = (FileClientMessage)clientMessage;
+
+ assertNotNull(fileClientMessage);
+ File receivedFile = fileClientMessage.getFile();
+
+ checkFileRead(receivedFile, numberOfIntegers);
+
+ clientMessage.acknowledge();
+
+ consumer.close();
+ }
+
+ /**
+ * @param receivedFile
+ * @throws FileNotFoundException
+ * @throws IOException
+ */
+ protected void checkFileRead(final File receivedFile, final int numberOfIntegers) throws FileNotFoundException,
+ IOException
+ {
+ RandomAccessFile random2 = new RandomAccessFile(receivedFile, "r");
+ FileChannel channel2 = random2.getChannel();
+
+ ByteBuffer buffer2 = ByteBuffer.allocate(1000 * 4);
+
+ channel2.position(0l);
+
+ for (int i = 0; i < numberOfIntegers;)
+ {
+ channel2.read(buffer2);
+
+ buffer2.flip();
+ for (int j = 0; j < buffer2.limit() / 4; j++, i++)
+ {
+ assertEquals(i, buffer2.getInt());
+ }
+
+ buffer2.clear();
+ }
+
+ channel2.close();
+ }
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
Modified: branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
===================================================================
--- branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java 2008-10-29 16:54:50 UTC (rev 5207)
+++ branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java 2008-10-29 16:55:18 UTC (rev 5208)
@@ -23,11 +23,7 @@
package org.jboss.messaging.tests.integration.chunkmessage;
import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
@@ -52,7 +48,6 @@
import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.tests.integration.chunkmessage.mock.MockConnector;
import org.jboss.messaging.tests.integration.chunkmessage.mock.MockConnectorFactory;
-import org.jboss.messaging.tests.util.ServiceTestBase;
import org.jboss.messaging.util.DataConstants;
import org.jboss.messaging.util.SimpleString;
@@ -65,14 +60,14 @@
*
*
*/
-public class MessageChunkTest extends ServiceTestBase
+public class MessageChunkTest extends ChunkTestBase
{
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- private static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
+ static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
// Static --------------------------------------------------------
private static final Logger log = Logger.getLogger(MessageChunkTest.class);
@@ -225,69 +220,64 @@
public void testMessageChunkNullPersistence() throws Exception
{
- testInternal(false, false, 1, 50000, false, 1000, 0);
+ testChunks(false, false, 1, 50000, false, 1000, 0);
}
public void testMessageChunkNullPersistenceDelayed() throws Exception
{
- testInternal(false, false, 100, 50000, false, 10000, 100);
+ testChunks(false, false, 100, 50000, false, 10000, 100);
}
public void testMessageChunkFilePersistence() throws Exception
{
- testInternal(true, false, 100, 262144, false, 1000, 0);
+ testChunks(true, false, 100, 262144, false, 1000, 0);
}
- public void testMessageChunkFilePersistence100M() throws Exception
- {
- testInternal(true, true, 1, 26214400, false, 1000, 0);
- }
-
public void testMessageChunkFilePersistenceDelayed() throws Exception
{
- testInternal(true, false, 1, 50000, false, 1000, 2000);
+ testChunks(true, false, 1, 50000, false, 1000, 2000);
}
public void testSendfileMessage() throws Exception
{
- testInternal(true, true, 100, 50000, false, 1000, 0);
+ testChunks(true, true, 100, 50000, false, 1000, 0);
}
public void testSendfileMessageOnNullPersistence() throws Exception
{
- testInternal(false, true, 100, 50000, false, 1000, 0);
+ testChunks(false, true, 100, 50000, false, 1000, 0);
}
public void testSendfileMessageSmallMessage() throws Exception
{
- testInternal(true, true, 100, 4, false, 1000, 0);
+ testChunks(true, true, 100, 4, false, 1000, 0);
}
public void testSendfileMessageOnNullPersistenceSmallMessage() throws Exception
{
- testInternal(false, true, 100, 100, false, 1000, 0);
+ testChunks(false, true, 100, 100, false, 1000, 0);
}
public void testSendRegularMessageNullPersistence() throws Exception
{
- testInternal(false, false, 100, 100, false, 1000, 0);
+ testChunks(false, false, 100, 100, false, 1000, 0);
}
public void testSendRegularMessageNullPersistenceDelayed() throws Exception
{
- testInternal(false, false, 100, 100, false, 1000, 1000);
+ testChunks(false, false, 100, 100, false, 1000, 1000);
}
public void testSendRegularMessagePersistence() throws Exception
{
- testInternal(true, false, 100, 100, false, 1000, 0);
+ testChunks(true, false, 100, 100, false, 1000, 0);
}
public void testSendRegularMessagePersistenceDelayed() throws Exception
{
- testInternal(true, false, 100, 100, false, 1000, 1000);
+ testChunks(true, false, 100, 100, false, 1000, 1000);
}
public void testTwoBindingsOneAckAndrestart() throws Exception
@@ -514,177 +504,6 @@
}
- private MessagingBuffer createLargeBuffer(int numberOfIntegers)
- {
- ByteBuffer ioBuffer = ByteBuffer.allocate(DataConstants.SIZE_INT * numberOfIntegers);
- MessagingBuffer body = new ByteBufferWrapper(ioBuffer);
-
- for (int i = 0; i < numberOfIntegers; i++)
- {
- body.putInt(i);
- }
- body.flip();
-
- return body;
-
- }
-
- protected void testInternal(final boolean realFiles,
- final boolean useFile,
- final int numberOfMessages,
- final int numberOfIntegers,
- final boolean sendingBlocking,
- final int waitOnConsumer,
- final long delayDelivery) throws Exception
- {
-
- clearData();
-
- messagingService = createService(realFiles);
- messagingService.start();
-
- try
- {
- ClientSessionFactory sf = createInVMFactory();
-
- if (sendingBlocking)
- {
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
- sf.setBlockOnAcknowledge(true);
- }
-
- ClientSession session = sf.createSession(false, true, true, false);
-
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
-
- ClientProducer producer = session.createProducer(ADDRESS);
-
- if (useFile)
- {
- File tmpData = createLargeFile(temporaryDir, "someFile.dat", numberOfIntegers);
-
- for (int i = 0; i < numberOfMessages; i++)
- {
- ClientMessage message = session.createFileMessage(true);
- ((FileClientMessage)message).setFile(tmpData);
- message.putIntProperty(new SimpleString("counter-message"), i);
- if (delayDelivery > 0)
- {
- message.putLongProperty(new SimpleString("original-time"), System.currentTimeMillis());
- producer.send(message, System.currentTimeMillis() + delayDelivery);
- }
- else
- {
- producer.send(message);
- }
- }
- }
- else
- {
- for (int i = 0; i < numberOfMessages; i++)
- {
- ClientMessage message = session.createClientMessage(true);
- message.putIntProperty(new SimpleString("counter-message"), i);
- message.setBody(createLargeBuffer(numberOfIntegers));
- if (delayDelivery > 0)
- {
- message.putLongProperty(new SimpleString("original-time"), System.currentTimeMillis());
- producer.send(message, System.currentTimeMillis() + delayDelivery);
- }
- else
- {
- producer.send(message);
- }
- }
- }
-
-
- session.close();
-
- if (realFiles)
- {
- messagingService.stop();
-
- messagingService = createService(realFiles);
- messagingService.start();
-
- sf = createInVMFactory();
- }
-
- session = sf.createSession(false, true, true, false);
-
- ClientConsumer consumer = null;
-
- if (realFiles)
- {
- consumer = session.createFileConsumer(new File(clientLargeMessagesDir), ADDRESS);
- }
- else
- {
- consumer = session.createConsumer(ADDRESS);
- }
-
- session.start();
-
- for (int i = 0; i < numberOfMessages; i++)
- {
- ClientMessage message = consumer.receive(waitOnConsumer + delayDelivery);
-
- assertNotNull(message);
-
-
- if (delayDelivery > 0)
- {
- long originalTime = (Long)message.getProperty(new SimpleString("original-time"));
- assertTrue("difference = "+ (System.currentTimeMillis() - originalTime), System.currentTimeMillis() - originalTime >= delayDelivery);
- }
-
- message.acknowledge();
-
- assertNotNull(message);
-
- System.out.println("msg on client = " + message.getMessageID());
-
-
- if (delayDelivery <= 0)
- { // right now there is no guarantee of ordered delivered on multiple scheduledMessages
- assertEquals(i, ((Integer)message.getProperty(new SimpleString("counter-message"))).intValue());
- }
-
- if (message instanceof FileClientMessage)
- {
- checkFileRead(((FileClientMessage)message).getFile(), numberOfIntegers);
- }
- else
- {
- MessagingBuffer buffer = message.getBody();
- buffer.rewind();
- assertEquals(numberOfIntegers * DataConstants.SIZE_INT, buffer.limit());
- for (int b = 0; b < numberOfIntegers; b++)
- {
- assertEquals(b, buffer.getInt());
- }
- }
- }
-
- session.close();
-
- File largemsgsFile = new File(this.largeMessagesDir);
- assertEquals(0, largemsgsFile.list().length);
- }
- finally
- {
- try
- {
- messagingService.stop();
- }
- catch (Throwable ignored)
- {
- }
- }
- }
-
@Override
protected void setUp() throws Exception
{
@@ -695,129 +514,6 @@
{
}
- protected FileClientMessage createLargeClientMessage(final ClientSession session, final int numberOfIntegers) throws Exception
- {
-
- FileClientMessage clientMessage = session.createFileMessage(true);
-
- File tmpFile = createLargeFile(temporaryDir, "tmpUpload.data", numberOfIntegers);
-
- clientMessage.setFile(tmpFile);
-
- return clientMessage;
- }
-
- /**
- * @param name
- * @param numberOfIntegers
- * @return
- * @throws FileNotFoundException
- * @throws IOException
- */
- protected File createLargeFile(String directory, String name, final int numberOfIntegers) throws FileNotFoundException, IOException
- {
- File tmpFile = new File(directory + "/" + name);
-
- log.info("Creating file " + tmpFile);
-
- RandomAccessFile random = new RandomAccessFile(tmpFile, "rw");
- FileChannel channel = random.getChannel();
-
- ByteBuffer buffer = ByteBuffer.allocate(4 * 1000);
-
- for (int i = 0; i < numberOfIntegers; i++)
- {
- if (buffer.position() > 0 && i % 1000 == 0)
- {
- buffer.flip();
- channel.write(buffer);
- buffer.clear();
- }
- buffer.putInt(i);
- }
-
- if (buffer.position() > 0)
- {
- buffer.flip();
- channel.write(buffer);
- }
-
- channel.close();
- random.close();
-
- log.info("file " + tmpFile + " created");
-
- return tmpFile;
- }
-
- /**
- * @param session
- * @param queueToRead
- * @param numberOfIntegers
- * @throws MessagingException
- * @throws FileNotFoundException
- * @throws IOException
- */
- protected void readMessage(final ClientSession session, final SimpleString queueToRead, final int numberOfIntegers) throws MessagingException,
- FileNotFoundException,
- IOException
- {
- session.start();
-
- ClientConsumer consumer = session.createFileConsumer(new File(clientLargeMessagesDir), queueToRead);
-
- ClientMessage clientMessage = consumer.receive(100000);
-
- if (!(clientMessage instanceof FileClientMessage))
- {
- System.out.println("Size = " + clientMessage.getBodySize());
- }
-
- assertTrue(clientMessage instanceof FileClientMessage);
-
- FileClientMessage fileClientMessage = (FileClientMessage)clientMessage;
-
- assertNotNull(fileClientMessage);
- File receivedFile = fileClientMessage.getFile();
-
- checkFileRead(receivedFile, numberOfIntegers);
-
- clientMessage.acknowledge();
-
- consumer.close();
- }
-
- /**
- * @param receivedFile
- * @throws FileNotFoundException
- * @throws IOException
- */
- protected void checkFileRead(final File receivedFile, final int numberOfIntegers) throws FileNotFoundException,
- IOException
- {
- RandomAccessFile random2 = new RandomAccessFile(receivedFile, "r");
- FileChannel channel2 = random2.getChannel();
-
- ByteBuffer buffer2 = ByteBuffer.allocate(1000 * 4);
-
- channel2.position(0l);
-
- for (int i = 0; i < numberOfIntegers;)
- {
- channel2.read(buffer2);
-
- buffer2.flip();
- for (int j = 0; j < buffer2.limit() / 4; j++, i++)
- {
- assertEquals(i, buffer2.getInt());
- }
-
- buffer2.clear();
- }
-
- channel2.close();
- }
-
// Private -------------------------------------------------------
// Inner classes -------------------------------------------------
Modified: branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/stress/chunk/MessageChunkStressTest.java
===================================================================
--- branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/stress/chunk/MessageChunkStressTest.java 2008-10-29 16:54:50 UTC (rev 5207)
+++ branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/stress/chunk/MessageChunkStressTest.java 2008-10-29 16:55:18 UTC (rev 5208)
@@ -22,7 +22,7 @@
package org.jboss.messaging.tests.stress.chunk;
-import org.jboss.messaging.tests.integration.chunkmessage.MessageChunkTest;
+import org.jboss.messaging.tests.integration.chunkmessage.ChunkTestBase;
/**
* A MessageChunkStressTest
@@ -33,7 +33,7 @@
*
*
*/
-public class MessageChunkStressTest extends MessageChunkTest
+public class MessageChunkStressTest extends ChunkTestBase
{
// Constants -----------------------------------------------------
@@ -48,13 +48,12 @@
public void testMessageChunkFilePersistence1G() throws Exception
{
- testInternal(true, true, 2, 268435456, false, 120000, 0);
+ testChunks(true, true, 2, 268435456, false, 120000, 0);
}
- @Override
public void testMessageChunkFilePersistence100M() throws Exception
{
- testInternal(true, true, 10, 26214400, false, 120000, 0);
+ testChunks(true, true, 10, 26214400, false, 120000, 0);
}
// Package protected ---------------------------------------------
More information about the jboss-cvs-commits
mailing list