Commit 6b2786a8 authored by Dustin Jenkins's avatar Dustin Jenkins
Browse files

AC2: Fix tests.

parent f8e1a0fe

projects/cadcAccessControl-Server/test/LdapConfig.test.properties

+9 −5
Original line number Diff line number Diff line 
# This are the configuration fields required by the Ldap ldap-dao unit tests

# Tests are more accurate running on Port 636.  If it fails due to SSL/Security

# issues, then make very sure the ca.crt (gimli2.cadc.dao.nrc.ca:~miscsw/ca.crt)

# is installed in your Java Keystore:

# scp gimli2.cadc.dao.nrc.ca:~miscsw/ca.crt /tmp/ca.crt

# ${JAVA_HOME}/bin/keytool -importcert -keystore ${JAVA_HOME}/jre/lib/security/cacerts -file /tmp/ca.crt

server = proc5-03.cadc.dao.nrc.ca

port = 636

proxyUser = webproxy

usersDn = ou=Users,ou=ds,dc=canfar,dc=net

proxyUser = testproxy

usersDn = ou=Users,ou=ds,dc=testcanfar

userRequestsDN = ou=UserRequests,ou=ds,dc=testcanfar

newUsersDn = ou=NewUsers,ou=ds,dc=canfar,dc=net

groupsDn = ou=Groups,ou=ds,dc=canfar,dc=net

adminGroupsDn = ou=adminGroups,ou=ds,dc=canfar,dc=net
 
 No newline at end of file
 
groupsDn = ou=Groups,ou=ds,dc=testcanfar

adminGroupsDn = ou=adminGroups,ou=ds,dc=testcanfar
 
 No newline at end of file

projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java

+79 −65
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 
            {

                try

                {

                    User<X500Principal> actual = getUserDAO().getUser(testUser.getUserID());

                    User<X500Principal> actual = getUserDAO()

                            .getUser(testUser.getUserID());

                    check(testUser, actual);



                    return null;
@@ -190,17 +191,23 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 
            {

                try

                {

                    Collection<DN> groups = getUserDAO().getUserGroups(testUser.getUserID(), false);

                    assertNotNull(groups);

                    assertTrue(!groups.isEmpty());

                    Collection<DN> groups =

                            getUserDAO().getUserGroups(testUser.getUserID(),

                                                       false);

                    assertNotNull("Groups should not be null.", groups);



                    for (DN groupDN : groups)

                    {

                        log.debug(groupDN);

                    }



                    groups = getUserDAO().getUserGroups(testUser.getUserID(), true);

                    assertNotNull(groups);

                    assertTrue(!groups.isEmpty());

                    groups = getUserDAO().getUserGroups(testUser.getUserID(),

                                                        true);

                    assertNotNull("Groups should not be null.", groups);

                    for (DN groupDN : groups)

                    {

                        log.debug(groupDN);

                    }



                    return null;

                }
@@ -228,12 +235,15 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 
            {

                try

                {

                    boolean isMember = getUserDAO().isMember(testUser.getUserID(), "foo");

                    assertFalse(isMember);

                    boolean isMember =

                            getUserDAO().isMember(testUser.getUserID(), "foo");

                    assertFalse("Membership should not exist.", isMember);



                    String groupDN = "cn=cadcdaotestgroup1," + config.getGroupsDN();

                    isMember = getUserDAO().isMember(testUser.getUserID(), groupDN);

                    assertTrue(isMember);

                    String groupDN = "cn=cadcdaotestgroup1,"

                                     + config.getGroupsDN();

                    isMember = getUserDAO().isMember(testUser.getUserID(),

                                                     groupDN);

                    assertTrue("Membership should exist.", isMember);



                    return null;

                }
@@ -261,7 +271,8 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 
            {

                try

                {

                    User<X500Principal> actual = getUserDAO().getMember(new DN(testUserDN));

                    User<X500Principal> actual = getUserDAO()

                            .getMember(new DN(testUserDN));

                    check(testUser, actual);

                    return null;

                }
@@ -283,7 +294,8 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 
            {

                try

                {

                    User<X500Principal> actual = getUserDAO().getMember(new DN(testUserDN));

                    User<X500Principal> actual = getUserDAO()

                            .getMember(new DN(testUserDN));

                    check(testUser, actual);

                    return null;

                }
@@ -305,7 +317,8 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 




        // anonymous access

        int users1 = (Integer)Subject.doAs(subject, new PrivilegedExceptionAction<Object>()

        int users1 = (Integer) Subject

                .doAs(subject, new PrivilegedExceptionAction<Object>()

                {

                    public Object run() throws Exception

                    {
@@ -325,7 +338,8 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 


        // authenticated access

        subject.getPrincipals().add(testUser.getUserID());

        int users2 = (Integer)Subject.doAs(subject, new PrivilegedExceptionAction<Object>()

        int users2 = (Integer) Subject

                .doAs(subject, new PrivilegedExceptionAction<Object>()

                {

                    public Object run() throws Exception

                    {