Author: bdaw Date: 2009-01-17 16:38:06 -0500 (Sat, 17 Jan 2009) New Revision: 227 Modified: idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/DBTestCase.java idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/LDAPTestCase.java idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/MixedTestCase.java idm/trunk/example/maven2/src/test/resources/example-db-config.xml Log: ++ Modified: idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/DBTestCase.java =================================================================== --- idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/DBTestCase.java 2009-01-17 00:40:28 UTC (rev 226) +++ idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/DBTestCase.java 2009-01-17 21:38:06 UTC (rev 227) @@ -23,12 +23,23 @@ package org.jboss.identity.idm.example; import java.util.logging.Logger; +import java.util.Random; +import java.util.Map; +import java.util.Arrays; import java.io.File; import org.jboss.identity.idm.api.IdentitySessionFactory; import org.jboss.identity.idm.api.IdentitySession; import org.jboss.identity.idm.api.Identity; +import org.jboss.identity.idm.api.GroupType; +import org.jboss.identity.idm.api.Group; +import org.jboss.identity.idm.api.RoleType; +import org.jboss.identity.idm.api.AttributeDescription; +import org.jboss.identity.idm.api.Attribute; import org.jboss.identity.idm.impl.api.IdentitySessionFactoryImpl; +import org.jboss.identity.idm.impl.api.SimpleAttribute; +import org.jboss.identity.idm.impl.api.model.SimpleGroupType; +import org.jboss.identity.idm.p3p.P3PConstants; /** @@ -62,10 +73,62 @@ IdentitySessionFactory identitySessionFactory = new IdentitySessionFactoryImpl(new File("src/test/resources/example-db-config.xml")); IdentitySession identitySession = identitySessionFactory.createIdentitySession("realm://JBossIdentityExample/SampleRealm"); - identitySession.getTransaction().start(); + identitySession.beginTransaction(); - Identity jonnDoe = identitySession.getPersistenceManager().createIdentity("John Doe"); + GroupType ORGANIZATION = new SimpleGroupType("ORGANIZATION"); + GroupType GROUP = new SimpleGroupType("GROUP"); + Identity johnDoe = identitySession.getPersistenceManager().createIdentity("John Doe"); + Identity alice = identitySession.getPersistenceManager().createIdentity("Alice"); + Identity eva = identitySession.getPersistenceManager().createIdentity("Eva"); + + Group acmeOrg = identitySession.getPersistenceManager().createGroup("ACME", ORGANIZATION); + + Group itGroup = identitySession.getPersistenceManager().createGroup("IT", GROUP); + Group hrGroup = identitySession.getPersistenceManager().createGroup("HR", GROUP); + + identitySession.getRelationshipManager().associateGroups(acmeOrg, itGroup); + identitySession.getRelationshipManager().associateGroups(acmeOrg, hrGroup); + + identitySession.getRelationshipManager().associateIdentities(itGroup, johnDoe); + identitySession.getRelationshipManager().associateIdentities(itGroup, alice); + + identitySession.getRelationshipManager().associateIdentities(hrGroup, eva); + + RoleType managerRT = identitySession.getRoleManager().createRoleType("manager"); + + identitySession.getRoleManager().createRole(managerRT, johnDoe, itGroup); + + // John belongs to IT and not HR + assertTrue(identitySession.getRelationshipManager().isAssociated(itGroup, johnDoe)); + assertFalse(identitySession.getRelationshipManager().isAssociated(hrGroup, johnDoe)); + + // John is manager of IT and not HR + assertTrue(identitySession.getRoleManager().hasRole(johnDoe, itGroup, managerRT)); + assertFalse(identitySession.getRoleManager().hasRole(johnDoe, hrGroup, managerRT)); + + // Check that binary attribute picture is mapped + + AttributeDescription attributeDescription = identitySession.getAttributesManager().getAttributeDescription(johnDoe, "picture"); + assertNotNull(attributeDescription); + assertEquals("binary", attributeDescription.getType()); + + + // Generate random binary data for binary attribute + Random random = new Random(); + + byte[] picture = new byte[5120]; + random.nextBytes(picture); + + identitySession.getAttributesManager().addAttributes(johnDoe, new Attribute[] {new SimpleAttribute("picture", new byte[][]{picture})}); + + // Assert picture + + Map<String, Attribute> attributes = identitySession.getAttributesManager().getAttributes(johnDoe); + assertEquals(1, attributes.keySet().size()); + assertTrue(Arrays.equals((byte[])attributes.get("picture").getValue(), picture)); + + identitySession.getTransaction().commit(); identitySession.close(); Modified: idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/LDAPTestCase.java =================================================================== --- idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/LDAPTestCase.java 2009-01-17 00:40:28 UTC (rev 226) +++ idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/LDAPTestCase.java 2009-01-17 21:38:06 UTC (rev 227) @@ -25,11 +25,15 @@ import junit.framework.TestCase; import java.io.File; +import java.util.Map; +import java.util.Arrays; import org.jboss.identity.idm.api.IdentitySessionFactory; import org.jboss.identity.idm.api.IdentitySession; import org.jboss.identity.idm.api.Identity; +import org.jboss.identity.idm.api.Attribute; import org.jboss.identity.idm.impl.api.IdentitySessionFactoryImpl; +import org.jboss.identity.idm.impl.api.SimpleAttribute; /** @@ -66,10 +70,23 @@ IdentitySessionFactory identitySessionFactory = new IdentitySessionFactoryImpl(new File("src/test/resources/example-ldap-config.xml")); IdentitySession identitySession = identitySessionFactory.createIdentitySession("realm://JBossIdentityExample/SampleRealm"); - identitySession.getTransaction().start(); + identitySession.beginTransaction(); - Identity jonnDoe = identitySession.getPersistenceManager().createIdentity("John Doe"); + Identity johnDoe = identitySession.getPersistenceManager().createIdentity("John Doe"); + Attribute[] userInfo = new Attribute[] { + new SimpleAttribute("phone", "777 77 77"), + new SimpleAttribute("description", "ordinary john doe"), + new SimpleAttribute("carLicense", "xxx-xx-xxx") + }; + + identitySession.getAttributesManager().addAttributes(johnDoe, userInfo); + + // Assert + Map<String, Attribute> attributes = identitySession.getAttributesManager().getAttributes(johnDoe); + assertEquals(3, attributes.keySet().size()); + assertEquals("777 77 77", (attributes.get("phone")).getValue()); + identitySession.getTransaction().commit(); identitySession.close(); } Modified: idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/MixedTestCase.java =================================================================== --- idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/MixedTestCase.java 2009-01-17 00:40:28 UTC (rev 226) +++ idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/MixedTestCase.java 2009-01-17 21:38:06 UTC (rev 227) @@ -68,8 +68,10 @@ IdentitySession identitySession = identitySessionFactory.createIdentitySession("realm://JBossIdentityExample/SampleRealm"); identitySession.getTransaction().start(); - Identity jonnDoe = identitySession.getPersistenceManager().createIdentity("John Doe"); + Identity johnDoe = identitySession.getPersistenceManager().createIdentity("John Doe"); + // Play with the API... + identitySession.getTransaction().commit(); identitySession.close(); } Modified: idm/trunk/example/maven2/src/test/resources/example-db-config.xml =================================================================== --- idm/trunk/example/maven2/src/test/resources/example-db-config.xml 2009-01-17 00:40:28 UTC (rev 226) +++ idm/trunk/example/maven2/src/test/resources/example-db-config.xml 2009-01-17 21:38:06 UTC (rev 227) @@ -113,10 +113,6 @@ <name>isRealmAware</name> <value>true</value> </option> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> </options> </identity-store> </identity-stores>