svn commit: r1400615 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java

[aadamchik]

Author: aadamchik
Date: Sun Oct 21 09:57:21 2012
New Revision: 1400615

URL: http://svn.apache.org/viewvc?rev=1400615&view=rev
Log:
CAY-1750  Occasional Invalid DB state during ValueForNullTest

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java?rev=1400615&r1=1400614&r2=1400615&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
 Sun Oct 21 09:57:21 2012
@@ -70,11 +70,11 @@ public abstract class MergeCase extends 
     @Override
     protected void setUpAfterInjection() throws Exception {
 
+        dbHelper.deleteAll("ARTIST_GROUP");
         dbHelper.deleteAll("ARTGROUP");
         dbHelper.deleteAll("PAINTING_INFO");
         dbHelper.deleteAll("PAINTING");
         dbHelper.deleteAll("ARTIST_EXHIBIT");
-        dbHelper.deleteAll("ARTIST_GROUP");
         dbHelper.deleteAll("ARTIST");
         dbHelper.deleteAll("EXHIBIT");
         dbHelper.deleteAll("GALLERY");