svn commit: r558876 - in /incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple: DelegateSupport.java JdbcDelegateTest.java SimpleSchedulerTest.java

[vanto]

Author: vanto
Date: Mon Jul 23 15:00:31 2007
New Revision: 558876

URL: http://svn.apache.org/viewvc?view=rev&rev=558876
Log:
fixing test cases for simple-scheduler.

Modified:
    
incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
    
incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java
    
incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java

Modified: 
incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java?view=diff&rev=558876&r1=558875&r2=558876
==============================================================================
--- 
incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
 (original)
+++ 
incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
 Mon Jul 23 15:00:31 2007
@@ -2,42 +2,48 @@
 
 import java.sql.Connection;
 
-import org.apache.ode.scheduler.simple.DatabaseDelegate;
-import org.apache.ode.scheduler.simple.JdbcDelegate;
+import org.apache.ode.utils.GUID;
+import org.hsqldb.jdbc.jdbcDataSource;
 
 
 /**
- * Support class for creating a JDBC delegate (using local MYSQL db).
+ * Support class for creating a JDBC delegate (using in-mem HSQL db).
  * 
  * @author Maciej Szefler ( m s z e f l e r @ g m a i l . c o m )
  */
 public class DelegateSupport {
-/*
-    private MysqlDataSource _ds;
+
+    private jdbcDataSource _ds;
     private JdbcDelegate _del;
 
     public DelegateSupport() throws Exception {
-        _ds = new MysqlDataSource();
-        _ds.setUser("root");
-        _ds.setUrl("jdbc:mysql://localhost/ode");
+        _ds = new jdbcDataSource();
+        _ds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
+        _ds.setUser("sa");
+        _ds.setPassword("");
         
+        setup();
         _del = new JdbcDelegate(_ds);
-        truncate();
     }
 
     public DatabaseDelegate delegate() {
         return _del;
     }
     
-    public void truncate() throws Exception {
+    public void setup() throws Exception {
         Connection c = _ds.getConnection();
         try {
-            c.createStatement().execute("truncate table ode_job");
+            c.createStatement().executeUpdate("CREATE ALIAS MOD FOR 
\"org.apache.ode.scheduler.simple.DelegateSupport.mod\";");
+               String sql = "CREATE TABLE \"ODE_JOB\" (\"JOBID\" CHAR(64) NOT 
NULL, \"TS\" NUMERIC  NOT NULL, \"NODEID\" char(64)  NULL, \"SCHEDULED\" int  
NOT NULL, \"TRANSACTED\" int  NOT NULL, \"DETAILS\" BINARY(4096)  NULL, PRIMARY 
KEY(\"JOBID\"));";
+            c.createStatement().executeUpdate(sql);
         } finally {
             c.close();
         }
         
     }
-    */
+    
+    public static long mod(long a, long b) {
+       return a % b;
+    }
 }
 

Modified: 
incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java?view=diff&rev=558876&r1=558875&r2=558876
==============================================================================
--- 
incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java
 (original)
+++ 
incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/JdbcDelegateTest.java
 Mon Jul 23 15:00:31 2007
@@ -22,7 +22,7 @@
 
     public void setUp() throws Exception {
         _ds = new DelegateSupport();
-//        _del = _ds.delegate();
+        _del = _ds.delegate();
     }
     
     

Modified: 
incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java?view=diff&rev=558876&r1=558875&r2=558876
==============================================================================
--- 
incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
 (original)
+++ 
incubator/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/SimpleSchedulerTest.java
 Mon Jul 23 15:00:31 2007
@@ -1,7 +1,14 @@
 package org.apache.ode.scheduler.simple;
 
 import java.util.ArrayList;
-
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.transaction.RollbackException;
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
 import javax.transaction.TransactionManager;
 
 import junit.framework.TestCase;
@@ -9,7 +16,7 @@
 import org.apache.ode.bpel.iapi.Scheduler.JobInfo;
 import org.apache.ode.bpel.iapi.Scheduler.JobProcessor;
 import org.apache.ode.bpel.iapi.Scheduler.JobProcessorException;
-import org.apache.ode.scheduler.simple.SimpleScheduler;
+import org.objectweb.jotm.Jotm;
 
 public class SimpleSchedulerTest extends TestCase implements JobProcessor {
 
@@ -22,17 +29,13 @@
 
     TransactionManager _txm;
 
-    public void onScheduledJob(final JobInfo jobInfo) throws 
JobProcessorException {
-    }
     
-    /*
     Jotm _jotm;
 
     public void setUp() throws Exception {
         _jotm = new Jotm(true, false);
         _txm = _jotm.getTransactionManager();
         _ds = new DelegateSupport();
-        _ds.truncate();
 
         _scheduler = newScheduler("n1");
         _jobs = new ArrayList<JobInfo>(100);
@@ -234,5 +237,5 @@
         scheduler.setTransactionManager(_txm);
         return scheduler;
     }
-    */
+    
 }