[jboss-cvs] JBossAS SVN: r63691 - trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/unit.

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

Author: wolfc
Date: 2007-06-27 13:28:25 -0400 (Wed, 27 Jun 2007)
New Revision: 63691

Modified:
   trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
Log:
Check in testTxPropegation, clear SecurityAssociation on tearDown

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java	2007-06-27 16:19:41 UTC (rev 63690)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java	2007-06-27 17:28:25 UTC (rev 63691)
@@ -29,6 +29,7 @@
 import javax.ejb.HomeHandle;
 import javax.naming.Context;
 import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 import javax.rmi.PortableRemoteObject;
 import javax.transaction.UserTransaction;
@@ -80,6 +81,14 @@
 //      return null;
    }
    
+   @Override
+   protected void tearDown() throws Exception
+   {
+      super.tearDown();
+      
+      SecurityAssociation.clear();
+   }
+   
    public void test0() throws Exception
    {
       System.out.println("java: " + getInitialContext().lookup("java:comp/HandleDelegate"));
@@ -223,6 +232,7 @@
    {
       SimplePrincipal principal = new SimplePrincipal("somebody");
       SecurityAssociation.setPrincipal(principal);
+      SecurityAssociation.setCredential("password".toCharArray());
       
       InitialContext ctx = getInitialContext();
       Object obj = ctx.lookup("MySessionBean/remote");
@@ -231,6 +241,7 @@
       assertNotNull(session);
       String actual = session.getWhoAmI();
       System.err.println("whoAmI = " + actual);
+      assertEquals(actual, "somebody");
    }
    
    public void testService() throws Exception
@@ -249,7 +260,16 @@
       Object obj = ctx.lookup("TxTesterBean/remote");
       TxTester session = (TxTester) PortableRemoteObject.narrow(obj, TxTester.class);
       assertNotNull(session);
-      UserTransaction tx = (UserTransaction) PortableRemoteObject.narrow(ctx.lookup("UserTransaction"), UserTransaction.class);
+      UserTransaction tx;
+      try
+      {
+         tx = (UserTransaction) PortableRemoteObject.narrow(ctx.lookup("UserTransaction"), UserTransaction.class);
+      }
+      catch(NameNotFoundException e)
+      {
+         log.warn("Corba Transaction Service is not installed (not available with Arjuna, only with JBossTS)");
+         return;
+      }
       tx.begin();
       try
       {