[jboss-cvs] JBossAS SVN: r70128 - in projects/security/security-spi/trunk: spi/src/tests/org/jboss/test/security/securitycontext and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2008-02-26 14:38:57 -0500 (Tue, 26 Feb 2008)
New Revision: 70128

Modified:
   projects/security/security-spi/trunk/identity/src/main/org/jboss/security/identity/fed/OpenIdIdentity.java
   projects/security/security-spi/trunk/identity/src/main/org/jboss/security/identity/fed/WSTrustIdentity.java
   projects/security/security-spi/trunk/spi/src/tests/org/jboss/test/security/securitycontext/SubjectInfoUnitTestCase.java
Log:
SECURITY-123: Identity interface extensions

Modified: projects/security/security-spi/trunk/identity/src/main/org/jboss/security/identity/fed/OpenIdIdentity.java
===================================================================
--- projects/security/security-spi/trunk/identity/src/main/org/jboss/security/identity/fed/OpenIdIdentity.java	2008-02-26 19:29:43 UTC (rev 70127)
+++ projects/security/security-spi/trunk/identity/src/main/org/jboss/security/identity/fed/OpenIdIdentity.java	2008-02-26 19:38:57 UTC (rev 70128)
@@ -32,13 +32,13 @@
 public interface OpenIdIdentity<T> extends Identity
 {
    /**
-    * Return the underlying SAML Object
+    * Return the underlying OpenID Object
     * @return
     */
    T getOpenIdObject();
    
    /**
-    * Set the underlying SAML Object
+    * Set the underlying OpenID Object
     * @param t
     */
    void setOpenIdObject(T t); 

Modified: projects/security/security-spi/trunk/identity/src/main/org/jboss/security/identity/fed/WSTrustIdentity.java
===================================================================
--- projects/security/security-spi/trunk/identity/src/main/org/jboss/security/identity/fed/WSTrustIdentity.java	2008-02-26 19:29:43 UTC (rev 70127)
+++ projects/security/security-spi/trunk/identity/src/main/org/jboss/security/identity/fed/WSTrustIdentity.java	2008-02-26 19:38:57 UTC (rev 70128)
@@ -32,13 +32,13 @@
 public interface WSTrustIdentity<T> extends Identity
 {
    /**
-    * Return the underlying SAML Object
+    * Return the underlying WSTrust Object
     * @return
     */
    T getWSTrustToken();
    
    /**
-    * Set the underlying SAML Object
+    * Set the underlying WSTrust Object
     * @param t
     */
    void setWSTrustToken(T t); 

Modified: projects/security/security-spi/trunk/spi/src/tests/org/jboss/test/security/securitycontext/SubjectInfoUnitTestCase.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/tests/org/jboss/test/security/securitycontext/SubjectInfoUnitTestCase.java	2008-02-26 19:29:43 UTC (rev 70127)
+++ projects/security/security-spi/trunk/spi/src/tests/org/jboss/test/security/securitycontext/SubjectInfoUnitTestCase.java	2008-02-26 19:38:57 UTC (rev 70128)
@@ -68,6 +68,7 @@
       assertEquals(theSubject, sc.getUtil().getSubject()); 
    }
    
+   @SuppressWarnings("unchecked")
    public void testCreateFedIdentities() throws Exception 
    {
       SecurityContext sc = SecurityContextFactory.createSecurityContext("TEST",
@@ -77,42 +78,47 @@
       
       Set<Identity> iset = sc.getUtil().getIdentities(SAMLIdentity.class);
       assertEquals(1, iset.size());
-      assertEquals(getIdentity(), iset.iterator().next());
+      Identity id = iset.iterator().next();
+      assertEquals(getIdentity(), id);
+      assertTrue(id instanceof SAMLIdentity);
+      assertTrue(((SAMLIdentity)id).getSAMLObject() instanceof FedIdentityObject);
    }
    
    private Identity getIdentity()
    {
       if(identity == null)
-       identity = new SAMLIdentity<FedIdentityObject>()
+         identity = new SAMLIdentity<FedIdentityObject>()
       {
-      public FedIdentityObject getSAMLObject()
-      {
-         return null;
-      }
+         FedIdentityObject fio = new FedIdentityObject();
 
-      public void setSAMLObject(FedIdentityObject t)
-      {
-      }
+         public FedIdentityObject getSAMLObject()
+         {
+            return fio;
+         }
 
-      public Group asGroup()
-      {
-         return null;
-      }
+         public void setSAMLObject(FedIdentityObject t)
+         {
+         }
 
-      public Principal asPrincipal()
-      {
-         return null;
-      }
+         public Group asGroup()
+         {
+            return null;
+         }
 
-      public String getName()
-      {
-         return null;
-      }
+         public Principal asPrincipal()
+         {
+            return null;
+         }
 
-      public Role getRole()
-      {
-         return null;
-      }
+         public String getName()
+         {
+            return null;
+         }
+
+         public Role getRole()
+         {
+            return null;
+         }
       };     
       
       return identity;