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/08/04 21:31:30 UTC
svn commit: r1510317 - in
/cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne:
merge/DropTableToModelTest.java unit/jira/CAY_191Test.java
Author: aadamchik
Date: Sun Aug 4 19:31:30 2013
New Revision: 1510317
URL: http://svn.apache.org/r1510317
Log:
fixing Derby test failures
Modified:
cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/merge/DropTableToModelTest.java
cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/merge/DropTableToModelTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/merge/DropTableToModelTest.java?rev=1510317&r1=1510316&r2=1510317&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/merge/DropTableToModelTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/merge/DropTableToModelTest.java Sun Aug 4 19:31:30 2013
@@ -72,6 +72,7 @@ public class DropTableToModelTest extend
}
assertTrue(token instanceof DropTableToModel);
execute(token);
+ resolver.refreshMappingCache();
assertNull(map.getDbEntity(dbEntity.getName()));
assertNull(map.getObjEntity(objEntity.getName()));
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java?rev=1510317&r1=1510316&r2=1510317&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java Sun Aug 4 19:31:30 2013
@@ -45,7 +45,7 @@ public class CAY_191Test extends ServerC
@Override
protected void setUpAfterInjection() throws Exception {
dbHelper.deleteAll("FK_OF_DIFFERENT_TYPE");
- dbHelper.update("REFLEXIVE_AND_TO_ONE").set("PARENT_ID", null, Types.NULL).execute();
+ dbHelper.update("REFLEXIVE_AND_TO_ONE").set("PARENT_ID", null, Types.INTEGER).execute();
dbHelper.deleteAll("REFLEXIVE_AND_TO_ONE");
dbHelper.deleteAll("RELATIONSHIP_HELPER");