Commit a0d24742 authored by Brian Major's avatar Brian Major
Browse files

s1970 - more test config for travis

parent b096967b

cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java

+13 −10
Original line number Original line Diff line number Diff line
@@ -67,23 +67,24 @@ 




package ca.nrc.cadc.ac.server.ldap;

package ca.nrc.cadc.ac.server.ldap;





import java.lang.reflect.Field;

import java.util.NoSuchElementException;



import javax.security.auth.Subject;

import javax.security.auth.x500.X500Principal;



import org.apache.log4j.Level;

import org.apache.log4j.Logger;

import org.junit.BeforeClass;



import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.UserNotFoundException;

import ca.nrc.cadc.ac.UserNotFoundException;

import ca.nrc.cadc.ac.UserRequest;

import ca.nrc.cadc.ac.UserRequest;

import ca.nrc.cadc.auth.DNPrincipal;

import ca.nrc.cadc.auth.DNPrincipal;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.util.Log4jInit;

import ca.nrc.cadc.util.Log4jInit;

import org.apache.log4j.Level;

import ca.nrc.cadc.util.PropertiesReader;

import org.apache.log4j.Logger;

import org.junit.BeforeClass;



import javax.security.auth.Subject;

import javax.security.auth.x500.X500Principal;

import java.lang.reflect.Field;

import java.util.UUID;

import java.util.NoSuchElementException;





/**

/**

 * Created by jburke on 2014-11-03.

 * Created by jburke on 2014-11-03.
@@ -132,6 +133,8 @@ public class AbstractLdapDAOTest 
    {

    {

        Log4jInit.setLevel("ca.nrc.cadc.ac", Level.DEBUG);

        Log4jInit.setLevel("ca.nrc.cadc.ac", Level.DEBUG);





        System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");



        // get the configuration of the development server from and config files...

        // get the configuration of the development server from and config files...

        try

        try

        {

        {

cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java

+26 −18
Original line number Original line Diff line number Diff line
@@ -68,34 +68,42 @@ 




package ca.nrc.cadc.ac.server.ldap;

package ca.nrc.cadc.ac.server.ldap;





import ca.nrc.cadc.auth.DNPrincipal;

import static org.junit.Assert.assertTrue;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.util.Log4jInit;

import com.unboundid.ldap.sdk.DN;

import com.unboundid.ldap.sdk.LDAPConnection;

import com.unboundid.ldap.sdk.LDAPException;

import com.unboundid.ldap.sdk.LDAPInterface;





import java.security.PrivilegedAction;

import java.security.PrivilegedExceptionAction;

import org.apache.log4j.Level;

import java.util.UUID;

import org.junit.BeforeClass;

import org.junit.Test;





import javax.security.auth.Subject;

import javax.security.auth.Subject;

import javax.security.auth.x500.X500Principal;

import javax.security.auth.x500.X500Principal;

import java.security.PrivilegedExceptionAction;

import java.util.UUID;





import org.junit.Assert;

import org.apache.log4j.Level;

import org.junit.AfterClass;

import org.junit.BeforeClass;

import org.junit.Test;





import static org.junit.Assert.assertEquals;

import com.unboundid.ldap.sdk.LDAPConnection;

import static org.junit.Assert.assertNotNull;



import static org.junit.Assert.assertTrue;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.util.Log4jInit;

import ca.nrc.cadc.util.PropertiesReader;









public class LdapDAOTest extends AbstractLdapDAOTest

public class LdapDAOTest extends AbstractLdapDAOTest

{

{

    @BeforeClass

    public static void setUpClass()

    {

        Log4jInit.setLevel("ca.nrc.cadc.ac", Level.INFO);

        System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");

    }



    @AfterClass

    public static void teardownClass()

    {

        System.clearProperty(PropertiesReader.class.getName() + ".dir");

    }



    @Test

    @Test

    public void testLdapBindConnection() throws Exception

    public void testLdapBindConnection() throws Exception

    {

    {

cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java

+18 −0
Original line number Original line Diff line number Diff line
@@ -77,19 +77,37 @@ import java.util.Collection; 




import javax.security.auth.Subject;

import javax.security.auth.Subject;





import org.apache.log4j.Level;

import org.apache.log4j.Logger;

import org.apache.log4j.Logger;

import org.junit.AfterClass;

import org.junit.Assert;

import org.junit.Assert;

import org.junit.BeforeClass;

import org.junit.Test;

import org.junit.Test;





import ca.nrc.cadc.ac.Group;

import ca.nrc.cadc.ac.Group;

import ca.nrc.cadc.ac.GroupNotFoundException;

import ca.nrc.cadc.ac.GroupNotFoundException;

import ca.nrc.cadc.ac.GroupProperty;

import ca.nrc.cadc.ac.GroupProperty;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.util.Log4jInit;

import ca.nrc.cadc.util.PropertiesReader;





public class LdapGroupDAOTest extends AbstractLdapDAOTest

public class LdapGroupDAOTest extends AbstractLdapDAOTest

{

{

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

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





    @BeforeClass

    public static void setUpClass()

    {

        Log4jInit.setLevel("ca.nrc.cadc.ac", Level.INFO);

        System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");

    }



    @AfterClass

    public static void teardownClass()

    {

        System.clearProperty(PropertiesReader.class.getName() + ".dir");

    }



    LdapGroupDAO getGroupDAO() throws Exception

    LdapGroupDAO getGroupDAO() throws Exception

    {

    {

        LdapConnections connections = new LdapConnections(config);

        LdapConnections connections = new LdapConnections(config);

cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java

+19 −0
Original line number Original line Diff line number Diff line
@@ -84,7 +84,10 @@ import java.util.Collection; 
import javax.security.auth.Subject;

import javax.security.auth.Subject;

import javax.security.auth.x500.X500Principal;

import javax.security.auth.x500.X500Principal;





import org.apache.log4j.Level;

import org.apache.log4j.Logger;

import org.apache.log4j.Logger;

import org.junit.AfterClass;

import org.junit.BeforeClass;

import org.junit.Test;

import org.junit.Test;





import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.PersonalDetails;
@@ -96,9 +99,25 @@ import ca.nrc.cadc.auth.DNPrincipal; 
import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.auth.SSLUtil;

import ca.nrc.cadc.auth.SSLUtil;

import ca.nrc.cadc.util.Log4jInit;

import ca.nrc.cadc.util.PropertiesReader;





public class LdapUserDAOTest extends AbstractLdapDAOTest

public class LdapUserDAOTest extends AbstractLdapDAOTest

{

{



    @BeforeClass

    public static void setUpClass()

    {

        Log4jInit.setLevel("ca.nrc.cadc.ac", Level.INFO);

        System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");

    }



    @AfterClass

    public static void teardownClass()

    {

        System.clearProperty(PropertiesReader.class.getName() + ".dir");

    }



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

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





    String createUsername()

    String createUsername()

cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServletTest.java

+15 −0
Original line number Original line Diff line number Diff line
@@ -83,11 +83,14 @@ import javax.servlet.http.HttpServletRequest; 
import javax.servlet.http.HttpServletResponse;

import javax.servlet.http.HttpServletResponse;





import org.apache.log4j.Level;

import org.apache.log4j.Level;

import org.junit.AfterClass;

import org.junit.BeforeClass;

import org.junit.Test;

import org.junit.Test;





import ca.nrc.cadc.ac.server.UserPersistence;

import ca.nrc.cadc.ac.server.UserPersistence;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.util.Log4jInit;

import ca.nrc.cadc.util.Log4jInit;

import ca.nrc.cadc.util.PropertiesReader;

import ca.nrc.cadc.util.StringUtil;

import ca.nrc.cadc.util.StringUtil;
@@ -99,6 +102,18 @@ public class ModifyPasswordServletTest 
        Log4jInit.setLevel("ca.nrc.cadc.ac", Level.INFO);

        Log4jInit.setLevel("ca.nrc.cadc.ac", Level.INFO);

    }

    }





    @BeforeClass

    public static void setUpClass()

    {

        System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");

    }



    @AfterClass

    public static void teardownClass()

    {

        System.clearProperty(PropertiesReader.class.getName() + ".dir");

    }



    public void testSubjectAndPasswords(final Subject subject, final String oldPassword,

    public void testSubjectAndPasswords(final Subject subject, final String oldPassword,

            final String newPassword, int responseStatus) throws Exception

            final String newPassword, int responseStatus) throws Exception

    {

    {