s1970 - beforeClass -> before

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.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import ca.nrc.cadc.ac.Group;
@@ -96,13 +96,13 @@ public class GroupListReaderWriterTest
 {
     private static Logger log = Logger.getLogger(GroupListReaderWriterTest.class);
 
-    @BeforeClass
+    @Before
     public void setup()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @AfterClass
+    @After
     public void teardown()
     {
         System.clearProperty(PropertiesReader.class.getName() + ".dir");

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

@@ -75,7 +75,8 @@ 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.After;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -93,13 +94,13 @@ public class GroupPropertyReaderWriterTest extends AbstractReaderWriter
 {
     private static Logger log = Logger.getLogger(GroupPropertyReaderWriterTest.class);
 
-    @BeforeClass
+    @Before
     public void setup()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @AfterClass
+    @After
     public void teardown()
     {
         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.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import ca.nrc.cadc.ac.Group;
@@ -108,13 +108,13 @@ public class GroupReaderWriterTest
 {
     private static Logger log = Logger.getLogger(GroupReaderWriterTest.class);
 
-    @BeforeClass
+    @Before
     public void setup()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @AfterClass
+    @After
     public void teardown()
     {
         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.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import ca.nrc.cadc.ac.ReaderException;
@@ -99,13 +99,13 @@ public class IdentityReaderWriterTest extends AbstractReaderWriter
 {
     private static Logger log = Logger.getLogger(IdentityReaderWriterTest.class);
 
-    @BeforeClass
+    @Before
     public void setup()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @AfterClass
+    @After
     public void teardown()
     {
         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.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import ca.nrc.cadc.ac.PersonalDetails;
@@ -92,13 +92,13 @@ public class UserDetailsReaderWriterTest extends AbstractReaderWriter
 {
     private static Logger log = Logger.getLogger(UserDetailsReaderWriterTest.class);
 
-    @BeforeClass
+    @Before
     public void setup()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @AfterClass
+    @After
     public void teardown()
     {
         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.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import ca.nrc.cadc.ac.InternalID;
@@ -29,13 +29,13 @@ public class UserListReaderWriterTest
 {
     private static Logger log = Logger.getLogger(UserListReaderWriterTest.class);
 
-    @BeforeClass
+    @Before
     public void setup()
     {
         System.setProperty(PropertiesReader.class.getName() + ".dir", "src/test/resources");
     }
 
-    @AfterClass
+    @After
     public void teardown()
     {
         System.clearProperty(PropertiesReader.class.getName() + ".dir");

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

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

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

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