Author: aadamchik
Date: Sun Oct 21 20:49:51 2012
New Revision: 1400722
URL: http://svn.apache.org/viewvc?rev=1400722&view=rev
Log:
proper db cleanup before the test
Modified:
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
Modified:
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java?rev=1400722&r1=1400721&r2=1400722&view=diff
==============================================================================
---
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
(original)
+++
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
Sun Oct 21 20:49:51 2012
@@ -33,6 +33,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
@@ -40,6 +41,9 @@ import org.apache.cayenne.unit.di.server
public abstract class MergeCase extends ServerCase {
@Inject
+ private DBHelper dbHelper;
+
+ @Inject
private ServerRuntime runtime;
@Inject
@@ -64,6 +68,15 @@ 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");
+ dbHelper.deleteAll("EXHIBIT");
+ dbHelper.deleteAll("GALLERY");
// this map can't be safely modified in this test, as it is reset by
DI container
// on every test
