svn commit: r605720 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge: MergerFactoryTest.java MergerFactoryTestDisabled.java

[to...@apache.org]

Author: torehalset
Date: Wed Dec 19 14:14:21 2007
New Revision: 605720

URL: http://svn.apache.org/viewvc?rev=605720&view=rev
Log:
temporarily disable test that destroy other tests

Added:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTestDisabled.java
      - copied, changed from r605715, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java
Removed:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java

Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTestDisabled.java (from r605715, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTestDisabled.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTestDisabled.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java&r1=605715&r2=605720&rev=605720&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTestDisabled.java Wed Dec 19 14:14:21 2007
@@ -38,8 +38,9 @@
 import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.util.Util;
 
-public class MergerFactoryTest extends CayenneCase {
+public class MergerFactoryTestDisabled extends CayenneCase {
 
     private DataNode node;
     private DataMap map;
@@ -52,6 +53,10 @@
         createTestData("testArtists");
         node = getDomain().getDataNodes().iterator().next();
         map = getDomain().getMap("testmap");
+
+        // clone the DataMap so that we can manipulate it without worries
+        map = (DataMap) Util.cloneViaSerialization(map);
+
         filterDataMap(node, map);
 
         DbMerger merger = new DbMerger();
@@ -61,7 +66,7 @@
         assertTokensAndExecute(node, map, 0, 0);
     }
 
-    public void testAddAndDropColumnToDb() throws Exception {
+    public void XXtestAddAndDropColumnToDb() throws Exception {
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);
 
@@ -81,7 +86,7 @@
         assertTokensAndExecute(node, map, 0, 0);
     }
 
-    public void testChangeVarcharSizeToDb() throws Exception {
+    public void XXtestChangeVarcharSizeToDb() throws Exception {
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);
 
@@ -110,7 +115,7 @@
         assertTokensAndExecute(node, map, 0, 0);
     }
 
-    public void testMultipleTokensToDb() throws Exception {
+    public void XXtestMultipleTokensToDb() throws Exception {
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);
 
@@ -193,7 +198,7 @@
         assertTokensAndExecute(node, map, 0, 0);
     }
 
-    public void testAddForeignKeyWithTable() throws Exception {
+    public void XXtestAddForeignKeyWithTable() throws Exception {
         dropTableIfPresent(node, "NEW_TABLE");
 
         assertTokensAndExecute(node, map, 0, 0);
@@ -257,7 +262,7 @@
         assertTokensAndExecute(node, map, 0, 0);
     }
 
-    public void testAddForeignKeyAfterTable() throws Exception {
+    public void XXtestAddForeignKeyAfterTable() throws Exception {
         dropTableIfPresent(node, "NEW_TABLE");
 
         assertTokensAndExecute(node, map, 0, 0);
@@ -282,7 +287,7 @@
 
         DbEntity artistDbEntity = map.getDbEntity("ARTIST");
         assertNotNull(artistDbEntity);
-        
+
         assertTokensAndExecute(node, map, 1, 0);
         assertTokensAndExecute(node, map, 0, 0);
 
@@ -323,7 +328,7 @@
         assertFalse(map.getDbEntities().contains(dbEntity));
         assertTokensAndExecute(node, map, 0, 0);
     }
-    
+
     private void assertTokensAndExecute(
             DataNode node,
             DataMap map,