[jboss-cvs] JBoss Messaging SVN: r4306 - in trunk: tests/jms-tests/src/org/jboss/test/messaging and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 27 10:01:13 EDT 2008
Author: timfox
Date: 2008-05-27 10:01:13 -0400 (Tue, 27 May 2008)
New Revision: 4306
Modified:
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueTest.java
Log:
Fixed tests
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java 2008-05-27 13:48:48 UTC (rev 4305)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java 2008-05-27 14:01:13 UTC (rev 4306)
@@ -89,7 +89,7 @@
response = createConnectionResponse;
}
- else if(type == EmptyPacket.PONG)
+ else if (type == EmptyPacket.PONG)
{
Pong decodedPong = (Pong) packet;
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2008-05-27 13:48:48 UTC (rev 4305)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2008-05-27 14:01:13 UTC (rev 4306)
@@ -366,6 +366,7 @@
public synchronized int getMessageCount()
{
+ //log.info("mr: " + messageReferences.size() + " sc:" + getScheduledCount() + " dc:" + getDeliveringCount());
return messageReferences.size() + getScheduledCount()
+ getDeliveringCount();
}
@@ -490,7 +491,7 @@
private HandleStatus add(final MessageReference ref, final boolean first)
{
- if (maxSizeBytes != -1 && sizeBytes.get() >= maxSizeBytes)
+ if (maxSizeBytes != -1 && sizeBytes.get() + ref.getMessage().encodeSize() >= maxSizeBytes)
{
return HandleStatus.BUSY;
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2008-05-27 13:48:48 UTC (rev 4305)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2008-05-27 14:01:13 UTC (rev 4306)
@@ -716,8 +716,6 @@
protected boolean assertRemainingMessages(int expected) throws Exception
{
- sleepIfRemoting(500);
-
Integer messageCount = servers.get(0).getMessageCountForQueue("Queue1");
assertEquals(expected, messageCount.intValue());
@@ -952,25 +950,5 @@
log.info("server " + i + " killed and dead");
}
- }
-
-
- /**
- * Sleeps a little if invm optimization is disabled for remoting.
- *
- * This little sleep is necessary due to the async behavior of our remoting code.
- * If we send non-durable messages and checks immediately that
- * they've been received on the server, it may fail since these
- * messages are sent asynchronously.
- *
- * @param time sleep time in milliseconds
- */
- protected void sleepIfRemoting(int time) throws Exception
- {
- Configuration config = servers.get(0).getMessagingServer().getRemotingService().getConfiguration();
- if (config.getTransport() == TransportType.TCP)
- {
- Thread.sleep(time);
- }
- }
+ }
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java 2008-05-27 13:48:48 UTC (rev 4305)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java 2008-05-27 14:01:13 UTC (rev 4306)
@@ -948,7 +948,7 @@
listener.waitForMessages();
Thread.sleep(500);
-
+
assertRemainingMessages(0);
assertFalse(listener.failed);
@@ -1078,7 +1078,8 @@
listener.waitForMessages();
- assertRemainingMessages(3);
+ //Recover forces an ack so there will be one
+ assertRemainingMessages(1);
conn.close();
@@ -1212,7 +1213,8 @@
public void waitForMessages() throws InterruptedException
{
- assertTrue("failed to receive all messages", latch.attempt(2000));
+ assertTrue("failed to receive all messages", latch.attempt(
+ 2000));
}
public abstract void onMessage(Message m);
@@ -1307,6 +1309,8 @@
count++;
TextMessage tm = (TextMessage) m;
+
+ log.info("got message " + tm.getText());
// Receive first three messages then recover() session
// Only last message should be redelivered
@@ -1343,7 +1347,8 @@
}
if (count == 4)
{
- assertRemainingMessages(3);
+ //Recover forces an ack, so there will be only one left
+ assertRemainingMessages(1);
if (!"c".equals(tm.getText()))
{
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueTest.java 2008-05-27 13:48:48 UTC (rev 4305)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueTest.java 2008-05-27 14:01:13 UTC (rev 4306)
@@ -505,13 +505,13 @@
cons1.getReferences().clear();
- refs.clear();
-
for (MessageReference ref: refs)
{
queue.referenceAcknowledged(ref);
}
+ refs.clear();
+
for (int i = 0; i < 2 * numMessages; i++)
{
MessageReference ref = generateReference(queue, i);
@@ -820,46 +820,57 @@
public void testMaxSize()
{
- final int maxSize = 20;
+ final int maxSize = 10 * 1024;
Queue queue = new QueueImpl(1, queue1, null, false, true, false, maxSize, scheduledExecutor);
List<MessageReference> refs = new ArrayList<MessageReference>();
- for (int i = 0; i < maxSize; i++)
+ int size = 0;
+
+ int i = 0;
+ while (true)
{
- MessageReference ref = generateReference(queue, i);
+ MessageReference ref = generateReference(queue, i++);
+
+ if (size + ref.getMessage().encodeSize() > maxSize)
+ {
+ break;
+ }
+ size += ref.getMessage().encodeSize();
+
refs.add(ref);
assertEquals(HandleStatus.HANDLED, queue.addLast(ref));
}
- assertEquals(maxSize, queue.getMessageCount());
- assertEquals(0, queue.getScheduledCount());
- assertEquals(0, queue.getDeliveringCount());
-
+ assertEquals(maxSize, queue.getMaxSizeBytes());
+ assertEquals(size, queue.getSizeBytes());
+
//Try to add more
- for (int i = 0; i < 10; i++)
+ for (int j = 0; j < 10; j++)
{
- MessageReference ref = generateReference(queue, i);
+ MessageReference ref = generateReference(queue, j);
assertEquals(HandleStatus.BUSY, queue.addLast(ref));
}
- assertEquals(maxSize, queue.getMessageCount());
- assertEquals(0, queue.getScheduledCount());
- assertEquals(0, queue.getDeliveringCount());
-
+ assertEquals(maxSize, queue.getMaxSizeBytes());
+ assertEquals(size, queue.getSizeBytes());
+
// Try to add at front too
- for (int i = 0; i < 10; i++)
+ for (int j = 0; j < 10; j++)
{
MessageReference ref = generateReference(queue, i);
assertEquals(HandleStatus.BUSY, queue.addLast(ref));
- }
+ }
+
+ assertEquals(maxSize, queue.getMaxSizeBytes());
+ assertEquals(size, queue.getSizeBytes());
}
public void testWithPriorities()
More information about the jboss-cvs-commits
mailing list