cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1099080 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access: DataContextRollbackTest.java DeleteRulesTest.java
Date Tue, 03 May 2011 14:38:50 GMT
Author: aadamchik
Date: Tue May  3 14:38:50 2011
New Revision: 1099080

URL: http://svn.apache.org/viewvc?rev=1099080&view=rev
Log:
proper cleanup

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java?rev=1099080&r1=1099079&r2=1099080&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java
Tue May  3 14:38:50 2011
@@ -37,13 +37,13 @@ import org.apache.cayenne.unit.di.server
 public class DataContextRollbackTest extends ServerCase {
 
     @Inject
-    protected DataContext context;
+    private DataContext context;
 
     @Inject
-    protected ServerRuntime serverRuntime;
+    private ServerRuntime serverRuntime;
 
     @Inject
-    protected DBHelper dbHelper;
+    private DBHelper dbHelper;
 
     @Override
     protected void setUpAfterInjection() throws Exception {
@@ -119,7 +119,7 @@ public class DataContextRollbackTest ext
 
         assertEquals(PersistenceState.TRANSIENT, artist.getPersistenceState());
         context.commitChanges();
-        
+
         // The commit should have made no changes, so
         // perform a fetch to ensure that this artist hasn't been persisted to the db
 
@@ -157,10 +157,10 @@ public class DataContextRollbackTest ext
 
         DataContext freshContext = (DataContext) serverRuntime.getContext();
         assertNotSame(this.context, freshContext);
-        
+
         SelectQuery query = new SelectQuery(Painting.class);
         query.setQualifier(ExpressionFactory.matchExp("paintingTitle", paintingTitle));
-        List queryResults = freshContext.performQuery(query);
+        List<?> queryResults = freshContext.performQuery(query);
 
         assertEquals(1, queryResults.size());
         Painting queriedPainting = (Painting) queryResults.get(0);
@@ -187,10 +187,10 @@ public class DataContextRollbackTest ext
 
         DataContext freshContext = (DataContext) serverRuntime.getContext();
         assertNotSame(this.context, freshContext);
-        
+
         SelectQuery query = new SelectQuery(Artist.class);
         query.setQualifier(ExpressionFactory.matchExp("artistName", artistName));
-        List queryResults = freshContext.performQuery(query);
+        List<?> queryResults = freshContext.performQuery(query);
 
         assertEquals(1, queryResults.size());
     }
@@ -214,11 +214,10 @@ public class DataContextRollbackTest ext
         // .. and ensure that the correct data is in the db
         DataContext freshContext = (DataContext) serverRuntime.getContext();
         assertNotSame(this.context, freshContext);
-        
-        
+
         SelectQuery query = new SelectQuery(Artist.class);
         query.setQualifier(ExpressionFactory.matchExp("artistName", artistName));
-        List queryResults = freshContext.performQuery(query);
+        List<?> queryResults = freshContext.performQuery(query);
 
         assertEquals(1, queryResults.size());
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java?rev=1099080&r1=1099079&r2=1099080&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java
Tue May  3 14:38:50 2011
@@ -53,6 +53,7 @@ public class DeleteRulesTest extends Ser
         dbHelper.deleteAll("DELETE_RULE_TEST3");
         dbHelper.deleteAll("DELETE_RULE_TEST1");
         dbHelper.deleteAll("DELETE_RULE_TEST2");
+        dbHelper.deleteAll("DELETE_RULE_JOIN");
         dbHelper.deleteAll("DELETE_RULE_FLATB");
         dbHelper.deleteAll("DELETE_RULE_FLATA");
     }



Mime
View raw message