Author: boisvert
Date: Sat Nov 15 06:47:28 2008
New Revision: 717862
URL: http://svn.apache.org/viewvc?rev=717862&view=rev
Log:
Update test cases for recent changes in SimpleScheduler implementation
Modified:
ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java
ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
Modified:
ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java?rev=717862&r1=717861&r2=717862&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java
Sat Nov 15 06:47:28 2008
@@ -91,8 +91,9 @@
assertEquals("j1",jobs.get(0).jobId);
jobs = _del.dequeueImmediate("n1", 250L, 1000);
assertNotNull(jobs);
- assertEquals(1, jobs.size());
- assertEquals("j2",jobs.get(0).jobId);
+ assertEquals(2, jobs.size());
+ assertEquals("j1",jobs.get(0).jobId);
+ assertEquals("j2",jobs.get(1).jobId);
}
public void testScheduleImmediateMaxRows() throws Exception {
@@ -103,10 +104,6 @@
assertNotNull(jobs);
assertEquals(1, jobs.size());
assertEquals("j1",jobs.get(0).jobId);
- jobs = _del.dequeueImmediate("n1", 250L, 1000);
- assertNotNull(jobs);
- assertEquals(1, jobs.size());
- assertEquals("j2",jobs.get(0).jobId);
}
public void testScheduleImmediateNodeFilter() throws Exception {
Modified:
ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java?rev=717862&r1=717861&r2=717862&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
Sat Nov 15 06:47:28 2008
@@ -57,24 +57,25 @@
public void testConcurrentExec() throws Exception {
_scheduler.start();
- _txm.begin();
- String jobId;
- try {
- jobId = _scheduler.schedulePersistedJob(newDetail("123"), new
Date(System.currentTimeMillis() + 200));
- Thread.sleep(100);
- // Make sure we don't schedule until commit.
- assertEquals(0, _jobs.size());
- } finally {
- _txm.commit();
+ for (int i=0; i<10; i++) {
+ _txm.begin();
+ String jobId;
+ try {
+ int jobs = _jobs.size();
+ jobId = _scheduler.schedulePersistedJob(newDetail("123"), new
Date(System.currentTimeMillis() + 200));
+ Thread.sleep(100);
+ // Make sure we don't schedule until commit.
+ assertEquals(jobs, _jobs.size());
+ } finally {
+ _txm.commit();
+ }
+ // Delete from DB
+ assertEquals(true,_ds.delegate().deleteJob(jobId, "n1"));
+ // Wait for the job to be execed.
+ Thread.sleep(250);
+ // We should always have same number of jobs/commits
+ assertEquals(_jobs.size(), _commit.size());
}
- // Delete from DB
- assertEquals(true,_ds.delegate().deleteJob(jobId, "n1"));
- // Wait for the job to be execed.
- Thread.sleep(250);
- // Should execute job,
- assertEquals(1, _jobs.size());
- // But should not commit.
- assertEquals(0, _commit.size());
}
public void testImmediateScheduling() throws Exception {
