[jboss-cvs] JBossAS SVN: r73095 - in projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339: unit and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2008-05-06 20:35:51 -0400 (Tue, 06 May 2008)
New Revision: 73095

Modified:
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339/TestPassivationBean.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339/TestPassivationRemote.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339/unit/PassivationSucceedsUnitTestCase.java
Log:
[EJBTHREE-1339] Enhance Test to cover both @PrePassivate and @PostActivate lifecycle calls

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339/TestPassivationBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339/TestPassivationBean.java	2008-05-07 00:28:47 UTC (rev 73094)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339/TestPassivationBean.java	2008-05-07 00:35:51 UTC (rev 73095)
@@ -22,6 +22,7 @@
 package org.jboss.ejb3.test.ejbthree1339;
 
 import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
 import javax.ejb.Remote;
 import javax.ejb.Stateful;
 
@@ -57,6 +58,11 @@
     */
    private boolean beenPassivated = false;
 
+   /**
+    * Whether the bean has yet been activated
+    */
+   private boolean beenActivated = false;
+
    // ---------------------------------------------------------------------------||
    // Functional Methods --------------------------------------------------------||
    // ---------------------------------------------------------------------------||
@@ -81,6 +87,16 @@
       return this.beenPassivated;
    }
 
+   /**
+    * Returns whether or not this instance has been activated
+    * 
+    * @return
+    */
+   public boolean hasBeenActivated()
+   {
+      return this.beenActivated;
+   }
+
    // ---------------------------------------------------------------------------||
    // Lifecycle Methods --------------------------------------------------------||
    // ---------------------------------------------------------------------------||
@@ -88,10 +104,17 @@
    /**
     * Sets the passivation flag before reactivation
     */
-   @PostActivate
+   @PrePassivate
    public void setPassivateFlag()
    {
-      log.info(this.toString() + " Activated");
+      log.info(this.toString() + " PrePassivation...");
       this.beenPassivated = true;
    }
+
+   @PostActivate
+   public void setActivateFlag()
+   {
+      log.info(this.toString() + " Activated.");
+      this.beenActivated = true;
+   }
 }

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339/TestPassivationRemote.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339/TestPassivationRemote.java	2008-05-07 00:28:47 UTC (rev 73094)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339/TestPassivationRemote.java	2008-05-07 00:35:51 UTC (rev 73095)
@@ -60,4 +60,11 @@
     * @return
     */
    boolean hasBeenPassivated();
+   
+   /**
+    * Returns whether or not this instance has been activated
+    * 
+    * @return
+    */
+   boolean hasBeenActivated();
 }

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339/unit/PassivationSucceedsUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339/unit/PassivationSucceedsUnitTestCase.java	2008-05-07 00:28:47 UTC (rev 73094)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1339/unit/PassivationSucceedsUnitTestCase.java	2008-05-07 00:35:51 UTC (rev 73095)
@@ -66,8 +66,12 @@
       TestCase.assertEquals("Returned result was not expected", TestPassivationRemote.EXPECTED_RESULT, remote
             .returnTrueString());
 
-      // Ensure the bean was passivated during the client sleep
-      TestCase.assertTrue("SFSB was not passivated, check CacheConfig and client sleep time", remote
+      // Ensure that @PostActivate was called during client sleep
+      TestCase.assertTrue("@PostActivate not called, check CacheConfig and client sleep time", remote
+            .hasBeenActivated());
+
+      // Ensure that @PrePassivate was called during the client sleep
+      TestCase.assertTrue("@PrePassivate not called, check CacheConfig and client sleep time", remote
             .hasBeenPassivated());
    }
 }