You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2010/09/29 15:51:44 UTC

svn commit: r1002629 - in /openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test: component/PreDestroyComponent.java unittests/intercept/PreDestroyComponentTest.java

Author: struberg
Date: Wed Sep 29 13:51:44 2010
New Revision: 1002629

URL: http://svn.apache.org/viewvc?rev=1002629&view=rev
Log:
add a test for @PreDestroy on RequestScoped beans

Modified:
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PreDestroyComponent.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PreDestroyComponentTest.java

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PreDestroyComponent.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PreDestroyComponent.java?rev=1002629&r1=1002628&r2=1002629&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PreDestroyComponent.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PreDestroyComponent.java Wed Sep 29 13:51:44 2010
@@ -34,17 +34,20 @@ public class PreDestroyComponent
 
     private IPayment p2 = null;
 
+    private static boolean destroyed;
+
     @PostConstruct
     public void init()
     {
         this.p = payment;
-
+        destroyed = false;
     }
 
     @PreDestroy
     public void destroy()
     {
         p2 = p;
+        destroyed = true;
     }
 
     public IPayment getP()
@@ -57,4 +60,8 @@ public class PreDestroyComponent
         return p2;
     }
 
+    public static boolean isDestroyed()
+    {
+        return destroyed;
+    }
 }

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PreDestroyComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PreDestroyComponentTest.java?rev=1002629&r1=1002628&r2=1002629&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PreDestroyComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PreDestroyComponentTest.java Wed Sep 29 13:51:44 2010
@@ -85,6 +85,11 @@ public class PreDestroyComponentTest ext
         Assert.assertNotNull(pcc.getP());
         Assert.assertSame(object.getValue(), payment.getValue());
 
+        Assert.assertFalse(PreDestroyComponent.isDestroyed());
+
+        ContextFactory.destroyRequestContext(null); 
+
+        Assert.assertTrue(PreDestroyComponent.isDestroyed());
     }
 
 }