svn commit: r1126070 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java

[aadamchik]

Author: aadamchik
Date: Sun May 22 16:45:21 2011
New Revision: 1126070

URL: http://svn.apache.org/viewvc?rev=1126070&view=rev
Log:
unit test refactoring

cleanup threads at the test end

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java?rev=1126070&r1=1126069&r2=1126070&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
 Sun May 22 16:45:21 2011
@@ -34,23 +34,28 @@ public class CAY_743Test extends TestCas
         Injector injector = DIBootstrap.createInjector(new ServerModule(
                 "cay743/cayenne-domain.xml"));
 
-        DataDomain domain = injector.getInstance(DataDomain.class);
-        assertEquals(2, domain.getDataMaps().size());
-
-        DataMap m1 = domain.getDataMap("map1");
-        DataMap m2 = domain.getDataMap("map2");
-
-        ObjEntity oe11 = m1.getObjEntity("Entity11");
-        ObjEntity oe12 = m1.getObjEntity("Entity12");
-
-        ObjEntity oe21 = m2.getObjEntity("Entity21");
-        ObjEntity oe22 = m2.getObjEntity("Entity22");
-
-        // this causes StackOverflow per CAY-743
-        ObjEntity oe21Super = oe21.getSuperEntity();
-        ObjEntity oe12Super = oe12.getSuperEntity();
-
-        assertSame(oe12Super, oe22);
-        assertSame(oe21Super, oe11);
+        try {
+            DataDomain domain = injector.getInstance(DataDomain.class);
+            assertEquals(2, domain.getDataMaps().size());
+
+            DataMap m1 = domain.getDataMap("map1");
+            DataMap m2 = domain.getDataMap("map2");
+
+            ObjEntity oe11 = m1.getObjEntity("Entity11");
+            ObjEntity oe12 = m1.getObjEntity("Entity12");
+
+            ObjEntity oe21 = m2.getObjEntity("Entity21");
+            ObjEntity oe22 = m2.getObjEntity("Entity22");
+
+            // this causes StackOverflow per CAY-743
+            ObjEntity oe21Super = oe21.getSuperEntity();
+            ObjEntity oe12Super = oe12.getSuperEntity();
+
+            assertSame(oe12Super, oe22);
+            assertSame(oe21Super, oe11);
+        }
+        finally {
+            injector.shutdown();
+        }
     }
 }