ODE-1034: Fixes for some failing testcases
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/31e4d24c Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/31e4d24c Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/31e4d24c Branch: refs/heads/master Commit: 31e4d24c037f0a3099263abc9c74b629f219b58b Parents: c7dcee5 Author: sathwik <[email protected]> Authored: Mon Aug 3 15:09:55 2015 +0530 Committer: sathwik <[email protected]> Committed: Mon Aug 3 15:09:55 2015 +0530 ---------------------------------------------------------------------- dao-hibernate-db/src/main/sql/simplesched-hsql.sql | 6 +++--- .../java/org/apache/ode/dao/jpa/test/InsertObjectTest.java | 3 +++ .../java/org/apache/ode/dao/jpa/test/SelectObjectTest.java | 3 +++ scheduler-simple/src/test/resources/simplesched-hsql.sql | 6 +++--- 4 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/31e4d24c/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 @@ CREATE TABLE ode_job ( correlationKeySet varchar(255), retryCount int, inMem int, - detailsExt binary(4096), + detailsExt blob(4096), PRIMARY KEY(jobid)); http://git-wip-us.apache.org/repos/asf/ode/blob/31e4d24c/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 @@ public class InsertObjectTest extends TestCase { 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(); http://git-wip-us.apache.org/repos/asf/ode/blob/31e4d24c/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 @@ public class SelectObjectTest extends TestCase { 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(); http://git-wip-us.apache.org/repos/asf/ode/blob/31e4d24c/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 @@ CREATE TABLE ode_job ( correlationKeySet varchar(255), retryCount int, inMem int, - detailsExt binary(4096), + detailsExt blob(4096), PRIMARY KEY(jobid));
