commit 31e4d24c037f0a3099263abc9c74b629f219b58b
author sathwik <sathwik@apache.org> Mon Aug 03 15:09:55 2015 +0530
committer sathwik <sathwik@apache.org> Mon Aug 03 15:09:55 2015 +0530
tree 95b22d0f83541e2d8e4fb5f37c6aa8cdebe5ff46
parent c7dcee5380df56b2e9ca732ec3aa5afda1f0297f

ODE-1034: Fixes for some failing testcases

dao-hibernate-db/src/main/sql/simplesched-hsql.sql

diff --git a/dao-hibernate-db/src/main/sql/simplesched-hsql.sql b/dao-hibernate-db/src/main/sql/simplesched-hsql.sql
index 1074afc..6ade040 100644
--- a/dao-hibernate-db/src/main/sql/simplesched-hsql.sql
+++ b/dao-hibernate-db/src/main/sql/simplesched-hsql.sql
@@ -5,9 +5,9 @@
 --
 
 CREATE TABLE ode_job (
-  jobid CHAR(64)  NOT NULL DEFAULT '',
+  jobid varchar(64)  NOT NULL DEFAULT '',
   ts BIGINT  NOT NULL DEFAULT 0,
-  nodeid char(64),
+  nodeid varchar(64),
   scheduled int  NOT NULL DEFAULT 0,
   transacted int  NOT NULL DEFAULT 0,
 
@@ -20,7 +20,7 @@
   correlationKeySet varchar(255),
   retryCount int,
   inMem int,
-  detailsExt binary(4096),
+  detailsExt blob(4096),
 
   PRIMARY KEY(jobid));
 

dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java

diff --git a/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java b/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
index deb8d7a..20798f5 100644
--- a/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
+++ b/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
@@ -66,6 +66,9 @@
         hsqlds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
         hsqlds.setUser("sa");
         hsqlds.setPassword("");
+        Properties prop = new Properties();
+        prop.setProperty("sql.enforce_size", "false");
+        hsqlds.setProperties(prop);
         _ds = hsqlds;
 
         _txm = new EmbeddedGeronimoFactory().getTransactionManager();

dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java

diff --git a/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java b/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
index 4cb6b3d..a54eb49 100644
--- a/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
+++ b/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
@@ -69,6 +69,9 @@
         hsqlds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
         hsqlds.setUser("sa");
         hsqlds.setPassword("");
+        Properties prop = new Properties();
+        prop.setProperty("sql.enforce_size", "false");
+        hsqlds.setProperties(prop);
         _ds = hsqlds;
 
         _txm = new EmbeddedGeronimoFactory().getTransactionManager();

scheduler-simple/src/test/resources/simplesched-hsql.sql

diff --git a/scheduler-simple/src/test/resources/simplesched-hsql.sql b/scheduler-simple/src/test/resources/simplesched-hsql.sql
index 8edaec7..b62a1b4 100644
--- a/scheduler-simple/src/test/resources/simplesched-hsql.sql
+++ b/scheduler-simple/src/test/resources/simplesched-hsql.sql
@@ -1,7 +1,7 @@
 CREATE TABLE ode_job (
-  jobid CHAR(64)  NOT NULL,
+  jobid varchar(64)  NOT NULL DEFAULT '',
   ts BIGINT  NOT NULL,
-  nodeid char(64),
+  nodeid varchar(64),
   scheduled int  NOT NULL,
   transacted int  NOT NULL,
 
@@ -14,7 +14,7 @@
   correlationKeySet varchar(255),
   retryCount int,
   inMem int,
-  detailsExt binary(4096),
+  detailsExt blob(4096),
 
   PRIMARY KEY(jobid));