Commit bab3a305 authored by Alinga Yeung's avatar Alinga Yeung
Browse files

Story 1890. Changed admin tool integration test to unit test. Changed... 

Story 1890. Changed admin tool integration test to unit test. Changed test/LdapConfig.properties file to use the canfar test in devLdap.
parent 7a626247

cadcAccessControl-Admin/build.xml

+0 −12
Original line number Diff line number Diff line
@@ -158,16 +158,4 @@ 


  <property name="testingJars" value="${junit}:${asm}:${cglib}:${easymock}:${objenesis}:{unboundid}:${cadcLog}"/>



  <target name="int-test" depends="build,compile-test,setup-test">

    <echo message="Running test suite..."/>

    <junit printsummary="yes" haltonfailure="yes" fork="yes">

      <classpath>

        <pathelement path="${build}/class"/>

        <pathelement path="${build}/test/class"/>

        <pathelement path="${jars}:${testingJars}"/>

      </classpath>

      <test name="ca.nrc.cadc.ac.admin.integration.UserAdminIntTest"/>

      <formatter type="plain" usefile="false"/>

    </junit>

  </target>

</project>

cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ public class ApproveUser extends AbstractUserCommand 
        catch (UserNotFoundException e)

        {

            this.systemOut.println("Could not find pending user " + this.getPrincipal());

            return;

        }



        User<Principal> user = null;

cadcAccessControl-Admin/test/LdapConfig.properties

+14 −14
Original line number Diff line number Diff line
@@ -30,19 +30,19 @@ unboundReadOnly.maxWait = 30000 
unboundReadOnly.createIfNeeded = false



# server configuration -- applies to all servers

#dbrcHost = devLdap

#port = 636

#proxyUser = uid=webproxy,ou=SpecialUsers,dc=canfar,dc=net

#usersDN = ou=Users,ou=ds,dc=canfar,dc=net

#userRequestsDN = ou=userRequests,ou=ds,dc=canfar,dc=net

#groupsDN = ou=Groups,ou=ds,dc=canfar,dc=net

#adminGroupsDN = ou=adminGroups,ou=ds,dc=canfar,dc=net

dbrcHost = devLdap

port = 636

proxyUser = uid=webproxy,ou=SpecialUsers,dc=canfar,dc=net

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

userRequestsDN = ou=userRequests,ou=ds,dc=canfar,dc=net

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

adminGroupsDN = ou=adminGroups,ou=ds,dc=canfar,dc=net



# tree without aci's

dbrcHost = devLdap

port = 389

proxyUser = uid=testproxy,ou=SpecialUsers,dc=testcanfar

usersDN = ou=Users,ou=ds,dc=testcanfar

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

groupsDN = ou=Groups,ou=ds,dc=testcanfar

adminGroupsDN = ou=adminGroups,ou=ds,dc=testcanfar
 
 No newline at end of file
 
#dbrcHost = devLdap

#port = 389

#proxyUser = uid=testproxy,ou=SpecialUsers,dc=testcanfar

#usersDN = ou=Users,ou=ds,dc=testcanfar

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

#groupsDN = ou=Groups,ou=ds,dc=testcanfar

#adminGroupsDN = ou=adminGroups,ou=ds,dc=testcanfar

cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/integration/UserAdminIntTest.java→cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/UserAdminTest.java

+3 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
 *

 ************************************************************************

 */

package ca.nrc.cadc.ac.admin.integration;

package ca.nrc.cadc.ac.admin;



import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.User;
@@ -98,9 +98,9 @@ import org.junit.Test; 
import static org.junit.Assert.*;





public class UserAdminIntTest

public class UserAdminTest

{

    private static final Logger log = Logger.getLogger(UserAdminIntTest.class);

    private static final Logger log = Logger.getLogger(UserAdminTest.class);



    private final OutputStream output = new ByteArrayOutputStream();

    private final OutputStream error = new ByteArrayOutputStream();