You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by to...@apache.org on 2008/01/20 02:04:28 UTC

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

Author: torehalset
Date: Sat Jan 19 17:04:27 2008
New Revision: 613488

URL: http://svn.apache.org/viewvc?rev=613488&view=rev
Log:
cleaning up

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=613488&r1=613487&r2=613488&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 Sat Jan 19 17:04:27 2008
@@ -49,7 +49,7 @@
             "NEW_TABLE",
             "NEW_TABLE2");
 
-    public DbMerger createMerger() {
+    protected DbMerger createMerger() {
         return new DbMerger() {
 
             @Override
@@ -59,7 +59,7 @@
         };
     }
     
-    public List<MergerToken> createMergeTokens() {
+    protected List<MergerToken> createMergeTokens() {
         return createMerger().createMergeTokens(node, map);
     }
 
@@ -236,7 +236,7 @@
     @Override
     protected void tearDown() throws Exception {
         super.tearDown();
-        // TODO: make this work deleteTestData();
+        deleteTestData();
     }
 
 }