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

s1970 - more system property setting for local authority discovery

parent 3dfdf269

cadc-access-control/src/test/java/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java

+26 −14
Original line number Original line Diff line number Diff line
@@ -68,21 +68,13 @@ 




package ca.nrc.cadc.ac.client;

package ca.nrc.cadc.ac.client;





import ca.nrc.cadc.ac.InternalID;

import static org.junit.Assert.assertEquals;

import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.TestUtil;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.json.JsonUserListWriter;

import ca.nrc.cadc.ac.xml.AbstractReaderWriter;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.util.Log4jInit;





import java.io.ByteArrayInputStream;

import java.io.ByteArrayInputStream;

import java.io.InputStream;

import java.io.InputStream;

import java.io.StringWriter;

import java.io.StringWriter;

import java.io.Writer;

import java.io.Writer;

import java.net.URI;

import java.net.URI;

import java.security.Principal;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Collection;

import java.util.Collection;

import java.util.List;

import java.util.List;
@@ -90,10 +82,18 @@ import java.util.UUID; 




import org.apache.log4j.Level;

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 static org.junit.Assert.*;

import ca.nrc.cadc.ac.InternalID;

import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.TestUtil;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.json.JsonUserListWriter;

import ca.nrc.cadc.ac.xml.AbstractReaderWriter;

import ca.nrc.cadc.util.Log4jInit;

import ca.nrc.cadc.util.PropertiesReader;









public class JsonUserListInputStreamWrapperTest

public class JsonUserListInputStreamWrapperTest
@@ -105,6 +105,18 @@ public class JsonUserListInputStreamWrapperTest 
        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");

    }



    @Test

    @Test

    public void readInputStream() throws Exception

    public void readInputStream() throws Exception

    {

    {

cadc-access-control/src/test/java/ca/nrc/cadc/ac/client/UserClientTest.java

+15 −0
Original line number Original line Diff line number Diff line
@@ -81,7 +81,9 @@ import javax.security.auth.x500.X500Principal; 




import org.apache.log4j.Level;

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.auth.HttpPrincipal;

import ca.nrc.cadc.auth.HttpPrincipal;
@@ -89,6 +91,7 @@ import ca.nrc.cadc.auth.NumericPrincipal; 
import ca.nrc.cadc.reg.Standards;

import ca.nrc.cadc.reg.Standards;

import ca.nrc.cadc.reg.client.LocalAuthority;

import ca.nrc.cadc.reg.client.LocalAuthority;

import ca.nrc.cadc.util.Log4jInit;

import ca.nrc.cadc.util.Log4jInit;

import ca.nrc.cadc.util.PropertiesReader;









public class UserClientTest

public class UserClientTest
@@ -98,6 +101,18 @@ public class UserClientTest 




    private URI umsServiceURI;

    private URI umsServiceURI;





    @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 UserClientTest()

    public UserClientTest()

    {

    {

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

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

cadc-access-control/src/test/java/ca/nrc/cadc/ac/json/JsonGroupReaderWriterTest.java

+15 −2
Original line number Original line Diff line number Diff line
@@ -89,6 +89,7 @@ import javax.security.auth.x500.X500Principal; 




import org.apache.log4j.Level;

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.BeforeClass;

import org.junit.Test;

import org.junit.Test;
@@ -103,6 +104,7 @@ import ca.nrc.cadc.ac.WriterException; 
import ca.nrc.cadc.ac.xml.AbstractReaderWriter;

import ca.nrc.cadc.ac.xml.AbstractReaderWriter;

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;





/**

/**

 * @author jburke

 * @author jburke
@@ -111,12 +113,23 @@ public class JsonGroupReaderWriterTest 
{

{

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

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





    @BeforeClass

    static

    public static void setUpClass()

    {

    {

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

        Log4jInit.setLevel("ca.nrc.cadc.ac.json", 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");

    }



    @Test

    @Test

    public void testReaderExceptions() throws Exception

    public void testReaderExceptions() throws Exception

    {

    {

cadc-access-control/src/test/java/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java

+32 −15
Original line number Original line Diff line number Diff line 
package ca.nrc.cadc.ac.json;

package ca.nrc.cadc.ac.json;





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;

import java.io.Reader;

import java.net.URI;

import java.util.UUID;



import org.apache.log4j.Level;

import org.apache.log4j.Logger;

import org.junit.AfterClass;

import org.junit.BeforeClass;

import org.junit.Test;



import ca.nrc.cadc.ac.InternalID;

import ca.nrc.cadc.ac.InternalID;

import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.PosixDetails;

import ca.nrc.cadc.ac.PosixDetails;
@@ -7,21 +24,9 @@ import ca.nrc.cadc.ac.TestUtil; 
import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.WriterException;

import ca.nrc.cadc.ac.WriterException;

import ca.nrc.cadc.ac.xml.AbstractReaderWriter;

import ca.nrc.cadc.ac.xml.AbstractReaderWriter;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.util.Log4jInit;

import ca.nrc.cadc.util.Log4jInit;

import org.json.JSONObject;

import ca.nrc.cadc.util.PropertiesReader;

import org.junit.Test;

import org.skyscreamer.jsonassert.JSONAssert;



import java.io.*;

import java.net.URI;

import java.security.Principal;

import java.util.*;

import org.apache.log4j.Level;

import org.apache.log4j.Logger;



import static org.junit.Assert.*;









/**

/**
@@ -36,6 +41,18 @@ public class JsonUserListReaderWriterTest 
        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");

    }



    @Test

    @Test

    public void testReaderExceptions()

    public void testReaderExceptions()

            throws Exception

            throws Exception

cadc-access-control/src/test/java/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java

+34 −18
Original line number Original line Diff line number Diff line
@@ -68,6 +68,22 @@ 
 */

 */

package ca.nrc.cadc.ac.json;

package ca.nrc.cadc.ac.json;





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;

import java.io.Reader;

import java.net.URI;

import java.util.UUID;



import org.apache.log4j.Logger;

import org.junit.AfterClass;

import org.junit.BeforeClass;

import org.junit.Test;



import ca.nrc.cadc.ac.InternalID;

import ca.nrc.cadc.ac.InternalID;

import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.PosixDetails;

import ca.nrc.cadc.ac.PosixDetails;
@@ -76,19 +92,7 @@ import ca.nrc.cadc.ac.User; 
import ca.nrc.cadc.ac.WriterException;

import ca.nrc.cadc.ac.WriterException;

import ca.nrc.cadc.ac.xml.AbstractReaderWriter;

import ca.nrc.cadc.ac.xml.AbstractReaderWriter;

import ca.nrc.cadc.auth.NumericPrincipal;

import ca.nrc.cadc.auth.NumericPrincipal;

import org.apache.log4j.Logger;

import ca.nrc.cadc.util.PropertiesReader;

import org.junit.Test;



import java.io.IOException;

import java.io.InputStream;

import java.io.Reader;

import java.net.URI;

import java.util.UUID;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.fail;





/**

/**

 *

 *
@@ -98,6 +102,18 @@ public class JsonUserReaderWriterTest 
{

{

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

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





    @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");

    }



    @Test

    @Test

    public void testReaderExceptions()

    public void testReaderExceptions()

        throws Exception

        throws Exception