You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/07/28 20:28:46 UTC
svn commit: r1507827 - in
/cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne:
./ access/ merge/
Author: aadamchik
Date: Sun Jul 28 18:28:45 2013
New Revision: 1507827
URL: http://svn.apache.org/r1507827
Log:
addressing derby unit test failures
(this is a result of CAY-1836 patches that we haven't tested on Derby)
Modified:
cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsTest.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/FlattenedPrefetchTest.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java?rev=1507827&r1=1507826&r2=1507827&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java Sun Jul 28 18:28:45 2013
@@ -64,7 +64,7 @@ public class CayenneDataObjectFlattenedR
dbHelper.deleteAll("ARTIST_EXHIBIT");
dbHelper.deleteAll("ARTIST_GROUP");
dbHelper.deleteAll("ARTIST");
- dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.NULL).execute();
+ dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute();
dbHelper.deleteAll("ARTGROUP");
tArtist = new TableHelper(dbHelper, "ARTIST");
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java?rev=1507827&r1=1507826&r2=1507827&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java Sun Jul 28 18:28:45 2013
@@ -54,7 +54,7 @@ public class DataContextDeleteRulesTest
dbHelper.deleteAll("PAINTING");
dbHelper.deleteAll("ARTIST_EXHIBIT");
dbHelper.deleteAll("ARTIST_GROUP");
- dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.NULL).execute();
+ dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute();
dbHelper.deleteAll("ARTGROUP");
dbHelper.deleteAll("ARTIST");
dbHelper.deleteAll("EXHIBIT");
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsTest.java?rev=1507827&r1=1507826&r2=1507827&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsTest.java Sun Jul 28 18:28:45 2013
@@ -71,7 +71,7 @@ public class DataContextOuterJoinsTest e
"ARTIST_ID");
artistGroupHelper.deleteAll();
- dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.NULL).execute();
+ dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute();
artgroupHelper.deleteAll();
paintingHelper.deleteAll();
artistHelper.deleteAll();
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/FlattenedPrefetchTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/FlattenedPrefetchTest.java?rev=1507827&r1=1507826&r2=1507827&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/FlattenedPrefetchTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/access/FlattenedPrefetchTest.java Sun Jul 28 18:28:45 2013
@@ -65,7 +65,7 @@ public class FlattenedPrefetchTest exten
dbHelper.deleteAll("ARTIST_EXHIBIT");
dbHelper.deleteAll("ARTIST_GROUP");
dbHelper.deleteAll("ARTIST");
- dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.NULL).execute();
+ dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute();
dbHelper.deleteAll("ARTGROUP");
tArtist = new TableHelper(dbHelper, "ARTIST");
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java?rev=1507827&r1=1507826&r2=1507827&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java Sun Jul 28 18:28:45 2013
@@ -71,7 +71,7 @@ public abstract class MergeCase extends
protected void setUpAfterInjection() throws Exception {
dbHelper.deleteAll("ARTIST_GROUP");
- dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.NULL).execute();
+ dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute();
dbHelper.deleteAll("ARTGROUP");
dbHelper.deleteAll("PAINTING_INFO");
dbHelper.deleteAll("PAINTING");