[jboss-cvs] JBossAS SVN: r71440 - projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/bank/unit.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Mar 29 17:46:46 EDT 2008


Author: anil.saldhana at jboss.com
Date: 2008-03-29 17:46:46 -0400 (Sat, 29 Mar 2008)
New Revision: 71440

Modified:
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java
Log:
use SecurityClient rather than SecurityAssociation for tests

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java	2008-03-29 20:57:10 UTC (rev 71439)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java	2008-03-29 21:46:46 UTC (rev 71440)
@@ -22,23 +22,23 @@
 package org.jboss.ejb3.test.bank.unit;
 
 import javax.ejb.EJBAccessException;
-import javax.ejb.EJBException;
 import javax.ejb.NoSuchEJBException;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
 
+import junit.framework.Test;
+
 import org.jboss.ejb3.ClientKernelAbstraction;
 import org.jboss.ejb3.KernelAbstractionFactory;
 import org.jboss.ejb3.test.bank.Bank;
-import org.jboss.ejb3.test.bank.ProxyFactoryInterface;
 import org.jboss.ejb3.test.bank.Teller;
 import org.jboss.ejb3.test.bank.TellerInterceptor;
 import org.jboss.ejb3.test.bank.TestStatus;
 import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
 import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
 import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
 
 /**
  * Test for EJB3 deployment of EJB2.0 Bank EJBs
@@ -60,22 +60,29 @@
    
    public void testEnvEntry() throws Exception
    {
-      SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("teller"), "password".toCharArray());
+      sc.login();
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
       SecurityAssociation.setCredential("password".toCharArray());
-      
+      */
       InitialContext jndiContext = new InitialContext();
       Bank bank = (Bank) jndiContext.lookup(Bank.JNDI_NAME);
       assertNotNull(bank);
       String id = bank.getEnvEntryId();
       assertEquals(id, "5678");
+      sc.logout();
    }
 
    public void testStatelessTeller() throws Exception
    {
       InitialContext jndiContext = new InitialContext();
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("rolefail"), "password".toCharArray());
+      sc.login();
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
  
       String greeting;
       Teller teller = (Teller) jndiContext.lookup(Teller.JNDI_NAME);
@@ -98,8 +105,10 @@
          assertTrue(e instanceof EJBAccessException);
       }
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("customer"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      sc.setSimple(new SimplePrincipal("customer"), "password".toCharArray());
+      sc.login();
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("customer"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
       
       try{
          greeting = teller.greetChecked("Hello");
@@ -116,9 +125,13 @@
       Teller teller = (Teller) jndiContext.lookup(Teller.JNDI_NAME);
       assertNotNull(teller);
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("customer"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("customer"), "password".toCharArray());
+      sc.login();
       
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("customer"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
+      
       String greeting = teller.greetChecked("Hello");
       assertNotNull(greeting);
       assertEquals("Hello", greeting);
@@ -141,9 +154,13 @@
    {
       InitialContext jndiContext = new InitialContext();
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
  
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("rolefail"), "password".toCharArray());
+      sc.login();
+      
       String customerId = "CustomerId";
       String greeting;
       Teller teller = (Teller) jndiContext.lookup(Teller.JNDI_NAME);
@@ -160,8 +177,12 @@
       assertNotNull(bank);
       String customerId = "CustomerId";
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("customer"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("customer"), "password".toCharArray());
+      sc.login();
+      
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("customer"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
       try {
          bank.storeCustomerId(customerId);
          assertTrue(false);
@@ -169,12 +190,18 @@
          assertTrue(e instanceof EJBAccessException);
       }
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      sc.logout();
       
+      sc.setSimple(new SimplePrincipal("teller"), "password".toCharArray());
+      sc.login();
+      
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
+      
       bank.storeCustomerId(customerId);
       String tmpId = bank.retrieveCustomerId();
       assertEquals(customerId, tmpId);
+      sc.logout();
    }
    
    public void testStatefulState() throws Exception
@@ -184,9 +211,13 @@
       assertNotNull(bank);
       String customerId = "CustomerId";
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("teller"), "password".toCharArray());
+      sc.login();
       
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
+      
       bank.storeCustomerId(customerId);
       String tmpId = bank.retrieveCustomerId();
       assertEquals(customerId, tmpId);
@@ -195,6 +226,7 @@
       assertNotNull(bank);
       tmpId = bank.retrieveCustomerId();
       assertEquals("defaultId", tmpId);
+      sc.logout();
    }
  
    public void testStatefulBank21() throws Exception
@@ -203,9 +235,13 @@
       Bank bank = (Bank) jndiContext.lookup(Bank.JNDI_NAME + "21");
       assertNotNull(bank);
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("teller"), "password".toCharArray());
+      sc.login();
       
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
+      
       String activated = bank.isActivated();
       assertEquals(activated, "_CREATED");
    }
@@ -218,9 +254,13 @@
       TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
       status.clear();
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("teller"), "password".toCharArray());
+      sc.login();
       
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
+      
       String id = bank.interceptCustomerId("CustomerId");
       log.debug("id=" + id);
       assertEquals("CustomerId_SecondInterceptor_FirstInterceptor", id);
@@ -233,9 +273,13 @@
       Bank bank = (Bank) jndiContext.lookup(Bank.JNDI_NAME);
       assertNotNull(bank);
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("teller"), "password".toCharArray());
+      sc.login();
       
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
+      
       bank.testResource();
    }
    
@@ -245,9 +289,13 @@
       Bank bank = (Bank) jndiContext.lookup(Bank.JNDI_NAME);
       assertNotNull(bank);
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("teller"), "password".toCharArray());
+      sc.login();
       
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
+      
       bank.remove();
       
       try {
@@ -266,9 +314,13 @@
       Bank bank = (Bank) jndiContext.lookup(Bank.JNDI_NAME);
       assertNotNull(bank);
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("teller"), "password".toCharArray());
+      sc.login();
       
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
+      
       String initialized = bank.isInitialized();
       assertEquals("YESYES", initialized);
    }
@@ -279,9 +331,13 @@
       Teller teller = (Teller) jndiContext.lookup(Teller.JNDI_NAME);
       assertNotNull(teller);
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("customer"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("customer"), "password".toCharArray());
+      sc.login(); 
       
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("customer"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
+      
       try {
          teller.excludedMethod();
          assertTrue(false);
@@ -301,9 +357,13 @@
    {
       InitialContext jndiContext = new InitialContext();
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("customer"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("customer"), "password".toCharArray());
+      sc.login(); 
       
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("customer"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
+      
       Teller teller = (Teller) jndiContext.lookup(Teller.JNDI_NAME);
       assertNotNull(teller);
 
@@ -324,9 +384,13 @@
    {
       InitialContext jndiContext = new InitialContext();
       
-      SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
-      SecurityAssociation.setCredential("password".toCharArray());
+      SecurityClient sc = SecurityClientFactory.getSecurityClient();
+      sc.setSimple(new SimplePrincipal("teller"), "password".toCharArray());
+      sc.login();
       
+      /*SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
+      SecurityAssociation.setCredential("password".toCharArray());*/
+      
       Bank bank = (Bank) jndiContext.lookup(Bank.JNDI_NAME);
       assertNotNull(bank);
       




More information about the jboss-cvs-commits mailing list