You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by je...@apache.org on 2010/08/03 09:34:14 UTC
svn commit: r981762 - in
/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple:
JdbcDelegateTest.java RetriesTest.java SchedulerThreadTest.java
SimpleSchedulerTest.java
Author: jeffyu
Date: Tue Aug 3 07:34:13 2010
New Revision: 981762
URL: http://svn.apache.org/viewvc?rev=981762&view=rev
Log:
* convert scheduler-simple test into junit 4 based.
Modified:
ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java
ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java
ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SchedulerThreadTest.java
ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
Modified: ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java?rev=981762&r1=981761&r2=981762&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java (original)
+++ ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java Tue Aug 3 07:34:13 2010
@@ -19,18 +19,16 @@
package org.apache.ode.scheduler.simple;
-import java.util.HashMap;
import java.util.List;
import javax.xml.namespace.QName;
+import junit.framework.Assert;
+
import org.apache.ode.bpel.iapi.Scheduler;
import org.apache.ode.bpel.iapi.Scheduler.JobType;
-import org.apache.ode.scheduler.simple.DatabaseDelegate;
-import org.apache.ode.scheduler.simple.Job;
-
-
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
/**
*
@@ -38,17 +36,18 @@ import junit.framework.TestCase;
*
* @author Maciej Szefler ( m s z e f l e r @ g m a i l . c o m )
*/
-public class JdbcDelegateTest extends TestCase {
+public class JdbcDelegateTest extends Assert {
private DelegateSupport _ds;
private DatabaseDelegate _del;
-
+
+ @Before
public void setUp() throws Exception {
_ds = new DelegateSupport();
_del = _ds.delegate();
}
-
+ @Test
public void testGetNodeIds() throws Exception {
// should have no node ids in the db, empty list (not null)
List<String> nids = _del.getNodeIds();
@@ -74,7 +73,8 @@ public class JdbcDelegateTest extends Te
assertTrue(nids.contains("abc"));
assertTrue(nids.contains("123"));
}
-
+
+ @Test
public void testReassign() throws Exception {
_del.insertJob(new Job(100L,"j1",true,new Scheduler.JobDetails()), "n1", false);
_del.insertJob(new Job(200L,"j2",true,new Scheduler.JobDetails()), "n2", false);
@@ -83,7 +83,8 @@ public class JdbcDelegateTest extends Te
List<Job> jobs = _del.dequeueImmediate("n2", 400L, 1000);
assertEquals(2,jobs.size());
}
-
+
+ @Test
public void testScheduleImmediateTimeFilter() throws Exception {
_del.insertJob(new Job(100L,"j1",true,new Scheduler.JobDetails()), "n1", false);
_del.insertJob(new Job(200L,"j2",true,new Scheduler.JobDetails()), "n1", false);
@@ -99,7 +100,8 @@ public class JdbcDelegateTest extends Te
assertEquals("j1",jobs.get(0).jobId);
assertEquals("j2",jobs.get(1).jobId);
}
-
+
+ @Test
public void testScheduleImmediateMaxRows() throws Exception {
_del.insertJob(new Job(100L,"j1",true,new Scheduler.JobDetails()), "n1", false);
_del.insertJob(new Job(200L,"j2",true,new Scheduler.JobDetails()), "n1", false);
@@ -109,7 +111,8 @@ public class JdbcDelegateTest extends Te
assertEquals(1, jobs.size());
assertEquals("j1",jobs.get(0).jobId);
}
-
+
+ @Test
public void testScheduleImmediateNodeFilter() throws Exception {
_del.insertJob(new Job(100L,"j1",true,new Scheduler.JobDetails()), "n1", false);
_del.insertJob(new Job(200L,"j2",true,new Scheduler.JobDetails()), "n2", false);
@@ -119,7 +122,8 @@ public class JdbcDelegateTest extends Te
assertEquals(1, jobs.size());
assertEquals("j2",jobs.get(0).jobId);
}
-
+
+ @Test
public void testDeleteJob() throws Exception {
_del.insertJob(new Job(100L,"j1",true,new Scheduler.JobDetails()), "n1", false);
_del.insertJob(new Job(200L,"j2",true,new Scheduler.JobDetails()), "n2", false);
@@ -136,7 +140,8 @@ public class JdbcDelegateTest extends Te
assertTrue(_del.deleteJob("j1", "n1"));
assertEquals(1,_del.getNodeIds().size());
}
-
+
+ @Test
public void testUpgrade() throws Exception {
for (int i = 0; i < 200; ++i)
_del.insertJob(new Job(i ,"j" +i,true,new Scheduler.JobDetails()), null, false);
@@ -152,7 +157,8 @@ public class JdbcDelegateTest extends Te
assertEquals(n2,_del.dequeueImmediate("n2", 10000L, 1000).size());
assertEquals(n3,_del.dequeueImmediate("n3", 10000L, 1000).size());
}
-
+
+ @Test
public void testMigration() throws Exception {
Scheduler.JobDetails j1 = new Scheduler.JobDetails();
j1.getDetailsExt().put("type", "MATCHER");
Modified: ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java?rev=981762&r1=981761&r2=981762&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java (original)
+++ ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java Tue Aug 3 07:34:13 2010
@@ -23,17 +23,21 @@ import org.apache.ode.bpel.iapi.Schedule
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import javax.transaction.TransactionManager;
import java.util.*;
import java.util.concurrent.Callable;
+import junit.framework.Assert;
import junit.framework.TestCase;
/**
* @author Matthieu Riou <mr...@apache.org>
*/
-public class RetriesTest extends TestCase implements Scheduler.JobProcessor {
+public class RetriesTest extends Assert implements Scheduler.JobProcessor {
private static final Log __log = LogFactory.getLog(RetriesTest.class);
DelegateSupport _ds;
@@ -43,7 +47,8 @@ public class RetriesTest extends TestCas
TransactionManager _txm;
int _tried = 0;
Scheduler.JobInfo _jobInfo = null;
-
+
+ @Before
public void setUp() throws Exception {
_txm = new GeronimoTransactionManager();
_ds = new GeronimoDelegateSupport(_txm);
@@ -52,11 +57,13 @@ public class RetriesTest extends TestCas
_jobs = new ArrayList<Scheduler.JobInfo>(100);
_commit = new ArrayList<Scheduler.JobInfo>(100);
}
-
+
+ @After
public void tearDown() throws Exception {
_scheduler.shutdown();
}
-
+
+ @Test
public void testRetries() throws Exception {
// speed things up a bit to hit the right code paths
_scheduler.setNearFutureInterval(5000);
@@ -72,7 +79,8 @@ public class RetriesTest extends TestCas
Thread.sleep(10000);
assertEquals(6, _tried);
}
-
+
+ @Test
public void testExecTransaction() throws Exception {
final int[] tryCount = new int[1];
tryCount[0] = 0;
Modified: ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SchedulerThreadTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SchedulerThreadTest.java?rev=981762&r1=981761&r2=981762&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SchedulerThreadTest.java (original)
+++ ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SchedulerThreadTest.java Tue Aug 3 07:34:13 2010
@@ -28,8 +28,11 @@ import java.util.concurrent.atomic.Atomi
import org.apache.ode.scheduler.simple.SchedulerThread;
import org.apache.ode.scheduler.simple.Task;
import org.apache.ode.scheduler.simple.TaskRunner;
+import org.junit.Before;
+import org.junit.Test;
+import junit.framework.Assert;
import junit.framework.TestCase;
/**
@@ -37,17 +40,19 @@ import junit.framework.TestCase;
*
* @author Maciej Szefler ( m s z e f l e r @ g m a i l . c o m )
*/
-public class SchedulerThreadTest extends TestCase implements TaskRunner {
+public class SchedulerThreadTest extends Assert implements TaskRunner {
static final long SCHED_TOLERANCE = 100;
SchedulerThread _st;
List<TR> _tasks = new ArrayList<TR>(100);
-
+
+ @Before
public void setUp() throws Exception {
_st = new SchedulerThread(this);
}
-
+
+ @Test
public void testSchedulingResolution() throws Exception {
_st.start();
long schedtime = System.currentTimeMillis() + 300;
@@ -57,7 +62,8 @@ public class SchedulerThreadTest extends
assertTrue(_tasks.get(0).time < schedtime + SCHED_TOLERANCE / 2);
assertTrue(_tasks.get(0).time > schedtime - SCHED_TOLERANCE / 2);
}
-
+
+ @Test
public void testStartStop() throws Exception {
_st.start();
long schedtime = System.currentTimeMillis() + 500;
@@ -69,7 +75,8 @@ public class SchedulerThreadTest extends
Thread.sleep(SCHED_TOLERANCE);
assertEquals(1,_tasks.size());
}
-
+
+ @Test
public void testParallelEnqueue() throws Exception {
_st.start();
final long startTime = System.currentTimeMillis() + 100;
Modified: ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java?rev=981762&r1=981761&r2=981762&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java (original)
+++ ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java Tue Aug 3 07:34:13 2010
@@ -27,6 +27,7 @@ import javax.transaction.Synchronization
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
+import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
@@ -35,15 +36,19 @@ import org.apache.ode.bpel.iapi.Schedule
import org.apache.ode.bpel.iapi.Scheduler.JobProcessor;
import org.apache.ode.bpel.iapi.Scheduler.JobProcessorException;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
-public class SimpleSchedulerTest extends TestCase implements JobProcessor {
+public class SimpleSchedulerTest extends Assert implements JobProcessor {
DelegateSupport _ds;
SimpleScheduler _scheduler;
ArrayList<JobInfo> _jobs;
ArrayList<JobInfo> _commit;
TransactionManager _txm;
-
+
+ @Before
public void setUp() throws Exception {
_txm = new GeronimoTransactionManager();
_ds = new DelegateSupport();
@@ -52,11 +57,13 @@ public class SimpleSchedulerTest extends
_jobs = new ArrayList<JobInfo>(100);
_commit = new ArrayList<JobInfo>(100);
}
-
+
+ @After
public void tearDown() throws Exception {
_scheduler.shutdown();
}
-
+
+ @Test
public void testConcurrentExec() throws Exception {
_scheduler.start();
for (int i=0; i<10; i++) {
@@ -80,7 +87,8 @@ public class SimpleSchedulerTest extends
assertEquals(_jobs.size(), _commit.size());
}
}
-
+
+ @Test
public void testImmediateScheduling() throws Exception {
_scheduler.start();
_txm.begin();
@@ -96,7 +104,8 @@ public class SimpleSchedulerTest extends
Thread.sleep(100);
assertEquals(1, _jobs.size());
}
-
+
+ @Test
public void testStartStop() throws Exception {
_scheduler.start();
_txm.begin();
@@ -117,7 +126,8 @@ public class SimpleSchedulerTest extends
Thread.sleep(1000);
assertEquals(10, _jobs.size());
}
-
+
+ @Test
public void testNearFutureScheduling() throws Exception {
// speed things up a bit to hit the right code paths
_scheduler.setNearFutureInterval(10000);
@@ -134,7 +144,8 @@ public class SimpleSchedulerTest extends
Thread.sleep(8500);
assertEquals(1, _jobs.size());
}
-
+
+ @Test
public void testFarFutureScheduling() throws Exception {
// speed things up a bit to hit the right code paths
_scheduler.setNearFutureInterval(7000);
@@ -151,7 +162,8 @@ public class SimpleSchedulerTest extends
Thread.sleep(8500);
assertEquals(1, _jobs.size());
}
-
+
+ @Test
public void testRecovery() throws Exception {
// speed things up a bit to hit the right code paths
_scheduler.setNearFutureInterval(2000);
@@ -175,7 +187,8 @@ public class SimpleSchedulerTest extends
Thread.sleep(4000);
assertEquals(3, _jobs.size());
}
-
+
+ @Test
public void testRecoverySuppressed() throws Exception {
// speed things up a bit to hit the right code paths
_scheduler.setNearFutureInterval(2000);