[jboss-cvs] JBossAS SVN: r69958 - in projects/ejb3/trunk/core/src/test: java/org/jboss/ejb3/test/reference21_30/unit and 1 other directories.

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

Author: bdecoste
Date: 2008-02-19 19:47:46 -0500 (Tue, 19 Feb 2008)
New Revision: 69958

Modified:
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session21Bean.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test2Bean.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java
   projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss-reference2.xml
Log:
fixed tests

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session21Bean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session21Bean.java	2008-02-20 00:47:25 UTC (rev 69957)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Session21Bean.java	2008-02-20 00:47:46 UTC (rev 69958)
@@ -46,12 +46,6 @@
       try {
          InitialContext jndiContext = new InitialContext();
          
-         lookup(jndiContext, "");
-         lookup(jndiContext, "Session30");
-         lookup(jndiContext, "java:comp");
-         lookup(jndiContext, "java:comp/env");
-         
-         
          Session30 session = (Session30)jndiContext.lookup(Container.ENC_CTX_NAME + "/env/Session30");
          return session.access();
       } catch (Exception e)
@@ -61,20 +55,6 @@
       }
    }
    
-   private void lookup(InitialContext jndiContext, String name)
-   {
-      log.info("!!!!!lookup " + name);
-      try {
-         NamingEnumeration names = jndiContext.list(name);
-         if (names != null){
-            while (names.hasMore()){
-               log.info("  " + names.next());
-            }
-         }
-      } catch (Exception e){
-      }
-   }
-   
    public String globalAccess30()
    {
       try {

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test2Bean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test2Bean.java	2008-02-20 00:47:25 UTC (rev 69957)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/Test2Bean.java	2008-02-20 00:47:46 UTC (rev 69958)
@@ -41,11 +41,6 @@
    {
       InitialContext jndiContext = new InitialContext();
       
-      lookup(jndiContext, "");
-      lookup(jndiContext, "java:comp");
-      lookup(jndiContext, "java:comp/env");
-      lookup(jndiContext, "java:comp/env/ejb");
-     
       Test3 session = (Test3)jndiContext.lookup("java:comp/env/ejb/Test3");
       session.testAccess();
      
@@ -54,20 +49,6 @@
       session.testAccess();
    }
    
-   private void lookup(InitialContext jndiContext, String name)
-   {
-      log.info("!!!!!lookup " + name);
-      try {
-         NamingEnumeration names = jndiContext.list(name);
-         if (names != null){
-            while (names.hasMore()){
-               log.info("  " + names.next());
-            }
-         }
-      } catch (Exception e){
-      }
-   }
-   
    public void ejbCreate()
    {
     

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java	2008-02-20 00:47:25 UTC (rev 69957)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java	2008-02-20 00:47:46 UTC (rev 69958)
@@ -67,7 +67,7 @@
    {
       InitialContext jndiContext = new InitialContext();
  
-      Session30 session = (Session30) jndiContext.lookup("GlobalSession30Remote");
+      Session30RemoteBusiness session = (Session30RemoteBusiness) jndiContext.lookup("GlobalSession30Remote");
       String access = session.access();
       assertEquals("Session30", access);
       access = session.globalAccess21();

Modified: projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss-reference2.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss-reference2.xml	2008-02-20 00:47:25 UTC (rev 69957)
+++ projects/ejb3/trunk/core/src/test/resources/test/reference21_30/META-INF/jboss-reference2.xml	2008-02-20 00:47:46 UTC (rev 69958)
@@ -9,6 +9,10 @@
       <session>
          <ejb-name>Session21</ejb-name>
          <jndi-name>Session21Remote</jndi-name>
+         <ejb-ref>
+            <ejb-ref-name>Session30</ejb-ref-name>
+            <jndi-name>Session30Remote</jndi-name>
+         </ejb-ref>
       </session>
       <session>
          <ejb-name>Session30</ejb-name>