no message

alitheia/core/src/main/java/eu/sqooss/service/scheduler/Job.java

@@ -101,6 +101,8 @@ public enum State {
 
     private ResumePoint resumePoint;
 
+    private DBService dbs;
+
     public void setWorkerThread(WorkerThread worker) {
     	m_worker = worker;
      }
@@ -215,7 +217,6 @@ private final synchronized void removeDependee(Job other) {
      * @throws Exception
      */
     final public long execute() throws Exception {
-        DBService dbs = AlitheiaCore.getInstance().getDBService();
         long timer = System.currentTimeMillis();
         try {
             setState(State.Running);
@@ -374,10 +375,21 @@ public int compareTo(Job other)
     /**
      * Protected default constructor.
      */
-    protected Job() {
+    protected Job() {        
+    	this(AlitheiaCore.getInstance().getDBService());
+    }
+
+    /**
+     * Alternative constructor, allows injecting your
+     * own DBService
+     */
+    protected Job(DBService dbs)
+    {
         m_scheduler = null;
         m_errorException = null;
         setState( State.Created );
+
+        this.dbs = dbs;    	
     }
 
     /**
@@ -493,7 +505,6 @@ public void yield(ResumePoint p) throws SchedulerException {
 
     public long resume() throws Exception {
         long ts = System.currentTimeMillis();
-        DBService dbs = AlitheiaCore.getInstance().getDBService();
 
         if (state() != State.Yielded)
             throw new SchedulerException("Cannot resume a non-yielded job");

alitheia/core/src/test/java/eu/sqooss/test/service/scheduler/SchedulerTests.java

@@ -4,7 +4,9 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import eu.sqooss.impl.service.db.DBServiceImpl;
 import eu.sqooss.impl.service.scheduler.SchedulerServiceImpl;
+import eu.sqooss.service.db.DBService;
 import eu.sqooss.service.scheduler.SchedulerException;
 
 public class SchedulerTests {
@@ -13,22 +15,24 @@ public class SchedulerTests {
 
     @BeforeClass
     public static void setUp() {
-        sched = new SchedulerServiceImpl();
+    	sched = new SchedulerServiceImpl();
         sched.startExecute(2);
     }
 
     @Test
     public void testJobYield() throws SchedulerException {
+
+        DBService dbs = DBServiceImpl.getInstance();
 
-        TestJob j1 = new TestJob(20, "Test");
+        TestJob j1 = new TestJob(1, "Job 1", dbs);
         sched.enqueue(j1);
-        TestJob j2 = new TestJob(20, "Test");
+        TestJob j2 = new TestJob(2, "Job 2", dbs);
         sched.enqueue(j2);
-        TestJob j3 = new TestJob(20, "Test");
+        TestJob j3 = new TestJob(3, "Job 3", dbs);
         sched.enqueue(j3);
-        TestJob j4 = new TestJob(20, "Test");
+        TestJob j4 = new TestJob(4, "Job 4", dbs);
         sched.enqueue(j4);
-    }
+}
 
     @AfterClass
     public static void tearDown() {

alitheia/core/src/test/java/eu/sqooss/test/service/scheduler/TestJob.java

@@ -33,6 +33,7 @@
 
 package eu.sqooss.test.service.scheduler;
 
+import eu.sqooss.service.db.DBService;
 import eu.sqooss.service.scheduler.Job;
 
 /**
@@ -50,7 +51,8 @@ class TestJob extends Job
     /**
      * Contructor creating a job printing string \a s \a n times.
      */
-    public TestJob(int n, String s) {
+    public TestJob(int n, String s, DBService dbs) {
+    	super(dbs);
         this.n = n;
         this.s = s;
     }
@@ -62,7 +64,6 @@ public long priority() {
     protected void run() throws Exception {
         System.out.println("Testjob running!");
         for (int i = 0; i < n; ++i) {   
-            Thread.sleep(500);
             System.out.println(s);
         }
         System.out.println("Testjob finished!");