s1970 - more system property setting for local authority discovery

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

@@ -68,21 +68,13 @@
 
 package ca.nrc.cadc.ac.client;
 
-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.auth.HttpPrincipal;
-import ca.nrc.cadc.util.Log4jInit;
+import static org.junit.Assert.assertEquals;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.net.URI;
-import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -90,10 +82,18 @@ 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 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
@@ -105,6 +105,18 @@ public class JsonUserListInputStreamWrapperTest
         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
     public void readInputStream() throws Exception
     {

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

@@ -81,7 +81,9 @@ import javax.security.auth.x500.X500Principal;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
+import org.junit.AfterClass;
 import org.junit.Assert;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 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.client.LocalAuthority;
 import ca.nrc.cadc.util.Log4jInit;
+import ca.nrc.cadc.util.PropertiesReader;
 
 
 public class UserClientTest
@@ -98,6 +101,18 @@ public class UserClientTest
 
     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()
     {
         Log4jInit.setLevel("ca.nrc.cadc.ac", Level.INFO);

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

@@ -89,6 +89,7 @@ import javax.security.auth.x500.X500Principal;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 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.auth.HttpPrincipal;
 import ca.nrc.cadc.util.Log4jInit;
+import ca.nrc.cadc.util.PropertiesReader;
 
 /**
  * @author jburke
@@ -111,12 +113,23 @@ public class JsonGroupReaderWriterTest
 {
     private static Logger log = Logger.getLogger(JsonGroupReaderWriterTest.class);
 
-    @BeforeClass
-    public static void setUpClass()
+    static
     {
         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
     public void testReaderExceptions() throws Exception
     {

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

 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.PersonalDetails;
 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.WriterException;
 import ca.nrc.cadc.ac.xml.AbstractReaderWriter;
-import ca.nrc.cadc.auth.HttpPrincipal;
 import ca.nrc.cadc.auth.NumericPrincipal;
 import ca.nrc.cadc.util.Log4jInit;
-import org.json.JSONObject;
-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.*;
+import ca.nrc.cadc.util.PropertiesReader;
 
 
 /**
@@ -36,6 +41,18 @@ public class JsonUserListReaderWriterTest
         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
     public void testReaderExceptions()
             throws Exception

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

@@ -68,6 +68,22 @@
  */
 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.PersonalDetails;
 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.xml.AbstractReaderWriter;
 import ca.nrc.cadc.auth.NumericPrincipal;
-import org.apache.log4j.Logger;
-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;
+import ca.nrc.cadc.util.PropertiesReader;
 
 /**
  *
@@ -98,6 +102,18 @@ public class JsonUserReaderWriterTest
 {
     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
     public void testReaderExceptions()
         throws Exception

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

@@ -67,6 +67,21 @@
  */
 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.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 import ca.nrc.cadc.ac.InternalID;
 import ca.nrc.cadc.ac.PersonalDetails;
 import ca.nrc.cadc.ac.TestUtil;
@@ -75,23 +90,24 @@ import ca.nrc.cadc.ac.UserRequest;
 import ca.nrc.cadc.ac.WriterException;
 import ca.nrc.cadc.ac.xml.AbstractReaderWriter;
 import ca.nrc.cadc.auth.HttpPrincipal;
-import org.junit.Test;
+import ca.nrc.cadc.util.PropertiesReader;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.net.URI;
-import java.security.Principal;
-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;
+public class JsonUserRequestReaderWriterTest
+{
 
+    @BeforeClass
+    public static void setupClass()
+    {
+        System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
+    }
 
-public class JsonUserRequestReaderWriterTest
+    @AfterClass
+    public static void teardownClass()
     {
+        System.clearProperty(PropertiesReader.class.getName() + ".dir");
+    }
+
     @Test
     public void testReaderExceptions()
         throws Exception

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

@@ -80,8 +80,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import ca.nrc.cadc.ac.Group;
@@ -96,14 +96,14 @@ public class GroupListReaderWriterTest
 {
     private static Logger log = Logger.getLogger(GroupListReaderWriterTest.class);
 
-    @Before
-    public void setup()
+    @BeforeClass
+    public static void setupClass()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @After
-    public void teardown()
+    @AfterClass
+    public static void teardownClass()
     {
         System.clearProperty(PropertiesReader.class.getName() + ".dir");
     }

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

@@ -75,8 +75,7 @@ import static org.junit.Assert.fail;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.jdom2.Element;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -94,14 +93,14 @@ public class GroupPropertyReaderWriterTest extends AbstractReaderWriter
 {
     private static Logger log = Logger.getLogger(GroupPropertyReaderWriterTest.class);
 
-    @Before
-    public void setup()
+    @BeforeClass
+    public static void setupClass()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @After
-    public void teardown()
+    @AfterClass
+    public static void teardownClass()
     {
         System.clearProperty(PropertiesReader.class.getName() + ".dir");
     }

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

@@ -85,8 +85,8 @@ import java.util.UUID;
 import javax.security.auth.x500.X500Principal;
 
 import org.apache.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import ca.nrc.cadc.ac.Group;
@@ -108,14 +108,14 @@ public class GroupReaderWriterTest
 {
     private static Logger log = Logger.getLogger(GroupReaderWriterTest.class);
 
-    @Before
-    public void setup()
+    @BeforeClass
+    public static void setupClass()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @After
-    public void teardown()
+    @AfterClass
+    public static void teardownClass()
     {
         System.clearProperty(PropertiesReader.class.getName() + ".dir");
     }

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

@@ -80,8 +80,8 @@ import javax.security.auth.x500.X500Principal;
 
 import org.apache.log4j.Logger;
 import org.jdom2.Element;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import ca.nrc.cadc.ac.ReaderException;
@@ -99,14 +99,14 @@ public class IdentityReaderWriterTest extends AbstractReaderWriter
 {
     private static Logger log = Logger.getLogger(IdentityReaderWriterTest.class);
 
-    @Before
-    public void setup()
+    @BeforeClass
+    public static void setupClass()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @After
-    public void teardown()
+    @AfterClass
+    public static void teardownClass()
     {
         System.clearProperty(PropertiesReader.class.getName() + ".dir");
     }

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

@@ -74,8 +74,8 @@ import static org.junit.Assert.fail;
 
 import org.apache.log4j.Logger;
 import org.jdom2.Element;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import ca.nrc.cadc.ac.PersonalDetails;
@@ -92,14 +92,14 @@ public class UserDetailsReaderWriterTest extends AbstractReaderWriter
 {
     private static Logger log = Logger.getLogger(UserDetailsReaderWriterTest.class);
 
-    @Before
-    public void setup()
+    @BeforeClass
+    public static void setupClass()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @After
-    public void teardown()
+    @AfterClass
+    public static void teardownClass()
     {
         System.clearProperty(PropertiesReader.class.getName() + ".dir");
     }

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

@@ -14,8 +14,8 @@ import java.util.List;
 import java.util.UUID;
 
 import org.apache.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import ca.nrc.cadc.ac.InternalID;
@@ -29,14 +29,14 @@ public class UserListReaderWriterTest
 {
     private static Logger log = Logger.getLogger(UserListReaderWriterTest.class);
 
-    @Before
-    public void setup()
+    @BeforeClass
+    public static void setupClass()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @After
-    public void teardown()
+    @AfterClass
+    public static void teardownClass()
     {
         System.clearProperty(PropertiesReader.class.getName() + ".dir");
     }

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

@@ -79,9 +79,10 @@ 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.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import ca.nrc.cadc.ac.InternalID;
@@ -90,6 +91,7 @@ import ca.nrc.cadc.ac.TestUtil;
 import ca.nrc.cadc.ac.User;
 import ca.nrc.cadc.ac.WriterException;
 import ca.nrc.cadc.auth.NumericPrincipal;
+import ca.nrc.cadc.util.Log4jInit;
 import ca.nrc.cadc.util.PropertiesReader;
 
 /**
@@ -100,14 +102,19 @@ public class UserReaderWriterTest
 {
     private static Logger log = Logger.getLogger(UserReaderWriterTest.class);
 
-    @Before
-    public void setup()
+    public UserReaderWriterTest()
+    {
+        Log4jInit.setLevel("ca.nrc.cadc.reg", Level.INFO);
+    }
+
+    @BeforeClass
+    public static void setupClass()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @After
-    public void teardown()
+    @AfterClass
+    public static void teardownClass()
     {
         System.clearProperty(PropertiesReader.class.getName() + ".dir");
     }
@@ -116,6 +123,9 @@ public class UserReaderWriterTest
     public void testReaderExceptions()
         throws Exception
     {
+
+        System.out.println("config dir: " + System.getProperty(PropertiesReader.class.getName() + ".dir"));
+
         try
         {
             String s = null;

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

@@ -79,9 +79,10 @@ 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.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import ca.nrc.cadc.ac.InternalID;
@@ -91,6 +92,7 @@ import ca.nrc.cadc.ac.User;
 import ca.nrc.cadc.ac.UserRequest;
 import ca.nrc.cadc.ac.WriterException;
 import ca.nrc.cadc.auth.NumericPrincipal;
+import ca.nrc.cadc.util.Log4jInit;
 import ca.nrc.cadc.util.PropertiesReader;
 
 /**
@@ -101,14 +103,20 @@ public class UserRequestReaderWriterTest
 {
     private static Logger log = Logger.getLogger(UserRequestReaderWriterTest.class);
 
-    @Before
-    public void setup()
+    public UserRequestReaderWriterTest()
+    {
+        Log4jInit.setLevel("ca.nrc.cadc.ac", Level.INFO);
+    }
+
+    @BeforeClass
+    public static void setupClass()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
+        System.out.println("set config dir to: " + System.getProperty(PropertiesReader.class.getName() + ".dir"));
     }
 
-    @After
-    public void teardown()
+    @AfterClass
+    public static void teardownClass()
     {
         System.clearProperty(PropertiesReader.class.getName() + ".dir");
     }