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

[aadamchik]

Author: aadamchik
Date: Sun May 17 17:27:49 2009
New Revision: 775721

URL: http://svn.apache.org/viewvc?rev=775721&view=rev
Log:
fixing merge tests cleanup that causes chain reaction with tests downstream

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbTest.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbTest.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbTest.java?rev=775721&r1=775720&r2=775721&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbTest.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbTest.java
 Sun May 17 17:27:49 2009
@@ -32,27 +32,32 @@
         // create and add new column to model and db
         DbAttribute column = new DbAttribute("NEWCOL2", Types.VARCHAR, 
dbEntity);
 
-        column.setMandatory(true);
-        column.setMaxLength(10);
-        dbEntity.addAttribute(column);
-        assertTokensAndExecute(node, map, 2, 0);
-
-        // check that is was merged
-        assertTokensAndExecute(node, map, 0, 0);
-
-        // set null
-        column.setMandatory(false);
-
-        // merge to db
-        assertTokensAndExecute(node, map, 1, 0);
-
-        // check that is was merged
-        assertTokensAndExecute(node, map, 0, 0);
-
-        // clean up
-        dbEntity.removeAttribute(column.getName());
-        assertTokensAndExecute(node, map, 1, 0);
-        assertTokensAndExecute(node, map, 0, 0);
+        try {
+
+            column.setMandatory(true);
+            column.setMaxLength(10);
+            dbEntity.addAttribute(column);
+            assertTokensAndExecute(node, map, 2, 0);
+
+            // check that is was merged
+            assertTokensAndExecute(node, map, 0, 0);
+
+            // set null
+            column.setMandatory(false);
+
+            // merge to db
+            assertTokensAndExecute(node, map, 1, 0);
+
+            // check that is was merged
+            assertTokensAndExecute(node, map, 0, 0);
+
+            // clean up
+        }
+        finally {
+            dbEntity.removeAttribute(column.getName());
+            assertTokensAndExecute(node, map, 1, 0);
+            assertTokensAndExecute(node, map, 0, 0);
+        }
     }
 
 }