Commit 2bfc8ec5 authored by Brian Major's avatar Brian Major
Browse files

s1970 - set config dir to src/test/resources

parent 562faadb

cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java

+30 −14
Original line number Diff line number Diff line
@@ -68,10 +68,10 @@ 
 */

package ca.nrc.cadc.ac.xml;



import ca.nrc.cadc.ac.Group;

import ca.nrc.cadc.ac.WriterException;

import org.apache.log4j.Logger;

import org.junit.Test;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.fail;



import java.io.IOException;

import java.io.InputStream;
@@ -79,10 +79,14 @@ import java.io.Reader; 
import java.util.ArrayList;

import java.util.List;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.fail;

import org.apache.log4j.Logger;

import org.junit.AfterClass;

import org.junit.BeforeClass;

import org.junit.Test;



import ca.nrc.cadc.ac.Group;

import ca.nrc.cadc.ac.WriterException;

import ca.nrc.cadc.util.PropertiesReader;



/**

 *
@@ -92,6 +96,18 @@ public class GroupListReaderWriterTest 
{

    private static Logger log = Logger.getLogger(GroupListReaderWriterTest.class);



    @BeforeClass

    public void setup()

    {

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

    }



    @AfterClass

    public void teardown()

    {

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

    }



    @Test

    public void testReaderExceptions()

        throws Exception

cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java

+36 −18
Original line number Diff line number Diff line
@@ -68,16 +68,22 @@ 
 */

package ca.nrc.cadc.ac.xml;



import ca.nrc.cadc.ac.GroupProperty;

import ca.nrc.cadc.ac.ReaderException;

import ca.nrc.cadc.ac.WriterException;

import ca.nrc.cadc.util.Log4jInit;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.fail;



import org.apache.log4j.Level;

import org.apache.log4j.Logger;

import org.jdom2.Element;

import org.junit.AfterClass;

import org.junit.BeforeClass;

import org.junit.Test;

import static org.junit.Assert.*;



import ca.nrc.cadc.ac.GroupProperty;

import ca.nrc.cadc.ac.ReaderException;

import ca.nrc.cadc.ac.WriterException;

import ca.nrc.cadc.util.Log4jInit;

import ca.nrc.cadc.util.PropertiesReader;



/**

 *
@@ -87,6 +93,18 @@ public class GroupPropertyReaderWriterTest extends AbstractReaderWriter 
{

    private static Logger log = Logger.getLogger(GroupPropertyReaderWriterTest.class);



    @BeforeClass

    public void setup()

    {

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

    }



    @AfterClass

    public void teardown()

    {

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

    }



    @BeforeClass

    public static void setUpClass()

    {

cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java

+15 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ import java.util.UUID; 
import javax.security.auth.x500.X500Principal;



import org.apache.log4j.Logger;

import org.junit.AfterClass;

import org.junit.BeforeClass;

import org.junit.Test;



import ca.nrc.cadc.ac.Group;
@@ -96,6 +98,7 @@ import ca.nrc.cadc.ac.TestUtil; 
import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.WriterException;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.util.PropertiesReader;



/**

 *
@@ -105,6 +108,18 @@ public class GroupReaderWriterTest 
{

    private static Logger log = Logger.getLogger(GroupReaderWriterTest.class);



    @BeforeClass

    public void setup()

    {

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

    }



    @AfterClass

    public void teardown()

    {

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

    }



    @Test

    public void testReaderExceptions()

        throws Exception

cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java

+46 −29
Original line number Diff line number Diff line
@@ -68,23 +68,28 @@ 
 */

package ca.nrc.cadc.ac.xml;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.fail;



import java.security.Principal;

import java.util.UUID;



import javax.management.remote.JMXPrincipal;

import javax.security.auth.x500.X500Principal;



import org.apache.log4j.Logger;

import org.jdom2.Element;

import org.junit.AfterClass;

import org.junit.BeforeClass;

import org.junit.Test;



import ca.nrc.cadc.ac.ReaderException;

import ca.nrc.cadc.ac.WriterException;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.auth.OpenIdPrincipal;

import org.apache.log4j.Logger;

import org.jdom2.Element;

import org.junit.Test;



import javax.management.remote.JMXPrincipal;

import javax.security.auth.x500.X500Principal;

import java.security.Principal;

import java.util.UUID;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.fail;

import ca.nrc.cadc.util.PropertiesReader;



/**

 *
@@ -94,6 +99,18 @@ public class IdentityReaderWriterTest extends AbstractReaderWriter 
{

    private static Logger log = Logger.getLogger(IdentityReaderWriterTest.class);



    @BeforeClass

    public void setup()

    {

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

    }



    @AfterClass

    public void teardown()

    {

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

    }



    @Test

    public void testReaderExceptions()

        throws Exception

cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java

+30 −14
Original line number Diff line number Diff line
@@ -68,17 +68,21 @@ 
 */

package ca.nrc.cadc.ac.xml;



import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.PosixDetails;

import ca.nrc.cadc.ac.ReaderException;

import ca.nrc.cadc.ac.WriterException;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.fail;



import org.apache.log4j.Logger;

import org.jdom2.Element;

import org.junit.AfterClass;

import org.junit.BeforeClass;

import org.junit.Test;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.fail;

import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.PosixDetails;

import ca.nrc.cadc.ac.ReaderException;

import ca.nrc.cadc.ac.WriterException;

import ca.nrc.cadc.util.PropertiesReader;



/**

 *
@@ -88,6 +92,18 @@ public class UserDetailsReaderWriterTest extends AbstractReaderWriter 
{

    private static Logger log = Logger.getLogger(UserDetailsReaderWriterTest.class);



    @BeforeClass

    public void setup()

    {

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

    }



    @AfterClass

    public void teardown()

    {

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

    }



    @Test

    public void testReaderExceptions()

        throws Exception