Author: bdaw Date: 2007-05-30 03:51:45 -0400 (Wed, 30 May 2007) New Revision: 7353 Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTestCase.java trunk/identity/src/resources/test/config/extrole/opends-config.xml trunk/identity/src/resources/test/config/extrole/openldap-config.xml trunk/identity/src/resources/test/config/extrole/rhds-config.xml trunk/identity/src/resources/test/config/extuser/opends-config.xml trunk/identity/src/resources/test/config/extuser/openldap-config.xml trunk/identity/src/resources/test/config/extuser/rhds-config.xml trunk/test/src/etc/ldap/ldif/initial-tests-qa-opends.ldif trunk/test/src/etc/ldap/ldif/initial-tests-qa-openldap.ldif trunk/test/src/etc/ldap/ldif/initial-tests-qa.ldif Log: testcases for multiply search contexts in LDAP Ext modules Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java 2007-05-30 07:51:45 UTC (rev 7353) @@ -5,6 +5,7 @@ import org.jboss.portal.identity.IdentityServiceControllerImpl; import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.NoSuchUserException; import org.jboss.portal.identity.ldap.LDAPRoleImpl; import java.util.Set; @@ -131,7 +132,7 @@ assertEquals(ldapr.getName(), "Echo"); int count = roleModule.getRolesCount(); - assertEquals(3, count); + assertEquals(4, count); } public void testFindRolesByNames() throws Exception @@ -181,4 +182,22 @@ assertTrue(roleNames.contains(("cn=Echo1,ou=Roles," + suffix).toLowerCase())); assertTrue(roleNames.contains(("cn=TheDuke,ou=Roles," + suffix).toLowerCase())); } + + public void testSearchCtx() throws Exception + { + LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.findRoleByName("User11"); + assertEquals(ldapr.getDn().toLowerCase(), ("cn=User11,ou=Roles1," + suffix).toLowerCase()); + assertEquals(ldapr.getName(), "User11"); + + try + { + ldapr = (LDAPRoleImpl)roleModule.findRoleByName("User21"); + fail(); + } + catch (IdentityException e) + { + //expected + } + + } } Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTestCase.java 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTestCase.java 2007-05-30 07:51:45 UTC (rev 7353) @@ -11,6 +11,7 @@ import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.User; import org.jboss.portal.identity.Role; +import org.jboss.portal.identity.NoSuchUserException; import org.jboss.portal.identity.ldap.LDAPUserImpl; import org.apache.log4j.Appender; import org.apache.log4j.ConsoleAppender; @@ -100,7 +101,7 @@ assertEquals(ldapu.getUserName(), "jduke"); int count = userModule.getUserCount(); - assertEquals(5, count); + assertEquals(7, count); } //TODO: test findUsers @@ -129,4 +130,26 @@ assertTrue(u.validatePassword("dodo")); } + + public void testSearchCtx() throws Exception + { + //users should be visable in both configured search contexts + User u = userModule.findUserByUserName("user11"); + assertNotNull(u); + assertEquals("user11", u.getUserName()); + assertTrue(u.validatePassword("theduke")); + + //and not in not configured context + try + { + u = userModule.findUserByUserName("user21"); + fail(); + } + catch (NoSuchUserException e) + { + //expected + } + + + } } Modified: trunk/identity/src/resources/test/config/extrole/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extrole/opends-config.xml 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/resources/test/config/extrole/opends-config.xml 2007-05-30 07:51:45 UTC (rev 7353) @@ -102,6 +102,7 @@ <option> <name>userCtxDN</name> <value>ou=People,dc=example,dc=com</value> + <value>ou=People1,dc=example,dc=com</value> </option> <option> <name>userSearchFilter</name> @@ -110,6 +111,7 @@ <option> <name>roleCtxDN</name> <value>ou=Roles,dc=example,dc=com</value> + <value>ou=Roles1,dc=example,dc=com</value> </option> <option> <name>roleSearchFilter</name> Modified: trunk/identity/src/resources/test/config/extrole/openldap-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extrole/openldap-config.xml 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/resources/test/config/extrole/openldap-config.xml 2007-05-30 07:51:45 UTC (rev 7353) @@ -102,10 +102,12 @@ <option> <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + <value>ou=People1,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> </option> <option> <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + <value>ou=Roles1,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> </option> <option> <name>userSearchFilter</name> Modified: trunk/identity/src/resources/test/config/extrole/rhds-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extrole/rhds-config.xml 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/resources/test/config/extrole/rhds-config.xml 2007-05-30 07:51:45 UTC (rev 7353) @@ -102,10 +102,12 @@ <option> <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=People1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=Roles1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> <name>userSearchFilter</name> Modified: trunk/identity/src/resources/test/config/extuser/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extuser/opends-config.xml 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/resources/test/config/extuser/opends-config.xml 2007-05-30 07:51:45 UTC (rev 7353) @@ -101,6 +101,7 @@ <option> <name>userCtxDN</name> <value>ou=People,dc=example,dc=com</value> + <value>ou=People1,dc=example,dc=com</value> </option> <option> <name>userSearchFilter</name> @@ -109,6 +110,7 @@ <option> <name>roleCtxDN</name> <value>ou=Roles,dc=example,dc=com</value> + <value>ou=Roles1,dc=example,dc=com</value> </option> </option-group> </options> Modified: trunk/identity/src/resources/test/config/extuser/openldap-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extuser/openldap-config.xml 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/resources/test/config/extuser/openldap-config.xml 2007-05-30 07:51:45 UTC (rev 7353) @@ -101,10 +101,12 @@ <option> <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + <value>ou=People1,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> </option> <option> <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + <value>ou=Roles1,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> </option> <option> <name>userSearchFilter</name> Modified: trunk/identity/src/resources/test/config/extuser/rhds-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extuser/rhds-config.xml 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/resources/test/config/extuser/rhds-config.xml 2007-05-30 07:51:45 UTC (rev 7353) @@ -101,10 +101,12 @@ <option> <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=People1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=Roles1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> <name>userSearchFilter</name> Modified: trunk/test/src/etc/ldap/ldif/initial-tests-qa-opends.ldif =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-qa-opends.ldif 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/test/src/etc/ldap/ldif/initial-tests-qa-opends.ldif 2007-05-30 07:51:45 UTC (rev 7353) @@ -61,6 +61,57 @@ userPassword: theduke mail: email(a)email.com +dn: ou=People1,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People1 + +dn: uid=user11,ou=People1,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user11 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user12,ou=People1,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user12 +cn: Java Duke1 +sn: Duke1 +userPassword: theduke +mail: email(a)email.com + +dn: ou=People2,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People2 + +dn: uid=user21,ou=People2,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user21 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user22,ou=People2,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user22 +cn: Java Duke1 +sn: Duke1 +userPassword: theduke +mail: email(a)email.com + + dn: ou=Roles,dc=example,dc=com objectclass: top objectclass: organizationalUnit @@ -91,7 +142,37 @@ description: TheDuke role context member: uid=jduke,ou=People,dc=example,dc=com +dn: ou=Roles1,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles1 +dn: cn=User11,ou=Roles1,dc=example,dc=com +objectClass: top +objectClass: groupOfNames +cn: User11 +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=example,dc=com +member: uid=jduke3,ou=People,dc=example,dc=com +member: uid=jduke4,ou=People,dc=example,dc=com + +dn: ou=Roles2,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles2 + +dn: cn=User21,ou=Roles2,dc=example,dc=com +objectClass: top +objectClass: groupOfNames +cn: User21 +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=example,dc=com +member: uid=jduke3,ou=People,dc=example,dc=com +member: uid=jduke4,ou=People,dc=example,dc=com + + + + # tree2 dn: o=example2,dc=example,dc=com objectclass: top Modified: trunk/test/src/etc/ldap/ldif/initial-tests-qa-openldap.ldif =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-qa-openldap.ldif 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/test/src/etc/ldap/ldif/initial-tests-qa-openldap.ldif 2007-05-30 07:51:45 UTC (rev 7353) @@ -61,6 +61,57 @@ userPassword: theduke mail: email(a)email.com +dn: ou=People1,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People1 + +dn: uid=user11,ou=People1,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user11 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user12,ou=People1,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user12 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: ou=People2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People2 + +dn: uid=user21,ou=People2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user21 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user22,ou=People2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user22 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + + dn: ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com objectclass: top objectclass: organizationalUnit @@ -92,6 +143,35 @@ member: uid=jduke,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +dn: ou=Roles1,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles1 + +dn: cn=User11,ou=Roles1,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectClass: top +objectClass: groupOfNames +cn: User11 +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com + +dn: ou=Roles2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles2 + +dn: cn=User21,ou=Roles2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectClass: top +objectClass: groupOfNames +cn: User21 +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com + + # tree2 dn: o=example2,dc=testsuite,dc=portal,dc=my-domain,dc=com objectclass: top Modified: trunk/test/src/etc/ldap/ldif/initial-tests-qa.ldif =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-qa.ldif 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/test/src/etc/ldap/ldif/initial-tests-qa.ldif 2007-05-30 07:51:45 UTC (rev 7353) @@ -61,6 +61,57 @@ userPassword: theduke mail: email(a)email.com +dn: ou=People1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People1 + +dn: uid=user11,ou=People1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user11 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user12,ou=People1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user12 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: ou=People2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People2 + +dn: uid=user21,ou=People2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user21 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user22,ou=People2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user22 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + + dn: ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: organizationalUnit @@ -91,7 +142,35 @@ description: TheDuke role context member: uid=jduke,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: ou=Roles1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles1 +dn: cn=User11,ou=Roles1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectClass: top +objectClass: groupOfNames +cn: User11 +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com + +dn: ou=Roles2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles2 + +dn: cn=User21,ou=Roles2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectClass: top +objectClass: groupOfNames +cn: User21 +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com + + # tree2 dn: o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top