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

Make the test more deterministic to fix test errors on slower machines. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1329240 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2012-04-23 13:50:40 +00:00
parent 740f5b36da
commit 739a13dc2b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java
View File

@ -18,11 +18,13 @@ package org.apache.activemq.broker.scheduler;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import java.io.File; import java.io.File;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.apache.activemq.util.IOHelper; import org.apache.activemq.util.IOHelper;
import org.apache.kahadb.util.ByteSequence; import org.apache.kahadb.util.ByteSequence;
import org.junit.After; import org.junit.After;
@ -129,17 +131,17 @@ public class JobSchedulerTest {
public void testRemoveLong() throws Exception { public void testRemoveLong() throws Exception {
final int COUNT = 10; final int COUNT = 10;
long time = 20000; long time = 60000;
for (int i = 0; i < COUNT; i++) { for (int i = 0; i < COUNT; i++) {
String str = new String("test" + i); String str = new String("test" + i);
scheduler.schedule("id" + i, new ByteSequence(str.getBytes()), "", time, 1000, -1); scheduler.schedule("id" + i, new ByteSequence(str.getBytes()), "", time, 1000, -1);
} }
int size = scheduler.getNextScheduleJobs().size(); int size = scheduler.getAllJobs().size();
assertEquals(size, COUNT); assertEquals(size, COUNT);
long removeTime = scheduler.getNextScheduleTime(); long removeTime = scheduler.getNextScheduleTime();
scheduler.remove(removeTime); scheduler.remove(removeTime);
size = scheduler.getNextScheduleJobs().size(); size = scheduler.getAllJobs().size();
assertEquals(0, size); assertEquals(0, size);
} }
@ -150,16 +152,16 @@ public class JobSchedulerTest {
long time = 20000; long time = 20000;
for (int i = 0; i < COUNT; i++) { for (int i = 0; i < COUNT; i++) {
String str = new String("test" + i); String str = new String("test" + i);
scheduler.schedule("id" + i, new ByteSequence(str.getBytes()), "", time, 10, -1); scheduler.schedule("id" + i, new ByteSequence(str.getBytes()), "", time, 1000, -1);
if (i == COUNT / 2) { if (i == COUNT / 2) {
scheduler.schedule(test, new ByteSequence(test.getBytes()), "", time, 10, -1); scheduler.schedule(test, new ByteSequence(test.getBytes()), "", time, 1000, -1);
} }
} }
int size = scheduler.getNextScheduleJobs().size(); int size = scheduler.getAllJobs().size();
assertEquals(size, COUNT + 1); assertEquals(size, COUNT + 1);
scheduler.remove(test); scheduler.remove(test);
size = scheduler.getNextScheduleJobs().size(); size = scheduler.getAllJobs().size();
assertEquals(size, COUNT); assertEquals(size, COUNT);
} }