svn commit: r1435744 - /openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java

[st...@apache.org]

Author: struberg
Date: Sat Jan 19 22:43:57 2013
New Revision: 1435744

URL: http://svn.apache.org/viewvc?rev=1435744&view=rev
Log:
OWB-763 add automatic container shutdown in @After

Modified:
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java?rev=1435744&r1=1435743&r2=1435744&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java Sat Jan 19 22:43:57 2013
@@ -39,6 +39,7 @@ import org.apache.webbeans.util.WebBeans
 
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.After;
 
 
 public abstract class AbstractUnitTest
@@ -62,6 +63,15 @@ public abstract class AbstractUnitTest
         decorators.clear();
     }
 
+    /**
+     * always shut down the container after each test.
+     */
+    @After
+    public void shutdown()
+    {
+        shutDownContainer();
+    }
+
     protected void startContainer(Class<?>... beanClasses)
     {
         startContainer(Arrays.asList(beanClasses), null);
@@ -133,6 +143,8 @@ public abstract class AbstractUnitTest
         if(this.testLifecycle != null)
         {
             this.testLifecycle.stopApplication(null);
+            this.testLifecycle = null;
+            cleanup();
         }        
     }