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 2011/04/22 23:05:44 UTC
svn commit: r1096039 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne:
./ access/
Author: aadamchik
Date: Fri Apr 22 21:05:43 2011
New Revision: 1096039
URL: http://svn.apache.org/viewvc?rev=1096039&view=rev
Log:
delete order matters
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMapRelationshipTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOSetRelationshipTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMapRelationshipTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMapRelationshipTest.java?rev=1096039&r1=1096038&r2=1096039&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMapRelationshipTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMapRelationshipTest.java Fri Apr 22 21:05:43 2011
@@ -37,35 +37,36 @@ public class CDOMapRelationshipTest exte
@Inject
protected ObjectContext context;
-
+
@Inject
protected DBHelper dbHelper;
-
+
protected TableHelper tMapToMany;
protected TableHelper tMapToManyTarget;
protected TableHelper tIdMapToMany;
protected TableHelper tIdMapToManyTarget;
-
+
@Override
protected void setUpAfterInjection() throws Exception {
- dbHelper.deleteAll("MAP_TO_MANY");
dbHelper.deleteAll("MAP_TO_MANY_TARGET");
- dbHelper.deleteAll("ID_MAP_TO_MANY");
+ dbHelper.deleteAll("MAP_TO_MANY");
+
dbHelper.deleteAll("ID_MAP_TO_MANY_TARGET");
-
+ dbHelper.deleteAll("ID_MAP_TO_MANY");
+
tMapToMany = new TableHelper(dbHelper, "MAP_TO_MANY");
tMapToMany.setColumns("ID");
-
+
tMapToManyTarget = new TableHelper(dbHelper, "MAP_TO_MANY_TARGET");
tMapToManyTarget.setColumns("ID", "MAP_TO_MANY_ID", "NAME");
-
+
tIdMapToMany = new TableHelper(dbHelper, "ID_MAP_TO_MANY");
tIdMapToMany.setColumns("ID");
-
+
tIdMapToManyTarget = new TableHelper(dbHelper, "ID_MAP_TO_MANY_TARGET");
tIdMapToManyTarget.setColumns("ID", "MAP_TO_MANY_ID");
}
-
+
protected void createTestDataSet() throws Exception {
tMapToMany.insert(1);
tMapToMany.insert(2);
@@ -74,7 +75,7 @@ public class CDOMapRelationshipTest exte
tMapToManyTarget.insert(3, 1, "C");
tMapToManyTarget.insert(4, 2, "A");
}
-
+
protected void createTestIdDataSet() throws Exception {
tIdMapToMany.insert(1);
tIdMapToMany.insert(2);
@@ -87,10 +88,7 @@ public class CDOMapRelationshipTest exte
public void testReadToMany() throws Exception {
createTestDataSet();
- MapToMany o1 = Cayenne.objectForPK(
- context,
- MapToMany.class,
- 1);
+ MapToMany o1 = Cayenne.objectForPK(context, MapToMany.class, 1);
Map targets = o1.getTargets();
@@ -110,10 +108,7 @@ public class CDOMapRelationshipTest exte
public void testReadToManyId() throws Exception {
createTestIdDataSet();
- IdMapToMany o1 = Cayenne.objectForPK(
- context,
- IdMapToMany.class,
- 1);
+ IdMapToMany o1 = Cayenne.objectForPK(context, IdMapToMany.class, 1);
Map targets = o1.getTargets();
@@ -125,12 +120,9 @@ public class CDOMapRelationshipTest exte
assertNotNull(targets.get(new Integer(2)));
assertNotNull(targets.get(new Integer(3)));
- assertEquals(1, Cayenne.intPKForObject((Persistent) targets
- .get(new Integer(1))));
- assertEquals(2, Cayenne.intPKForObject((Persistent) targets
- .get(new Integer(2))));
- assertEquals(3, Cayenne.intPKForObject((Persistent) targets
- .get(new Integer(3))));
+ assertEquals(1, Cayenne.intPKForObject((Persistent) targets.get(new Integer(1))));
+ assertEquals(2, Cayenne.intPKForObject((Persistent) targets.get(new Integer(2))));
+ assertEquals(3, Cayenne.intPKForObject((Persistent) targets.get(new Integer(3))));
}
public void testReadToManyPrefetching() throws Exception {
@@ -139,9 +131,7 @@ public class CDOMapRelationshipTest exte
SelectQuery query = new SelectQuery(MapToMany.class, ExpressionFactory
.matchDbExp(MapToMany.ID_PK_COLUMN, new Integer(1)));
query.addPrefetch(MapToMany.TARGETS_PROPERTY);
- MapToMany o1 = (MapToMany) Cayenne.objectForQuery(
- context,
- query);
+ MapToMany o1 = (MapToMany) Cayenne.objectForQuery(context, query);
Map targets = o1.getTargets();
@@ -157,17 +147,15 @@ public class CDOMapRelationshipTest exte
public void testAddToMany() throws Exception {
createTestDataSet();
- MapToMany o1 = Cayenne.objectForPK(
- context,
- MapToMany.class,
- 1);
+ MapToMany o1 = Cayenne.objectForPK(context, MapToMany.class, 1);
Map targets = o1.getTargets();
assertNotNull(targets);
assertEquals(3, targets.size());
- MapToManyTarget newTarget = o1.getObjectContext().newObject(
- MapToManyTarget.class);
+ MapToManyTarget newTarget = o1
+ .getObjectContext()
+ .newObject(MapToManyTarget.class);
newTarget.setName("X");
o1.addToTargets(newTarget);
@@ -184,10 +172,7 @@ public class CDOMapRelationshipTest exte
public void testRemoveToMany() throws Exception {
createTestDataSet();
- MapToMany o1 = Cayenne.objectForPK(
- context,
- MapToMany.class,
- 1);
+ MapToMany o1 = Cayenne.objectForPK(context, MapToMany.class, 1);
Map targets = o1.getTargets();
assertEquals(3, targets.size());
@@ -210,17 +195,15 @@ public class CDOMapRelationshipTest exte
public void testAddToManyViaReverse() throws Exception {
createTestDataSet();
- MapToMany o1 = Cayenne.objectForPK(
- context,
- MapToMany.class,
- 1);
+ MapToMany o1 = Cayenne.objectForPK(context, MapToMany.class, 1);
Map targets = o1.getTargets();
assertNotNull(targets);
assertEquals(3, targets.size());
- MapToManyTarget newTarget = o1.getObjectContext().newObject(
- MapToManyTarget.class);
+ MapToManyTarget newTarget = o1
+ .getObjectContext()
+ .newObject(MapToManyTarget.class);
newTarget.setName("X");
newTarget.setMapToMany(o1);
@@ -237,10 +220,7 @@ public class CDOMapRelationshipTest exte
public void testModifyToManyKey() throws Exception {
createTestDataSet();
- MapToMany o1 = Cayenne.objectForPK(
- context,
- MapToMany.class,
- 1);
+ MapToMany o1 = Cayenne.objectForPK(context, MapToMany.class, 1);
Map targets = o1.getTargets();
MapToManyTarget target = (MapToManyTarget) targets.get("B");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java?rev=1096039&r1=1096038&r2=1096039&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java Fri Apr 22 21:05:43 2011
@@ -56,6 +56,7 @@ public class CDOOne2ManyTest extends Ser
protected void setUpAfterInjection() throws Exception {
dbHelper.deleteAll("PAINTING_INFO");
dbHelper.deleteAll("PAINTING");
+ dbHelper.deleteAll("PAINTING1");
dbHelper.deleteAll("ARTIST_EXHIBIT");
dbHelper.deleteAll("ARTIST_GROUP");
dbHelper.deleteAll("ARTIST");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOSetRelationshipTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOSetRelationshipTest.java?rev=1096039&r1=1096038&r2=1096039&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOSetRelationshipTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOSetRelationshipTest.java Fri Apr 22 21:05:43 2011
@@ -36,25 +36,25 @@ public class CDOSetRelationshipTest exte
@Inject
protected ObjectContext context;
-
+
@Inject
protected DBHelper dbHelper;
-
+
protected TableHelper tSetToMany;
protected TableHelper tSetToManyTarget;
-
+
@Override
protected void setUpAfterInjection() throws Exception {
- dbHelper.deleteAll("SET_TO_MANY");
dbHelper.deleteAll("SET_TO_MANY_TARGET");
-
+ dbHelper.deleteAll("SET_TO_MANY");
+
tSetToMany = new TableHelper(dbHelper, "SET_TO_MANY");
tSetToMany.setColumns("ID");
-
+
tSetToManyTarget = new TableHelper(dbHelper, "SET_TO_MANY_TARGET");
tSetToManyTarget.setColumns("ID", "SET_TO_MANY_ID");
}
-
+
protected void createTestDataSet() throws Exception {
tSetToMany.insert(1);
tSetToMany.insert(2);
@@ -67,10 +67,7 @@ public class CDOSetRelationshipTest exte
public void testReadToMany() throws Exception {
createTestDataSet();
- SetToMany o1 = Cayenne.objectForPK(
- context,
- SetToMany.class,
- 1);
+ SetToMany o1 = Cayenne.objectForPK(context, SetToMany.class, 1);
Set targets = o1.getTargets();
@@ -99,9 +96,7 @@ public class CDOSetRelationshipTest exte
SelectQuery query = new SelectQuery(SetToMany.class, ExpressionFactory
.matchDbExp(SetToMany.ID_PK_COLUMN, new Integer(1)));
query.addPrefetch(SetToMany.TARGETS_PROPERTY);
- SetToMany o1 = (SetToMany) Cayenne.objectForQuery(
- context,
- query);
+ SetToMany o1 = (SetToMany) Cayenne.objectForQuery(context, query);
Set targets = o1.getTargets();
@@ -127,17 +122,15 @@ public class CDOSetRelationshipTest exte
public void testAddToMany() throws Exception {
createTestDataSet();
- SetToMany o1 = Cayenne.objectForPK(
- context,
- SetToMany.class,
- 1);
+ SetToMany o1 = Cayenne.objectForPK(context, SetToMany.class, 1);
Set targets = o1.getTargets();
assertNotNull(targets);
assertEquals(3, targets.size());
- SetToManyTarget newTarget = o1.getObjectContext().newObject(
- SetToManyTarget.class);
+ SetToManyTarget newTarget = o1
+ .getObjectContext()
+ .newObject(SetToManyTarget.class);
o1.addToTargets(newTarget);
assertEquals(4, targets.size());
@@ -153,16 +146,15 @@ public class CDOSetRelationshipTest exte
public void testRemoveToMany() throws Exception {
createTestDataSet();
- SetToMany o1 = Cayenne.objectForPK(
- context,
- SetToMany.class,
- 1);
+ SetToMany o1 = Cayenne.objectForPK(context, SetToMany.class, 1);
Set targets = o1.getTargets();
assertEquals(3, targets.size());
- SetToManyTarget target = Cayenne.objectForPK(o1
- .getObjectContext(), SetToManyTarget.class, 2);
+ SetToManyTarget target = Cayenne.objectForPK(
+ o1.getObjectContext(),
+ SetToManyTarget.class,
+ 2);
o1.removeFromTargets(target);
assertEquals(2, targets.size());
@@ -179,17 +171,15 @@ public class CDOSetRelationshipTest exte
public void testAddToManyViaReverse() throws Exception {
createTestDataSet();
- SetToMany o1 = Cayenne.objectForPK(
- context,
- SetToMany.class,
- 1);
+ SetToMany o1 = Cayenne.objectForPK(context, SetToMany.class, 1);
Set targets = o1.getTargets();
assertNotNull(targets);
assertEquals(3, targets.size());
- SetToManyTarget newTarget = o1.getObjectContext().newObject(
- SetToManyTarget.class);
+ SetToManyTarget newTarget = o1
+ .getObjectContext()
+ .newObject(SetToManyTarget.class);
newTarget.setSetToMany(o1);
assertEquals(4, targets.size());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java?rev=1096039&r1=1096038&r2=1096039&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java Fri Apr 22 21:05:43 2011
@@ -61,6 +61,9 @@ public class DataContextExtrasTest exten
protected void setUpAfterInjection() throws Exception {
dbHelper.deleteAll("PAINTING_INFO");
dbHelper.deleteAll("PAINTING");
+ dbHelper.deleteAll("PAINTING1");
+ dbHelper.deleteAll("ARTIST_EXHIBIT");
+ dbHelper.deleteAll("ARTIST_GROUP");
dbHelper.deleteAll("ARTIST");
tArtist = new TableHelper(dbHelper, "ARTIST");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasTest.java?rev=1096039&r1=1096038&r2=1096039&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasTest.java Fri Apr 22 21:05:43 2011
@@ -59,10 +59,11 @@ public class DataContextPrefetchExtrasTe
@Override
protected void setUpAfterInjection() throws Exception {
- dbHelper.deleteAll("CHAR_PK_TEST");
dbHelper.deleteAll("CHAR_FK_TEST");
- dbHelper.deleteAll("COMPOUND_PK_TEST");
+ dbHelper.deleteAll("CHAR_PK_TEST");
+
dbHelper.deleteAll("COMPOUND_FK_TEST");
+ dbHelper.deleteAll("COMPOUND_PK_TEST");
tCharPkTest = new TableHelper(dbHelper, "CHAR_PK_TEST");
tCharPkTest.setColumns("PK_COL", "OTHER_COL");