[jboss-cvs] JBossAS SVN: r103099 - in projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext: unit and 1 other directory.

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

Author: jaikiran
Date: 2010-03-29 05:28:07 -0400 (Mon, 29 Mar 2010)
New Revision: 103099

Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/Base.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/Stateful.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulBean.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatelessBean.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java
Log:
EJBTHREE-2038 Revert the testcase changes and instead introduce a separate testcase

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/Base.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/Base.java	2010-03-29 08:07:03 UTC (rev 103098)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/Base.java	2010-03-29 09:28:07 UTC (rev 103099)
@@ -30,6 +30,4 @@
 public interface Base
 {
    <T> T testBusinessObject(Class<T> businessInterface);
-   
-   boolean wasEJBContextAvailableInPostConstruct();
 }

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/Stateful.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/Stateful.java	2010-03-29 08:07:03 UTC (rev 103098)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/Stateful.java	2010-03-29 09:28:07 UTC (rev 103099)
@@ -51,5 +51,4 @@
    
    EJBObject getEJBObject();
 
-   public boolean wasEJBContextAvailableInPostConstruct();
 }

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulBean.java	2010-03-29 08:07:03 UTC (rev 103098)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulBean.java	2010-03-29 09:28:07 UTC (rev 103099)
@@ -58,9 +58,6 @@
    EJBObject ejbObject;
    String state = "";
    
-   private boolean ejbContextAvailableInPostConstruct = false;
-   
-  
    public void testEjbContext() throws Exception
    {
       InitialContext jndiContext = new InitialContext();
@@ -121,28 +118,15 @@
    }
    
    @PostConstruct
-   public void postConstruct() throws Exception
+   public void postConstruct()
    {
       ejbLocalObject = sessionContext.getEJBLocalObject();
       ejbObject = sessionContext.getEJBObject();
-      
-      InitialContext jndiContext = new InitialContext();
-      EJBContext ejbContext = (EJBContext) jndiContext.lookup("java:comp/EJBContext");
-      log.debug("EJBContext in postconstruct of bean " + this.getClass() + " is " + ejbContext);
-      this.ejbContextAvailableInPostConstruct = true;
    }
    
    public Object testLocalOnlyGetBusinessObject() throws Exception
    {
 	   return statefulLocalOnly.getBusinessObject();
    }
-   
-   /**
-    * @see org.jboss.ejb3.test.ejbcontext.Stateful#wasEJBContextAvailableInPostConstruct()
-    */
-   public boolean wasEJBContextAvailableInPostConstruct()
-   {
-      return this.ejbContextAvailableInPostConstruct;
-   }
 
 }

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatelessBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatelessBean.java	2010-03-29 08:07:03 UTC (rev 103098)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatelessBean.java	2010-03-29 09:28:07 UTC (rev 103099)
@@ -23,7 +23,6 @@
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import javax.ejb.EJBContext;
 import javax.ejb.EJBLocalObject;
 import javax.ejb.EJBObject;
 import javax.ejb.Local;
@@ -60,8 +59,6 @@
    StatelessLocal ejbLocalObject;
    StatelessRemote ejbObject;
    
-   private boolean ejbContextAvailableInPostConstruct;
-   
    public void noop()
    {
       
@@ -115,23 +112,10 @@
    }
    
    @PostConstruct
-   public void postConstruct() throws Exception
+   public void postConstruct()
    {
       ejbLocalObject = (StatelessLocal)sessionContext.getEJBLocalObject();
       ejbObject = (StatelessRemote)sessionContext.getEJBObject();
-      
-      InitialContext jndiContext = new InitialContext();
-      EJBContext ejbContext = (EJBContext) jndiContext.lookup("java:comp/EJBContext");
-      log.debug("EJBContext in postconstruct of bean " + this.getClass() + " is " + ejbContext);
-      this.ejbContextAvailableInPostConstruct = true;
    }
 
-   /**
-    * @see org.jboss.ejb3.test.ejbcontext.Base#wasEJBContextAvailableInPostConstruct()
-    */
-   public boolean wasEJBContextAvailableInPostConstruct()
-   {
-      return this.ejbContextAvailableInPostConstruct;
-   }
-
 }

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java	2010-03-29 08:07:03 UTC (rev 103098)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java	2010-03-29 09:28:07 UTC (rev 103099)
@@ -231,20 +231,6 @@
       Object o = sfsb.testLocalOnlyGetBusinessObject();
       assertNotNull(o);
    }
-   
-   public void testEJBContextInPostConstructOfSFSB() throws Exception
-   {
-      Stateful stateful = (Stateful) getInitialContext().lookup(StatefulBean.class.getSimpleName() + "/remote");
-      assertTrue("EJBContext was *not* available in @PostConstruct of  stateful bean", stateful
-            .wasEJBContextAvailableInPostConstruct());
-   }
-   
-   public void testEJBContextInPostConstructOfSLSB() throws Exception
-   {
-      StatelessBusinessRemote stateless = (StatelessBusinessRemote) getInitialContext().lookup(
-            StatelessBusinessRemote.JNDI_NAME);
-      assertTrue("EJBContext was *not* available in @PostConstruct of stateless bean", stateless.wasEJBContextAvailableInPostConstruct());
-   }
 
    public static Test suite() throws Exception
    {