diff --git a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java index f23e62c134974eeab60fc95ed42e09a1001f469d..364c4c93cade77db258e8909bcaa8a9478413396 100644 --- a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java +++ b/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"); diff --git a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java index fdc45f8c2266b667808070d835c5098fabd194a4..9b3f2da9efc6496bcff3d84f9ab6600ce99a2ded 100644 --- a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java +++ b/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"); diff --git a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java index c4ccbf0940c55dd5689d51e27d49d1061f4d13cd..655d41a5e0269c7d55697780f569b0f74cab055f 100644 --- a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java +++ b/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"); diff --git a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java index 46f1a899d6d91db1d9e9a8feae178ba97ddada13..1bfb9429387188ee17fe849f9b8c0bdf57f8e88d 100644 --- a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java +++ b/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"); diff --git a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java index 84f66065e4c9434a27359983309de4564f321eee..d8ca1b752fb335c912bfa934e8880d9cfb6cdfc4 100644 --- a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java +++ b/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"); diff --git a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java index 0c24f72981cedd8a3e335db466dae0a84e8db1a6..605015c0b38ce941baaa1e0bb762c61a4a44efa5 100644 --- a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java +++ b/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"); diff --git a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java index ba37a08f5edd64e3b34244e3e163cc565c8ad2fc..2d5904c01a9e7da8b515879ba51a31c1c44d60e2 100644 --- a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java +++ b/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"); diff --git a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java index 35b1b45235e9332af4861601cc7b2bfb453847da..b438d15b6138862300b40be3a8ab4abe56919ad8 100644 --- a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java +++ b/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");