[jbpm-commits] JBoss JBPM SVN: r1873 - jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/model.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Aug 12 07:43:56 EDT 2008
Author: porcherg
Date: 2008-08-12 07:43:55 -0400 (Tue, 12 Aug 2008)
New Revision: 1873
Modified:
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/model/HibernateJobDbSessionTest.java
Log:
migrate to EnvironmentDbTestCase (todo: check if these tests are really needed)
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/model/HibernateJobDbSessionTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/model/HibernateJobDbSessionTest.java 2008-08-12 11:36:35 UTC (rev 1872)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/model/HibernateJobDbSessionTest.java 2008-08-12 11:43:55 UTC (rev 1873)
@@ -1,210 +1,162 @@
package org.jbpm.pvm.internal.db.model;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import org.jbpm.pvm.ManagementService;
+import org.jbpm.pvm.env.Environment;
+import org.jbpm.pvm.internal.job.JobImpl;
+import org.jbpm.pvm.internal.job.TimerImpl;
+import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+import org.jbpm.pvm.job.Timer;
+import org.jbpm.pvm.session.DbSession;
+import org.jbpm.pvm.test.base.EnvironmentDbTestCase;
+
/**
* @author Pascal Verdage
*/
-public abstract class HibernateJobDbSessionTest extends JbpmTestCase
+public class HibernateJobDbSessionTest extends EnvironmentDbTestCase
{
-
- /*
-
- // TODO use environment.cfg.xml resource in this package instead
- // TODO sub class from DbTestCase to get the db cleaning inbetween tests and automatic environment set up. use newTransaction() to demarcate new transaction
-
- protected static String xmlString =
- "<contexts>" +
- " <environment-factory>" +
- " <hibernate-configuration>" +
- " <properties resource='hibernate.properties' />" +
- " <mappings resources='org/jbpm/pvm/pvm.hibernate.mappings.xml' /> " +
- " <mapping resource='org/jbpm/svc/jobsession/JobSessionTest.hbm.xml' />" +
- " <cache-configuration resource='org/jbpm/pvm/pvm.cache.xml' usage='nonstrict-read-write' />" +
- " </hibernate-configuration>" +
- " <hibernate-session-factory />" +
- " <command-service />" +
- " <pvm-service />" +
- " </environment-factory>" +
- " <environment>" +
- " <transaction />" +
- " <hibernate-session />" +
- " <pvm-db-session />" +
- " <jobImpl-session />" +
- " </environment>" +
- "</contexts>";
-
- protected EnvironmentFactory environmentFactory;
protected long executionId;
@Override
public void setUp() throws Exception {
super.setUp();
- environmentFactory = PvmEnvironmentFactory.parseXmlString(xmlString));
- assertNull(Environment.getCurrent());
- environmentFactory.openEnvironment();
- try {
- ExecutionImpl execution = new ExecutionImpl();
- execution.setProcessInstance(execution);
- Environment.getCurrent().get(DbSession.class).save(execution);
- executionId = execution.getDbid();
- } finally {
- Environment.getCurrent().close();
- }
+ assertNotNull(Environment.getCurrent());
+
+ ExecutionImpl execution = new ExecutionImpl();
+ execution.setProcessInstance(execution);
+ Environment.getCurrent().get(DbSession.class).save(execution);
+ executionId = execution.getDbid();
+
+ newTransaction();
}
@Override
public void tearDown() throws Exception {
- environmentFactory.openEnvironment();
- try {
- DbSession dbSession = Environment.getCurrent().get(DbSession.class);
- dbSession.delete(dbSession.get(ExecutionImpl.class, executionId));
- executionId = 0;
- } finally {
- Environment.getCurrent().close();
- }
- DbTestCase.cleanDb(environmentFactory);
+ newTransaction();
+
+ DbSession dbSession = Environment.getCurrent().get(DbSession.class);
+ dbSession.delete(dbSession.get(ExecutionImpl.class, executionId));
+ executionId = 0;
+
super.tearDown();
}
private ExecutionImpl getExecution() {
assertNotNull(Environment.getCurrent());
- return Environment.getCurrent().get(DbSession.class)
- .get(ExecutionImpl.class, executionId);
+ return Environment.getCurrent().get(DbSession.class).get(ExecutionImpl.class, executionId);
}
- private void cleanJobs() {
- environmentFactory.openEnvironment();
- try {
- PvmService pvmService = Environment.getCurrent().get(PvmService.class);
- JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
- for (JobImpl<?> jobImpl : pvmService.getJobs()) {
- jobDbSession.delete(jobImpl);
- }
- } finally {
- Environment.getCurrent().close();
+ private void cleanTimers() {
+ ManagementService pvmService = Environment.getCurrent().get(ManagementService.class);
+ JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
+ for (Timer jobImpl : pvmService.getTimers()) {
+ jobDbSession.delete(jobImpl);
}
}
- /** Test the methods save, get and delete with only one jobImpl
+ /** Test the methods save, get and delete with only one jobImpl */
public void testSaveGetDelete() {
long id;
- environmentFactory.openEnvironment();
- try {
- JobImpl<?> jobImpl = new TestJob();
- JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
- assertNull(jobDbSession.getJob(jobImpl.getDbid()));
- assertEquals(0,jobImpl.getDbid());
- jobDbSession.save(jobImpl);
- id = jobImpl.getDbid();
- assertNotSame(0, jobDbSession.getJob(id));
- assertNotNull(id);
- } finally {
- Environment.getCurrent().close();
- }
- environmentFactory.openEnvironment();
- try {
- JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
- JobImpl<?> jobImpl = jobDbSession.getJob(id);
- assertNotNull(jobImpl);
- jobDbSession.delete(jobImpl);
- assertNull(jobDbSession.getJob(id));
- } finally {
- Environment.getCurrent().close();
- }
+
+ JobImpl<?> jobImpl = new TimerImpl();
+ JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
+ assertNull(jobDbSession.getJob(jobImpl.getDbid()));
+ assertEquals(0,jobImpl.getDbid());
+ jobDbSession.save(jobImpl);
+ id = jobImpl.getDbid();
+ assertNotSame(0, jobDbSession.getJob(id));
+ assertNotNull(id);
+
+ newTransaction();
+
+ jobDbSession = Environment.getCurrent().get(JobDbSession.class);
+ jobImpl = jobDbSession.getJob(id);
+ assertNotNull(jobImpl);
+ jobDbSession.delete(jobImpl);
+ assertNull(jobDbSession.getJob(id));
}
/**
* Test the method save with two jobs:
* check that the jobs are given different ids.
+ */
public void testSaveTwoJobs() {
- environmentFactory.openEnvironment();
- try {
- JobImpl<?> job1 = new TestJob();
- JobImpl<?> job2 = new TestJob();
- JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
- jobDbSession.save(job1);
- jobDbSession.save(job2);
- assertNotSame(job1.getDbid(), job2.getDbid());
- jobDbSession.delete(job1);
- jobDbSession.delete(job2);
- } finally {
- Environment.getCurrent().close();
- }
+ JobImpl<?> job1 = new TimerImpl();
+ JobImpl<?> job2 = new TimerImpl();
+ JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
+ jobDbSession.save(job1);
+ jobDbSession.save(job2);
+ assertNotSame(job1.getDbid(), job2.getDbid());
+ jobDbSession.delete(job1);
+ jobDbSession.delete(job2);
}
/**
- * Test the method getFirstAcquirableJob.
+ * Test the method findFirstAcquirableJob.
* test cases are:
- * <ul>
- * <li>no jobImpl scheduled</li>
- * <li>invalid jobs scheduled: locked or not due</li>
- * <li>comparison between valid cases. The comparison is made on the
+ * - no jobImpl scheduled
+ * - invalid jobs scheduled: locked or not due
+ * - comparison between valid cases. The comparison is made on the
* acquiring order according to the fields dueDate and lockExpirationTime.
* the awaited result is:
- * <ol>
- * <li>none field null, dueDate previous to case 2</li>
- * <li>lockExpirationTime null</li>
- * <li>dueDate null</li>
- * <li>both fields null</li>
- * </ol>The last two jobs can come in any order</li>
- * </ul>
- public void testGetFirstAcquirableJob() {
+ * 1- none field null, dueDate previous to case 2
+ * 2- lockExpirationTime null
+ * 3- dueDate null
+ * 4- both fields null
+ * The last two jobs can come in any order.
+ */
+ public void testFindFirstAcquirableJob() {
long id1, id2, id3, id4;
long timestamp = System.currentTimeMillis();
- environmentFactory.openEnvironment();
- try {
- JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
- // no jobImpl scheduled
- assertNull(jobDbSession.findFirstAcquirableJob());
+
+ JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
+ // no jobImpl scheduled
+ assertNull(jobDbSession.findFirstAcquirableJob());
- // unavailable jobs
- JobImpl<?> job1 = new TestJob();
- JobImpl<?> job2 = new TestJob();
- job1.setLockExpirationTime(new Date(Long.MAX_VALUE));
- job2.setDueDate(new Date(Long.MAX_VALUE));
- jobDbSession.save(job1);
- jobDbSession.save(job2);
- } finally {
- Environment.getCurrent().close();
- }
- environmentFactory.openEnvironment();
- try {
- JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
- assertNull(jobDbSession.findFirstAcquirableJob());
+ // unavailable jobs
+ JobImpl<?> job1 = new TimerImpl();
+ JobImpl<?> job2 = new TimerImpl();
+ job1.setLockExpirationTime(new Date(Long.MAX_VALUE));
+ job2.setDueDate(new Date(Long.MAX_VALUE));
+ jobDbSession.save(job1);
+ jobDbSession.save(job2);
- // valid jobs
- JobImpl<?> job1 = new TestJob();
- JobImpl<?> job2 = new TestJob();
- JobImpl<?> job3 = new TestJob();
- JobImpl<?> job4 = new TestJob();
- job3.setDueDate(new Date(timestamp));
- job4.setDueDate(new Date(timestamp - 200));
- job2.setLockExpirationTime(new Date(timestamp));
- job4.setLockExpirationTime(new Date(timestamp));
- jobDbSession.save(job1);
- jobDbSession.save(job2);
- jobDbSession.save(job3);
- jobDbSession.save(job4);
- id1 = job1.getDbid();
- id2 = job2.getDbid();
- id3 = job3.getDbid();
- id4 = job4.getDbid();
- } finally {
- Environment.getCurrent().close();
- }
+ newTransaction();
+
+ jobDbSession = Environment.getCurrent().get(JobDbSession.class);
+ assertNull(jobDbSession.findFirstAcquirableJob());
+
+ // valid jobs
+ job1 = new TimerImpl();
+ job2 = new TimerImpl();
+ JobImpl<?> job3 = new TimerImpl();
+ JobImpl<?> job4 = new TimerImpl();
+ job3.setDueDate(new Date(timestamp));
+ job4.setDueDate(new Date(timestamp - 200));
+ job2.setLockExpirationTime(new Date(timestamp));
+ job4.setLockExpirationTime(new Date(timestamp));
+ jobDbSession.save(job1);
+ jobDbSession.save(job2);
+ jobDbSession.save(job3);
+ jobDbSession.save(job4);
+ id1 = job1.getDbid();
+ id2 = job2.getDbid();
+ id3 = job3.getDbid();
+ id4 = job4.getDbid();
+
+ newTransaction();
+
List<Long> ids = new ArrayList<Long>();
- environmentFactory.openEnvironment();
- try {
- JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
- JobImpl<?> jobImpl = jobDbSession.findFirstAcquirableJob();
- while (jobImpl != null) {
- ids.add(jobImpl.getDbid());
- jobDbSession.delete(jobImpl);
- jobImpl = jobDbSession.findFirstAcquirableJob();
- }
- } finally {
- Environment.getCurrent().close();
+ jobDbSession = Environment.getCurrent().get(JobDbSession.class);
+ JobImpl<?> jobImpl = jobDbSession.findFirstAcquirableJob();
+ while (jobImpl != null) {
+ ids.add(jobImpl.getDbid());
+ jobDbSession.delete(jobImpl);
+ jobImpl = jobDbSession.findFirstAcquirableJob();
}
assertEquals(4, ids.size());
assertEquals(id4, ids.get(0).longValue());
@@ -218,132 +170,122 @@
/**
* Test the findExclusiveJobs method.
* Considered jobImpl are:
- * <ul><li>a jobImpl not registered for the example execution</li>
- * <li>a locked jobImpl</li>
- * <li>a non-exclusive jobImpl</li>
- * <li>a non available jobImpl</li>
- * <li>two valid jobs, exclusive, available and registered
- * for the example execution</li></ul>
-
- TODO html in unit test docs is not necessary. this docs are only intended for the one trying to understand the test case. so he's already in the source code. he/she shouldn't be forced to generate and read the javadocs.
-
+ * - a jobImpl not registered for the example execution
+ * - a locked jobImpl
+ * - a non-exclusive jobImpl
+ * - a non available jobImpl
+ * - two valid jobs, exclusive, available and registered
+ * for the example execution
+ */
public void testFindExclusiveJobs() {
long id5, id6;
- environmentFactory.openEnvironment();
- try {
- JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
- ExecutionImpl execution = getExecution();
- assertEquals(0, jobDbSession.findExclusiveJobs(execution).size());
- // a jobImpl does not belong to the execution
- JobImpl<?> job1 = new TestJob();
- JobImpl<?> job2 = new TestJob(execution);
- JobImpl<?> job3 = new TestJob(execution);
- JobImpl<?> job4 = new TestJob(execution);
- JobImpl<?> job5 = new TestJob(execution);
- JobImpl<?> job6 = new TestJob(execution);
- // a jobImpl is not exclusive
- job1.setExclusive(true);
- job2.setExclusive(true);
- job3.setExclusive(false);
- job4.setExclusive(true);
- job5.setExclusive(true);
- job6.setExclusive(true);
- // a jobImpl is locked
- job2.setLockOwner("a jobExecutor");
- // a jobImpl's due date is not past
- job1.setDueDate(null);
- job2.setDueDate(null);
- job3.setDueDate(null);
- job4.setDueDate(new Date(Long.MAX_VALUE));
- job5.setDueDate(null);
- job6.setDueDate(new Date());
- jobDbSession.save(job1);
- jobDbSession.save(job2);
- jobDbSession.save(job3);
- jobDbSession.save(job4);
- jobDbSession.save(job5);
- jobDbSession.save(job6);
- id5 = job5.getDbid();
- id6 = job6.getDbid();
- } finally {
- Environment.getCurrent().close();
- }
- environmentFactory.openEnvironment();
- try {
- JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
- ExecutionImpl processInstance = getExecution();
- List<JobImpl<?>> list = jobDbSession.findExclusiveJobs(processInstance);
- assertEquals(2, list.size());
- long result1 = list.get(0).getDbid();
- long result2 = list.get(1).getDbid();
- assertTrue( (result1==id5 && result2==id6) ||
- (result1==id6 && result2==id5));
- } finally {
- Environment.getCurrent().close();
- }
- cleanJobs();
+
+ JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
+ ExecutionImpl execution = getExecution();
+ assertEquals(0, jobDbSession.findExclusiveJobs(execution).size());
+ // a jobImpl does not belong to the execution
+ JobImpl<?> job1 = new TimerImpl();
+ JobImpl<?> job2 = new TimerImpl();
+ job2.setExecution(execution);
+ JobImpl<?> job3 = new TimerImpl();
+ job3.setExecution(execution);
+ JobImpl<?> job4 = new TimerImpl();
+ job4.setExecution(execution);
+ JobImpl<?> job5 = new TimerImpl();
+ job5.setExecution(execution);
+ JobImpl<?> job6 = new TimerImpl();
+ job6.setExecution(execution);
+ // a jobImpl is not exclusive
+ job1.setExclusive(true);
+ job2.setExclusive(true);
+ job3.setExclusive(false);
+ job4.setExclusive(true);
+ job5.setExclusive(true);
+ job6.setExclusive(true);
+ // a jobImpl is locked
+ job2.setLockOwner("a jobExecutor");
+ // a jobImpl's due date is not past
+ job1.setDueDate(null);
+ job2.setDueDate(null);
+ job3.setDueDate(null);
+ job4.setDueDate(new Date(Long.MAX_VALUE));
+ job5.setDueDate(null);
+ job6.setDueDate(new Date());
+ jobDbSession.save(job1);
+ jobDbSession.save(job2);
+ jobDbSession.save(job3);
+ jobDbSession.save(job4);
+ jobDbSession.save(job5);
+ jobDbSession.save(job6);
+ id5 = job5.getDbid();
+ id6 = job6.getDbid();
+
+ newTransaction();
+
+ jobDbSession = Environment.getCurrent().get(JobDbSession.class);
+ ExecutionImpl processInstance = getExecution();
+ List<JobImpl<?>> list = jobDbSession.findExclusiveJobs(processInstance);
+ assertEquals(2, list.size());
+ long result1 = list.get(0).getDbid();
+ long result2 = list.get(1).getDbid();
+ assertTrue( (result1==id5 && result2==id6) ||
+ (result1==id6 && result2==id5));
+
+ newTransaction();
+ cleanTimers();
}
- public void testGetFirstDueJob() {
+ public void testFindFirstDueJob() {
long id2, id3, id4;
long timestamp = System.currentTimeMillis();
- environmentFactory.openEnvironment();
- try {
- JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
- assertNull(jobDbSession.findFirstDueJob());
- JobImpl<?> job1 = new TestJob();
- JobImpl<?> job2 = new TestJob();
- JobImpl<?> job3 = new TestJob();
- JobImpl<?> job4 = new TestJob();
- // a jobImpl is locked
- job1.setLockOwner("a jobExecutor");
- job2.setDueDate(null);
- job3.setDueDate(new Date(timestamp - 200));
- job4.setDueDate(new Date(timestamp));
- jobDbSession.save(job1);
- jobDbSession.save(job2);
- jobDbSession.save(job3);
- jobDbSession.save(job4);
- id2 = job2.getDbid();
- id3 = job3.getDbid();
- id4 = job4.getDbid();
- } finally {
- Environment.getCurrent().close();
- }
+
+ JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
+ assertNull(jobDbSession.findFirstDueJob());
+ JobImpl<?> job1 = new TimerImpl();
+ JobImpl<?> job2 = new TimerImpl();
+ JobImpl<?> job3 = new TimerImpl();
+ JobImpl<?> job4 = new TimerImpl();
+ // a jobImpl is locked
+ job1.setLockOwner("a jobExecutor");
+ job2.setDueDate(null);
+ job3.setDueDate(new Date(timestamp - 200));
+ job4.setDueDate(new Date(timestamp));
+ jobDbSession.save(job1);
+ jobDbSession.save(job2);
+ jobDbSession.save(job3);
+ jobDbSession.save(job4);
+ id2 = job2.getDbid();
+ id3 = job3.getDbid();
+ id4 = job4.getDbid();
+
+ newTransaction();
List<Long> ids = new ArrayList<Long>();
- environmentFactory.openEnvironment();
- try {
- JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
- JobImpl<?> jobImpl = jobDbSession.findFirstDueJob();
- while (jobImpl != null) {
- ids.add(jobImpl.getDbid());
- jobDbSession.delete(jobImpl);
- jobImpl = jobDbSession.findFirstDueJob();
- }
- } finally {
- Environment.getCurrent().close();
+
+ jobDbSession = Environment.getCurrent().get(JobDbSession.class);
+ JobImpl<?> jobImpl = jobDbSession.findFirstDueJob();
+ while (jobImpl != null) {
+ ids.add(jobImpl.getDbid());
+ jobDbSession.delete(jobImpl);
+ jobImpl = jobDbSession.findFirstDueJob();
}
+
assertEquals(3, ids.size());
assertEquals(id2, ids.get(0).longValue());
assertEquals(id3, ids.get(1).longValue());
assertEquals(id4, ids.get(2).longValue());
- cleanJobs();
+ newTransaction();
+ cleanTimers();
}
-
- TODO don't put a comment if it doesn't explain more then what you can easily
- read in the code. in this case the comment doesn't explain more then the method name.
- i have removed following such comments already
-
- /** Test the method findAllTimers
+ /*
public void testFindAllTimers() {
long id1, id2;
environmentFactory.openEnvironment();
try {
- JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
+ JobDbSession jobDbSession = Environment.getCurrent().get(PvmDbSession.class);
assertTrue(jobDbSession.findAllTimers().isEmpty());
ExecutionImpl execution = getExecution();
- JobImpl<?> jobImpl = new TestJob();
+ JobImpl<?> jobImpl = new TimerImpl();
JobImpl<?> timer1 = new TimerImpl(execution);
JobImpl<?> timer2 = new TimerImpl(execution);
timer1.setDueDate(new Date());
@@ -371,7 +313,7 @@
assertEquals(id2, timers.get(0).getDbid());
assertEquals(id1, timers.get(1).getDbid());
}
- cleanJobs();
+ cleanTimers();
}
public void testFindTimers() {
@@ -417,7 +359,7 @@
assertEquals(id2, timers.get(0).getDbid());
assertEquals(id1, timers.get(1).getDbid());
}
- cleanJobs();
+ cleanTimers();
environmentFactory.openEnvironment();
try {
DbSession dbSession = Environment.getCurrent().get(DbSession.class);
@@ -433,7 +375,7 @@
try {
JobDbSession jobDbSession = Environment.getCurrent().get(JobDbSession.class);
ExecutionImpl execution = getExecution();
- JobImpl<?> jobImpl = new TestJob();
+ JobImpl<?> jobImpl = new TimerImpl();
JobImpl<?> timer1 = execution.createTimer("e", "s", "200 millis");
JobImpl<?> timer2 = new TimerImpl(execution);
JobImpl<?> timer3 = new TimerImpl(execution);
@@ -467,8 +409,7 @@
assertEquals(id1, ids.get(0).longValue());
assertEquals(id3, ids.get(1).longValue());
assertEquals(id2, ids.get(2).longValue());
- cleanJobs();
+ cleanTimers();
}
-
- */
+*/
}
More information about the jbpm-commits
mailing list