Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing test - it has some bad timing assumptions. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@652413 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2008-05-01 00:46:36 +00:00
parent 87dee22068
commit a3fb0301f9
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/DataFileAppenderTest.java
View File

@ -60,19 +60,6 @@ public class DataFileAppenderTest extends TestCase {
} }
} }
public void testBatchWriteCompleteAfterTimeout() throws Exception {
ByteSequence data = new ByteSequence("DATA".getBytes());
final int iterations = 10;
for (int i=0; i<iterations; i++) {
dataManager.write(data, false);
}
// at this point most probably dataManager.getInflightWrites().size() >= 0
// as the Thread created in DataFileAppender.enqueue() may not have caught up.
Thread.sleep(1000);
assertTrue("queued data is written", dataManager.getInflightWrites().isEmpty());
}
public void testBatchWriteCallbackCompleteAfterTimeout() throws Exception { public void testBatchWriteCallbackCompleteAfterTimeout() throws Exception {
final int iterations = 10; final int iterations = 10;
final CountDownLatch latch = new CountDownLatch(iterations); final CountDownLatch latch = new CountDownLatch(iterations);
@ -86,9 +73,7 @@ public class DataFileAppenderTest extends TestCase {
} }
// at this point most probably dataManager.getInflightWrites().size() >= 0 // at this point most probably dataManager.getInflightWrites().size() >= 0
// as the Thread created in DataFileAppender.enqueue() may not have caught up. // as the Thread created in DataFileAppender.enqueue() may not have caught up.
Thread.sleep(1000); assertTrue("queued data is written", latch.await(5, TimeUnit.SECONDS));
assertTrue("queued data is written", dataManager.getInflightWrites().isEmpty());
assertEquals("none written", 0, latch.getCount());
} }
public void testBatchWriteCallbackCompleteAfterClose() throws Exception { public void testBatchWriteCallbackCompleteAfterClose() throws Exception {
@ -102,8 +87,6 @@ public class DataFileAppenderTest extends TestCase {
} }
}); });
} }
assertTrue("writes are queued up", dataManager.getInflightWrites().size() >= iterations);
assertEquals("none written", iterations, latch.getCount());
dataManager.close(); dataManager.close();
assertTrue("queued data is written", dataManager.getInflightWrites().isEmpty()); assertTrue("queued data is written", dataManager.getInflightWrites().isEmpty());
assertEquals("none written", 0, latch.getCount()); assertEquals("none written", 0, latch.getCount());
@ -131,13 +114,12 @@ public class DataFileAppenderTest extends TestCase {
byte[] message = new byte[messageSize]; byte[] message = new byte[messageSize];
ByteSequence data = new ByteSequence(message); ByteSequence data = new ByteSequence(message);
for (int i=0; i< iterations - 1; i++) { for (int i=0; i< iterations; i++) {
dataManager.write(data, done); dataManager.write(data, done);
} }
assertEquals("all writes are queued", iterations, latch.getCount());
dataManager.write(data, done); // write may take some time
latch.await(10, TimeUnit.SECONDS); // write may take some time assertTrue("all callbacks complete", latch.await(10, TimeUnit.SECONDS));
assertEquals("all callbacks complete", 0, latch.getCount());
} }
public void testNoBatchWriteWithSync() throws Exception { public void testNoBatchWriteWithSync() throws Exception {