[jboss-cvs] JBossAS SVN: r74230 - trunk/testsuite/src/main/org/jboss/test/aop/bean.

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

Author: anil.saldhana at jboss.com
Date: 2008-06-06 02:32:53 -0400 (Fri, 06 Jun 2008)
New Revision: 74230

Modified:
   trunk/testsuite/src/main/org/jboss/test/aop/bean/SecurityTester.java
Log:
JBAS-5556: fix aop security test

Modified: trunk/testsuite/src/main/org/jboss/test/aop/bean/SecurityTester.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/bean/SecurityTester.java	2008-06-06 06:28:47 UTC (rev 74229)
+++ trunk/testsuite/src/main/org/jboss/test/aop/bean/SecurityTester.java	2008-06-06 06:32:53 UTC (rev 74230)
@@ -21,14 +21,18 @@
   */
 package org.jboss.test.aop.bean;
 
-import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
+import java.security.Principal;
+
+import org.jboss.logging.Logger; 
 import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
 import org.jboss.system.ServiceMBeanSupport;
 
 import javax.management.MBeanRegistration;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
+import javax.security.auth.login.LoginException;
 /**
  *
  * @see Monitorable
@@ -82,7 +86,9 @@
          log.info("TESTING XML Security");
 
          char[] password = "password".toCharArray();
-         SecurityAssociation.pushSubjectContext(null, new SimplePrincipal("somebody"), password);
+         SecurityClient securityClient = SecurityClientFactory.getSecurityClient();
+         setSecurity(securityClient,"somebody", password); 
+         //SecurityAssociation.pushSubjectContext(null, new SimplePrincipal("somebody"), password);
 
          log.info("testing unchecked constructor");
          SecuredPOJO pojo = new SecuredPOJO(); // unchecked construction
@@ -91,9 +97,13 @@
          log.info("testing unchecked field");
          pojo.uncheckedField = 5;
 
-         SecurityAssociation.popSubjectContext();
+         /*SecurityAssociation.popSubjectContext();
          SecurityAssociation.pushSubjectContext(null, new SimplePrincipal("authfail"), password);
+*/
+         securityClient.logout();
          
+         setSecurity(securityClient,"authfail", password);
+          
          boolean securityFailure = true;
          try
          {
@@ -136,8 +146,13 @@
          if (securityFailure) throw new RuntimeException("auth failure was not caught for constructor");
 
          securityFailure = true;
+         
+         securityClient.logout();
+         setSecurity(securityClient,"rolefail", password);
+         /*
          SecurityAssociation.popSubjectContext();
          SecurityAssociation.pushSubjectContext(null, new SimplePrincipal("rolefail"), password);
+         */
          try
          {
             log.info("testing role failure method");
@@ -177,8 +192,12 @@
 
          if (securityFailure) throw new RuntimeException("role failure was not caught for constructor");
 
+         securityClient.logout();
+         setSecurity(securityClient,"pass", password);
+         /*
          SecurityAssociation.popSubjectContext();
          SecurityAssociation.pushSubjectContext(null, new SimplePrincipal("pass"), password);
+         */
          log.info("test pass");
          pojo.someMethod();
          pojo.someField = 5;
@@ -234,7 +253,8 @@
          log.info("TESTING Annotated Security");
 
          char[] password = "password".toCharArray();
-         SecurityAssociation.pushSubjectContext(null, new SimplePrincipal("somebody"), password);
+         SecurityClient client = SecurityClientFactory.getSecurityClient();
+         setSecurity(client,"somebody", password);
 
          log.info("testing unchecked constructor");
          AnnotatedSecuredPOJO pojo = new AnnotatedSecuredPOJO(); // unchecked construction
@@ -243,8 +263,8 @@
          log.info("testing unchecked field");
          pojo.uncheckedField = 5;
 
-         SecurityAssociation.popSubjectContext();
-         SecurityAssociation.pushSubjectContext(null, new SimplePrincipal("authfail"), password);
+         client.logout();
+         setSecurity(client,"authfail", password);
 
          boolean securityFailure = true;
          try
@@ -288,8 +308,8 @@
          if (securityFailure) throw new RuntimeException("auth failure was not caught for constructor");
 
          securityFailure = true;
-         SecurityAssociation.popSubjectContext();
-         SecurityAssociation.pushSubjectContext(null, new SimplePrincipal("rolefail"), password);
+         client.logout();
+         setSecurity(client,"rolefail", password);
          try
          {
             log.info("testing role failure method");
@@ -329,8 +349,8 @@
 
          if (securityFailure) throw new RuntimeException("role failure was not caught for constructor");
 
-         SecurityAssociation.popSubjectContext();
-         SecurityAssociation.pushSubjectContext(null, new SimplePrincipal("pass"), password);
+         client.logout();
+         setSecurity(client,"pass", password);
          
          log.info("test pass");
          pojo.someMethod();
@@ -380,5 +400,11 @@
          throw new RuntimeException(ex);
       }
    }
-}
-
+   
+   private void setSecurity(SecurityClient client, String name, Object credential) 
+   throws LoginException
+   {
+	   client.setSimple(name, credential);
+	   client.login();
+   }
+}
\ No newline at end of file