[jboss-cvs] JBoss Messaging SVN: r2227 - branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 8 21:30:39 EST 2007
Author: ovidiu.feodorov at jboss.com
Date: 2007-02-08 21:30:39 -0500 (Thu, 08 Feb 2007)
New Revision: 2227
Modified:
branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java
branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java
branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java
Log:
increasing sleep times while waiting for async cancelling. http://jira.jboss.org/jira/browse/JBMESSAGING-821
Modified: branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
===================================================================
--- branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2007-02-09 00:55:40 UTC (rev 2226)
+++ branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2007-02-09 02:30:39 UTC (rev 2227)
@@ -418,7 +418,6 @@
Thread.sleep(500);
}
-
protected List getReferenceIds(long channelId) throws Exception
{
InitialContext ctx = new InitialContext();
Modified: branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java
===================================================================
--- branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java 2007-02-09 00:55:40 UTC (rev 2226)
+++ branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java 2007-02-09 02:30:39 UTC (rev 2227)
@@ -830,7 +830,7 @@
}
//Cancel is asynch, so need to wait a bit
- Thread.sleep(250);
+ Thread.sleep(500);
//This should cause the refs corresponding to the deliveries to go the front of the in memory quuee
//and the oldest refs in memory evicted off the end into the down cache
@@ -866,7 +866,7 @@
}
// Cancel is asynch, so need to wait a bit
- Thread.sleep(250);
+ Thread.sleep(500);
//This should cause the down cache to be flushed
@@ -903,7 +903,7 @@
}
// Cancel is asynch, so need to wait a bit
- Thread.sleep(250);
+ Thread.sleep(500);
//This should cause the down cache to be flushed
Modified: branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java
===================================================================
--- branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java 2007-02-09 00:55:40 UTC (rev 2226)
+++ branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java 2007-02-09 02:30:39 UTC (rev 2227)
@@ -51,14 +51,13 @@
super(name);
}
- // Public --------------------------------------------------------
+ // Public ---------------------------------------------------------------------------------------
public void setUp() throws Exception
{
super.setUp();
}
-
-
+
public void tearDown() throws Exception
{
super.tearDown();
@@ -68,12 +67,11 @@
{
ChannelSupport queue = new Queue(1, ms, pm, null, true, 100, 20, 10, new QueuedExecutor());
+ MessageReference[] refs = new MessageReference[241];
Message[] msgs = new Message[241];
+
+ // send 99
- MessageReference[] refs = new MessageReference[241];
-
- //Send 99
-
for (int i = 0; i < 99; i++)
{
msgs[i] = MessageFactory.createCoreMessage(i, false, null);
@@ -82,63 +80,64 @@
refs[i].releaseMemoryReference();
}
- //verify no refs in storage
+ // verify no refs in storage
List refIds = getReferenceIds(queue.getChannelID());
assertTrue(refIds.isEmpty());
- //Verify no msgs in storage
+ // verify no msgs in storage
List msgIds = getMessageIds();
assertTrue(msgIds.isEmpty());
- //Verify 99 msgs in store
+ // verify 99 msgs in store
assertEquals(99, ms.size());
- //Verify 99 refs in queue
+ // verify 99 refs in queue
assertEquals(99, queue.memoryRefCount());
- //Verify 0 refs in downcache
+ // verify 0 refs in downcache
assertEquals(0, queue.downCacheCount());
- //Verify not paging
+ // verify not paging
assertFalse(queue.isPaging());
- //Verify no deliveries
+ // verify no deliveries
assertEquals(0, queue.memoryDeliveryCount());
+
+ // send one more ref
-
- //Send one more ref
-
msgs[99] = MessageFactory.createCoreMessage(99, false, null);
refs[99] = ms.reference(msgs[99]);
+
queue.handle(null, refs[99], null);
+
refs[99].releaseMemoryReference();
- //verify no refs in storage
+ // verify no refs in storage
refIds = getReferenceIds(queue.getChannelID());
assertTrue(refIds.isEmpty());
- //Verify no msgs in storage
+ // verify no msgs in storage
msgIds = getMessageIds();
assertTrue(msgIds.isEmpty());
- //Verify 100 msgs in store
+ // verify 100 msgs in store
assertEquals(100, ms.size());
- //Verify 100 refs in queue
+ // verify 100 refs in queue
assertEquals(100, queue.memoryRefCount());
- //Verify 0 refs in downcache
+ // verify 0 refs in downcache
assertEquals(0, queue.downCacheCount());
- //Verify paging
+ // verify queue is paging
assertTrue(queue.isPaging());
- //Verify no deliveries
+ // verify no deliveries
assertEquals(0, queue.memoryDeliveryCount());
- //Send 9 more
+ // send 9 more
for (int i = 100; i < 109; i++)
{
@@ -148,105 +147,99 @@
refs[i].releaseMemoryReference();
}
- //verify no refs in storage
+ // verify no refs in storage
refIds = getReferenceIds(queue.getChannelID());
assertTrue(refIds.isEmpty());
- //Verify no msgs in storage
+ // verify no msgs in storage
msgIds = getMessageIds();
assertTrue(msgIds.isEmpty());
- //Verify 100 msgs in store
+ // verify 109 msgs in store
assertEquals(109, ms.size());
- //Verify 100 refs in queue
+ // verify 100 refs in queue
assertEquals(100, queue.memoryRefCount());
- //Verify 9 refs in downcache
+ // verify 9 refs in downcache
assertEquals(9, queue.downCacheCount());
- //Verify paging
+ // verify paging
assertTrue(queue.isPaging());
- //Verify no deliveries
+ // verify no deliveries
assertEquals(0, queue.memoryDeliveryCount());
-
+
+ // send one more ref - should clear the down cache
-
-
- //Send one more ref - should clear the down cache
-
msgs[109] = MessageFactory.createCoreMessage(109, false, null);
refs[109] = ms.reference(msgs[109]);
queue.handle(null, refs[109], null);
refs[109].releaseMemoryReference();
- //verify 10 refs in storage
-
+ // verify 10 refs in storage
refIds = getReferenceIds(queue.getChannelID());
assertEquals(10, refIds.size());
assertSameIds(refIds, refs, 100, 109);
- //Verify 10 msgs in storage
+ // verify 10 msgs in storage
msgIds = getMessageIds();
assertEquals(10, msgIds.size());
assertSameIds(msgIds, refs, 100, 109);
- //Verify 100 msgs in store
+ // verify 100 msgs in store
assertEquals(100, ms.size());
- //Verify 100 refs in queue
+ // verify 100 refs in queue
assertEquals(100, queue.memoryRefCount());
- //Verify 0 refs in downcache
+ // verify 0 refs in downcache
assertEquals(0, queue.downCacheCount());
- //Verify paging
+ // verify paging
assertTrue(queue.isPaging());
- //Verify no deliveries
+ // verify no deliveries
assertEquals(0, queue.memoryDeliveryCount());
-
+
+ // send one more ref
-
- //Send one more ref
-
msgs[110] = MessageFactory.createCoreMessage(110, false, null);
refs[110] = ms.reference(msgs[110]);
+
queue.handle(null, refs[110], null);
+
refs[110].releaseMemoryReference();
- //verify 10 refs in storage
+ // verify 10 refs in storage
refIds = getReferenceIds(queue.getChannelID());
assertEquals(10, refIds.size());
assertSameIds(refIds, refs, 100, 109);
- //Verify 10 msgs in storage
+ // verify 10 msgs in storage
msgIds = getMessageIds();
assertEquals(10, msgIds.size());
assertSameIds(msgIds, refs, 100, 109);
- //Verify 101 msgs in store
+ // verify 101 msgs in store
assertEquals(101, ms.size());
- //Verify 100 refs in queue
+ // verify 100 refs in queue
assertEquals(100, queue.memoryRefCount());
- //Verify 1 refs in downcache
+ // verify 1 refs in downcache
assertEquals(1, queue.downCacheCount());
- //Verify paging
+ // verify paging
assertTrue(queue.isPaging());
- //Verify no deliveries
+ // verify no deliveries
assertEquals(0, queue.memoryDeliveryCount());
-
+
+ // send 9 more refs
-
- //Send 9 more refs
-
for (int i = 111; i < 120; i++)
{
msgs[i] = MessageFactory.createCoreMessage(i, false, null);
@@ -255,37 +248,34 @@
refs[i].releaseMemoryReference();
}
- //verify 20 refs in storage
+ // verify 20 refs in storage
refIds = getReferenceIds(queue.getChannelID());
assertEquals(20, refIds.size());
assertSameIds(refIds, refs, 100, 119);
- //Verify 20 msgs in storage
+ // verify 20 msgs in storage
msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 100, 119);
- //Verify 100 msgs in store
+ // verify 100 msgs in store
assertEquals(100, ms.size());
- //Verify 100 refs in queue
+ // verify 100 refs in queue
assertEquals(100, queue.memoryRefCount());
- //Verify 0 refs in downcache
+ // verify 0 refs in downcache
assertEquals(0, queue.downCacheCount());
- //Verify paging
+ // verify paging
assertTrue(queue.isPaging());
- //Verify no deliveries
+ // verify no deliveries
assertEquals(0, queue.memoryDeliveryCount());
-
+
+ // send 10 more refs
-
-
- //Send 10 more refs
-
for (int i = 120; i < 130; i++)
{
msgs[i] = MessageFactory.createCoreMessage(i, false, null);
@@ -294,37 +284,34 @@
refs[i].releaseMemoryReference();
}
- //verify 30 refs in storage
+ // verify 30 refs in storage
refIds = getReferenceIds(queue.getChannelID());
assertEquals(30, refIds.size());
assertSameIds(refIds, refs, 100, 129);
- //Verify 30 msgs in storage
+ // verify 30 msgs in storage
msgIds = getMessageIds();
assertEquals(30, msgIds.size());
assertSameIds(msgIds, refs, 100, 129);
- //Verify 100 msgs in store
+ // verify 100 msgs in store
assertEquals(100, ms.size());
- //Verify 100 refs in queue
+ // verify 100 refs in queue
assertEquals(100, queue.memoryRefCount());
- //Verify 0 refs in downcache
+ // verify 0 refs in downcache
assertEquals(0, queue.downCacheCount());
- //Verify paging
+ // verify paging
assertTrue(queue.isPaging());
- //Verify no deliveries
+ // verify no deliveries
assertEquals(0, queue.memoryDeliveryCount());
-
+
+ // send 10 more refs
-
-
- //Send 10 more refs
-
for (int i = 130; i < 140; i++)
{
msgs[i] = MessageFactory.createCoreMessage(i, false, null);
@@ -333,37 +320,34 @@
refs[i].releaseMemoryReference();
}
- //verify 40 refs in storage
+ // verify 40 refs in storage
refIds = getReferenceIds(queue.getChannelID());
assertEquals(40, refIds.size());
assertSameIds(refIds, refs, 100, 139);
- //Verify 40 msgs in storage
+ // verify 40 msgs in storage
msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
- //Verify 100 msgs in store
+ // verify 100 msgs in store
assertEquals(100, ms.size());
- //Verify 100 refs in queue
+ // verify 100 refs in queue
assertEquals(100, queue.memoryRefCount());
- //Verify 0 refs in downcache
+ // verify 0 refs in downcache
assertEquals(0, queue.downCacheCount());
- //Verify paging
+ // verify paging
assertTrue(queue.isPaging());
- //Verify no deliveries
+ // verify no deliveries
assertEquals(0, queue.memoryDeliveryCount());
+ // send one more ref
-
-
- //Send one more ref
-
msgs[140] = MessageFactory.createCoreMessage(140, false, null);
refs[140] = ms.reference(msgs[140]);
queue.handle(null, refs[140], null);
@@ -782,7 +766,7 @@
}
// Cancel is asynch, so need to wait a bit
- Thread.sleep(250);
+ Thread.sleep(500);
//This should cause the refs corresponding to the deliveries to go the front of the in memory quuee
//and the oldest refs in memory evicted off the end into the down cache
@@ -818,7 +802,7 @@
}
// Cancel is asynch, so need to wait a bit
- Thread.sleep(250);
+ Thread.sleep(500);
//This should cause the down cache to be flushed
@@ -854,7 +838,7 @@
dels[i].cancel();
}
// Cancel is asynch, so need to wait a bit
- Thread.sleep(250);
+ Thread.sleep(500);
//consumeCount += 20;
Modified: branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java
===================================================================
--- branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java 2007-02-09 00:55:40 UTC (rev 2226)
+++ branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java 2007-02-09 02:30:39 UTC (rev 2227)
@@ -820,7 +820,7 @@
}
// Cancel is asynch, so need to wait a bit
- Thread.sleep(250);
+ Thread.sleep(500);
//This should cause the refs corresponding to the deliveries to go the front of the in memory quuee
//and the oldest refs in memory evicted off the end into the down cache
@@ -856,7 +856,7 @@
}
// Cancel is asynch, so need to wait a bit
- Thread.sleep(250);
+ Thread.sleep(500);
//This should cause the down cache to be flushed
@@ -894,7 +894,7 @@
// Cancel is asynch, so need to wait a bit
- Thread.sleep(250);
+ Thread.sleep(500);
//This should cause the down cache to be flushed
More information about the jboss-cvs-commits
mailing list