[java-identity-provider] branch master updated: IDP-1508 - TestNG @BeforeTest and @AfterTest are being misused
Scott Cantor
cantor.2 at osu.edu
Tue Apr 7 15:49:44 EDT 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=d4456448d18a3c2cf9cdcc20053ae00bb6e535b4
The following commit(s) were added to refs/heads/master by this push:
new d445644 IDP-1508 - TestNG @BeforeTest and @AfterTest are being misused
d445644 is described below
commit d4456448d18a3c2cf9cdcc20053ae00bb6e535b4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Apr 7 15:49:40 2020 -0400
IDP-1508 - TestNG @BeforeTest and @AfterTest are being misused
https://issues.shibboleth.net/jira/browse/IDP-1508
---
.../filter/matcher/impl/ScriptedMatcherTest.java | 7 ++-----
.../filter/matcher/logic/impl/AndMatcherTest.java | 5 ++---
.../filter/matcher/logic/impl/NotMatcherTest.java | 5 ++---
.../filter/matcher/logic/impl/OrMatcherTest.java | 5 ++---
.../filter/policyrule/impl/ScriptedPolicyRuleTest.java | 5 ++---
.../filter/policyrule/logic/impl/AndPolicyRuleTest.java | 5 ++---
.../filter/policyrule/logic/impl/NotPolicyRuleTest.java | 5 ++---
.../filter/policyrule/logic/impl/OrPolicyRuleTest.java | 5 ++---
.../resolver/dc/impl/StoredIDDataConnectorTest.java | 5 ++---
.../resolver/dc/ldap/impl/LDAPDataConnectorTest.java | 9 ++++-----
.../idp/attribute/resolver/dc/ldap/impl/Regressions.java | 9 ++++-----
.../resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java | 6 ++----
.../attribute/resolver/spring/AttributeResolverTest.java | 14 ++++----------
.../spring/dc/ldap/LDAPDataConnectorParserTest.java | 15 +++++----------
.../spring/dc/rdbms/RDBMSDataConnectorParserTest.java | 5 ++---
.../spring/failfast/AttributeResolverFailFastTest.java | 13 +++++--------
.../impl/ExactPrincipalEvalPredicateFactoryTest.java | 5 ++---
.../impl/InexactPrincipalEvalPredicateFactoryTest.java | 5 ++---
.../idp/cas/ticket/impl/EncodingTicketServiceTest.java | 4 ++--
.../idp/cas/ticket/impl/SimpleTicketServiceTest.java | 4 ++--
.../net/shibboleth/idp/test/flows/AbstractFlowTest.java | 11 ++++++-----
.../net/shibboleth/idp/profile/ScriptedActionTest.java | 4 ++--
22 files changed, 60 insertions(+), 91 deletions(-)
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
index 9bdc78f..e6148f1 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
@@ -29,11 +29,10 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
-import javax.annotation.concurrent.ThreadSafe;
import javax.security.auth.Subject;
import org.opensaml.profile.context.ProfileRequestContext;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -52,8 +51,6 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
/** {@link ScriptedMatcher} unit test. */
- at ThreadSafe
- at SuppressWarnings("javadoc")
public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
/** A script that returns a set that contains the one of values the attribute. */
@@ -71,7 +68,7 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
/** A script that returns a set containing the prc name. */
private EvaluableScript prcscScript;
- @BeforeTest public void setup() throws Exception {
+ @BeforeClass public void setup() throws Exception {
super.setUp();
filterContext = new AttributeFilterContext();
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
index c087c3f..b8b0025 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
@@ -32,7 +32,7 @@ import java.util.Set;
import javax.annotation.Nonnull;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.IdPAttributeValue;
@@ -46,10 +46,9 @@ import net.shibboleth.utilities.java.support.component.UninitializedComponentExc
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** {@link AndMatcher} unit test. */
- at SuppressWarnings("javadoc")
public class AndMatcherTest extends AbstractMatcherPolicyRuleTest {
- @BeforeTest public void setup() throws Exception {
+ @BeforeClass public void setup() throws Exception {
super.setUp();
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
index d355a22..4c0f458 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
@@ -29,7 +29,7 @@ import static org.testng.Assert.fail;
import java.util.Arrays;
import java.util.Set;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.IdPAttributeValue;
@@ -42,10 +42,9 @@ import net.shibboleth.utilities.java.support.component.UninitializedComponentExc
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** Test the {@link NotMatcher} matcher. */
- at SuppressWarnings("javadoc")
public class NotMatcherTest extends AbstractMatcherPolicyRuleTest {
- @BeforeTest public void setup() throws Exception {
+ @BeforeClass public void setup() throws Exception {
super.setUp();
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
index 0621ddb..6b0645a 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
@@ -31,7 +31,7 @@ import java.util.Collections;
import java.util.Set;
import java.util.function.Predicate;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import com.google.common.base.Predicates;
@@ -47,10 +47,9 @@ import net.shibboleth.utilities.java.support.component.UninitializedComponentExc
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** {@link OrMatcher} unit test. */
- at SuppressWarnings("javadoc")
public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
- @BeforeTest public void setup() throws Exception {
+ @BeforeClass public void setup() throws Exception {
super.setUp();
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java
index d341b34..e2e689b 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java
@@ -27,7 +27,7 @@ import javax.annotation.concurrent.ThreadSafe;
import javax.security.auth.Subject;
import org.opensaml.profile.context.ProfileRequestContext;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
@@ -46,7 +46,6 @@ import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
/** {@link ScriptedPolicyRule} unit test. */
@ThreadSafe
- at SuppressWarnings("javadoc")
public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
/** A script that returns null. */
@@ -70,7 +69,7 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
/** A script that returns the custom object. */
private EvaluableScript customReturnScript;
- @BeforeTest public void setup() throws Exception {
+ @BeforeClass public void setup() throws Exception {
super.setUp();
filterContext = new AttributeFilterContext();
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java
index 0406bc9..6c18b1e 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java
@@ -26,7 +26,7 @@ import java.util.Collections;
import javax.annotation.Nullable;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
@@ -37,10 +37,9 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** {@link AndPolicyRule} unit test. */
- at SuppressWarnings("javadoc")
public class AndPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
- @BeforeTest public void setup() throws Exception {
+ @BeforeClass public void setup() throws Exception {
super.setUp();
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
index 40dfcac..533d366 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
@@ -22,7 +22,7 @@ import static org.testng.Assert.assertFalse;
import static org.testng.Assert.fail;
import org.slf4j.LoggerFactory;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
@@ -35,10 +35,9 @@ import net.shibboleth.utilities.java.support.component.UninitializedComponentExc
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** Test the {@link NotPolicyRule} matcher. */
- at SuppressWarnings("javadoc")
public class NotPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
- @BeforeTest public void setup() throws Exception {
+ @BeforeClass public void setup() throws Exception {
super.setUp();
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java
index 865123a..a4d8cf6 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java
@@ -26,7 +26,7 @@ import java.util.Collections;
import javax.annotation.Nullable;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
@@ -37,10 +37,9 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** {@link OrPolicyRule} unit test. */
- at SuppressWarnings("javadoc")
public class OrPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
- @BeforeTest public void setup() throws Exception {
+ @BeforeClass public void setup() throws Exception {
super.setUp();
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java
index 3b23bbe..e746443 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java
@@ -29,7 +29,7 @@ import javax.sql.DataSource;
import org.opensaml.core.OpenSAMLInitBaseTestCase;
import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.DurablePairwiseIdStore;
@@ -48,7 +48,6 @@ import net.shibboleth.utilities.java.support.component.ComponentSupport;
/**
* Test for {@link PairwiseIdDataConnector} with JDBC store.
*/
- at SuppressWarnings("javadoc")
public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
private static final String INIT_FILE = "/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIdStore.sql";
@@ -57,7 +56,7 @@ public class StoredIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
private DataSource testSource;
- @BeforeTest public void setupSource() throws SQLException, IOException {
+ @BeforeClass public void setupSource() throws SQLException, IOException {
testSource = DatabaseTestingSupport.GetMockDataSource(INIT_FILE, "StoredIDDataConnectorStore");
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
index 05e0b58..ed10682 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
@@ -34,8 +34,8 @@ import javax.annotation.Nonnull;
import org.ldaptive.ConnectionFactory;
import org.ldaptive.DefaultConnectionFactory;
import org.ldaptive.SearchExecutor;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import com.unboundid.ldap.listener.InMemoryDirectoryServer;
@@ -67,7 +67,6 @@ import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
/**
* Tests for {@link LDAPDataConnector}
*/
- at SuppressWarnings("javadoc")
public class LDAPDataConnectorTest {
/** The connector name. */
@@ -87,7 +86,7 @@ public class LDAPDataConnectorTest {
*
* @throws LDAPException if the in-memory directory server cannot be created
*/
- @BeforeTest public void setupDirectoryServer() throws LDAPException {
+ @BeforeClass public void setupDirectoryServer() throws LDAPException {
final InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=shibboleth,dc=net");
config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("default", 10389));
@@ -102,7 +101,7 @@ public class LDAPDataConnectorTest {
/**
* Shutdown the in-memory directory server.
*/
- @AfterTest public void teardownDirectoryServer() {
+ @AfterClass public void teardownDirectoryServer() {
directoryServer.shutDown(true);
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
index 79431ec..9c02030 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
@@ -26,8 +26,8 @@ import java.util.Map;
import org.ldaptive.ConnectionFactory;
import org.ldaptive.DefaultConnectionFactory;
import org.ldaptive.SearchExecutor;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import com.unboundid.ldap.listener.InMemoryDirectoryServer;
@@ -50,7 +50,6 @@ import net.shibboleth.idp.attribute.resolver.dc.ldap.StringAttributeValueMapping
import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
- at SuppressWarnings("javadoc")
public class Regressions {
/** The connector name. */
@@ -72,7 +71,7 @@ public class Regressions {
*
* @throws LDAPException if the in-memory directory server cannot be created
*/
- @BeforeTest public void setupDirectoryServer() throws LDAPException {
+ @BeforeClass public void setupDirectoryServer() throws LDAPException {
final InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=shibboleth,dc=net");
config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("default", 10390));
@@ -87,7 +86,7 @@ public class Regressions {
/**
* Shutdown the in-memory directory server.
*/
- @AfterTest public void teardownDirectoryServer() {
+ @AfterClass public void teardownDirectoryServer() {
directoryServer.shutDown(true);
}
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
index 3345498..e3de5bb 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
@@ -34,7 +34,7 @@ import javax.annotation.Nonnull;
import javax.sql.DataSource;
import org.hsqldb.jdbc.JDBCDataSource;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.EmptyAttributeValue;
@@ -60,7 +60,6 @@ import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
/**
* Tests for {@link RDBMSDataConnector}
*/
- at SuppressWarnings("javadoc")
public class RDBMSDataConnectorTest {
/** The connector name. */
@@ -82,8 +81,7 @@ public class RDBMSDataConnectorTest {
* @throws ClassNotFoundException if the database driver cannot be found
* @throws SQLException if the database cannot be initialized
*/
- @BeforeTest public void setupDatabaseServer() throws ClassNotFoundException, SQLException {
-
+ @BeforeClass public void setupDatabaseServer() throws ClassNotFoundException, SQLException {
datasource = DatabaseTestingSupport.GetMockDataSource(INIT_FILE, "RDBMSDataConnectorStore");
DatabaseTestingSupport.InitializeDataSourceFromFile(DATA_FILE, datasource);
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
index 58f89a3..415b212 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
@@ -42,8 +42,8 @@ import org.springframework.context.support.ConversionServiceFactoryBean;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import com.unboundid.ldap.listener.InMemoryDirectoryServer;
@@ -71,7 +71,6 @@ import net.shibboleth.utilities.java.support.service.ServiceException;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/** A work in progress to test the attribute resolver service. */
- at SuppressWarnings("javadoc")
public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
/** Class logger. */
@@ -106,10 +105,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
pendingTeardownContext = context;
}
- @BeforeTest public void setupDataConnectors() throws LDAPException {
-
- System.setProperty("org.ldaptive.provider", "org.ldaptive.provider.unboundid.UnboundIDProvider");
-
+ @BeforeClass public void setupDataConnectors() throws LDAPException {
// LDAP
final InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=shibboleth,dc=net");
config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("default", 10391));
@@ -127,10 +123,8 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
/**
* Shutdown the in-memory directory server.
*/
- @AfterTest public void teardownDataConnectors() {
+ @AfterClass public void teardownDataConnectors() {
directoryServer.shutDown(true);
-
- System.clearProperty("org.ldaptive.provider");
}
private ReloadableService<AttributeResolver> getResolver(final String file) {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
index 045d19d..0007cd4 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
@@ -17,11 +17,7 @@
package net.shibboleth.idp.attribute.resolver.spring.dc.ldap;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.*;
import java.io.IOException;
import java.security.GeneralSecurityException;
@@ -51,8 +47,8 @@ import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.core.io.support.ResourcePropertySource;
import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import com.google.common.cache.Cache;
@@ -80,7 +76,6 @@ import net.shibboleth.idp.saml.impl.TestSources;
/** Test for {@link LDAPDataConnectorParser}. */
- at SuppressWarnings("javadoc")
public class LDAPDataConnectorParserTest {
/** In-memory directory server. */
@@ -107,7 +102,7 @@ public class LDAPDataConnectorParserTest {
* @throws LDAPException if the in-memory directory server cannot be created
* @throws GeneralSecurityException if the startTLS keystore or truststore cannot be loaded
*/
- @BeforeTest public void setupDirectoryServer() throws LDAPException, GeneralSecurityException {
+ @BeforeClass public void setupDirectoryServer() throws LDAPException, GeneralSecurityException {
final InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=shibboleth,dc=net");
final SSLUtil sslUtil =
new SSLUtil(new KeyStoreKeyManager(
@@ -127,7 +122,7 @@ public class LDAPDataConnectorParserTest {
/**
* Shutdown the in-memory directory server.
*/
- @AfterTest public void teardownDirectoryServer() {
+ @AfterClass public void teardownDirectoryServer() {
directoryServer.shutDown(true);
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java
index 452d071..381a379 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java
@@ -42,7 +42,7 @@ import org.springframework.core.io.ResourceLoader;
import org.springframework.core.io.support.ResourcePropertySource;
import org.testng.AssertJUnit;
import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import com.google.common.cache.Cache;
@@ -60,7 +60,6 @@ import net.shibboleth.idp.attribute.resolver.spring.dc.rdbms.impl.RDBMSDataConne
import net.shibboleth.idp.testing.DatabaseTestingSupport;
/** Test for {@link RDBMSDataConnectorParser}. */
- at SuppressWarnings("javadoc")
public class RDBMSDataConnectorParserTest {
public static final String INIT_FILE = "/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsStore.sql";
@@ -90,7 +89,7 @@ public class RDBMSDataConnectorParserTest {
* @throws ClassNotFoundException if the database driver cannot be found
* @throws SQLException if the database cannot be initialized
*/
- @BeforeTest public void setupDatabaseServer() throws ClassNotFoundException, SQLException {
+ @BeforeClass public void setupDatabaseServer() throws ClassNotFoundException, SQLException {
datasource = DatabaseTestingSupport.GetMockDataSource(INIT_FILE, "RDBMSDataConnectorStore");
DatabaseTestingSupport.InitializeDataSourceFromFile(DATA_FILE, datasource);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
index 89e970b..4f2903e 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
@@ -26,8 +26,8 @@ import java.security.GeneralSecurityException;
import javax.sql.DataSource;
import org.springframework.mock.env.MockPropertySource;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Ignore;
import org.testng.annotations.Test;
@@ -47,7 +47,7 @@ import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
@Ignore
- at SuppressWarnings({"unchecked", "javadoc"})
+ at SuppressWarnings({"unchecked"})
public class AttributeResolverFailFastTest extends AbstractFailFastTest {
protected String getPath() {
@@ -57,12 +57,10 @@ public class AttributeResolverFailFastTest extends AbstractFailFastTest {
private InMemoryDirectoryServer directoryServer;
private DataSource datasource;
- @BeforeTest(enabled = false) public void setupDirectoryServer() throws LDAPException, GeneralSecurityException {
+ @BeforeClass(enabled = false) public void setupDirectoryServer() throws LDAPException, GeneralSecurityException {
//
// LDAP
//
- System.setProperty("org.ldaptive.provider", "org.ldaptive.provider.unboundid.UnboundIDProvider");
-
final InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=shibboleth,dc=net");
final SSLUtil sslUtil =
new SSLUtil(new KeyStoreKeyManager(
@@ -86,11 +84,10 @@ public class AttributeResolverFailFastTest extends AbstractFailFastTest {
}
- @AfterTest public void teardownDirectoryServer() {
+ @AfterClass public void teardownDirectoryServer() {
if (directoryServer != null) {
directoryServer.shutDown(true);
}
- System.clearProperty("org.ldaptive.provider");
}
public void workingAttributeResolver(final String file, final MockPropertySource props) throws IOException {
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/ExactPrincipalEvalPredicateFactoryTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/ExactPrincipalEvalPredicateFactoryTest.java
index f1f1dca..f1ccd1e 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/ExactPrincipalEvalPredicateFactoryTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/ExactPrincipalEvalPredicateFactoryTest.java
@@ -21,10 +21,9 @@ import javax.security.auth.Subject;
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.principal.UsernamePrincipal;
-import net.shibboleth.idp.authn.principal.impl.ExactPrincipalEvalPredicateFactory;
import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/** {@link ExactPrincipalEvalPredicateFactory} unit test. */
@@ -39,7 +38,7 @@ public class ExactPrincipalEvalPredicateFactoryTest {
private UsernamePrincipal foo;
private UsernamePrincipal bar;
- @BeforeTest public void setUp() throws Exception {
+ @BeforeClass public void setUp() throws Exception {
factory = new ExactPrincipalEvalPredicateFactory();
foo = new UsernamePrincipal("foo");
bar = new UsernamePrincipal("bar");
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/InexactPrincipalEvalPredicateFactoryTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/InexactPrincipalEvalPredicateFactoryTest.java
index 3328508..fbed49c 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/InexactPrincipalEvalPredicateFactoryTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/InexactPrincipalEvalPredicateFactoryTest.java
@@ -21,10 +21,9 @@ import javax.security.auth.Subject;
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.principal.UsernamePrincipal;
-import net.shibboleth.idp.authn.principal.impl.InexactPrincipalEvalPredicateFactory;
import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/** {@link InexactPrincipalEvalPredicateFactory} unit test. */
@@ -40,7 +39,7 @@ public class InexactPrincipalEvalPredicateFactoryTest {
private UsernamePrincipal bar;
private UsernamePrincipal baz;
- @BeforeTest public void setUp() throws Exception {
+ @BeforeClass public void setUp() throws Exception {
// Note that foo matches bar and bar2, but not itself.
// This would be a fit for the SAML "better" operator.
factory = new InexactPrincipalEvalPredicateFactory();
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/EncodingTicketServiceTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/EncodingTicketServiceTest.java
index f55dbe1..0e076c9 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/EncodingTicketServiceTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/EncodingTicketServiceTest.java
@@ -36,7 +36,7 @@ import net.shibboleth.utilities.java.support.security.impl.RandomIdentifierGener
import org.apache.commons.codec.binary.Base32;
import org.opensaml.storage.impl.MemoryStorageService;
import org.springframework.core.io.ClassPathResource;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
@@ -65,7 +65,7 @@ public class EncodingTicketServiceTest {
}
}
- @BeforeTest
+ @BeforeClass
public void setUp() throws Exception {
final BasicKeystoreKeyStrategy strategy = new BasicKeystoreKeyStrategy();
strategy.setKeystoreResource(ResourceHelper.of(new ClassPathResource("credentials/sealer.jks")));
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/SimpleTicketServiceTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/SimpleTicketServiceTest.java
index d41c5e5..47bc187 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/SimpleTicketServiceTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/ticket/impl/SimpleTicketServiceTest.java
@@ -23,7 +23,7 @@ import net.shibboleth.idp.cas.ticket.ServiceTicket;
import net.shibboleth.idp.cas.ticket.TicketIdentifierGenerationStrategy;
import net.shibboleth.idp.cas.ticket.TicketState;
import org.opensaml.storage.impl.MemoryStorageService;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
@@ -44,7 +44,7 @@ public class SimpleTicketServiceTest {
private SimpleTicketService ticketService;
- @BeforeTest
+ @BeforeClass
public void setUp() throws Exception {
final MemoryStorageService ss = new MemoryStorageService();
ss.setId("shibboleth.StorageService");
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
index 0d29516..26a38c4 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
@@ -77,10 +77,8 @@ import org.springframework.webflow.expression.spel.WebFlowSpringELExpressionPars
import org.springframework.webflow.test.MockExternalContext;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
import com.google.common.net.HttpHeaders;
import com.unboundid.ldap.sdk.LDAPException;
@@ -222,8 +220,10 @@ public abstract class AbstractFlowTest extends AbstractTestNGSpringContextTests
/**
* Initialize XMLObject support classes.
+ * @throws IOException
+ * @throws LDAPException
*/
- @BeforeClass public void initializeXMLObjectSupport() {
+ @BeforeClass public void initializeXMLObjectSupport() throws LDAPException, IOException {
parserPool = XMLObjectProviderRegistrySupport.getParserPool();
builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
marshallerFactory = XMLObjectProviderRegistrySupport.getMarshallerFactory();
@@ -236,7 +236,8 @@ public abstract class AbstractFlowTest extends AbstractTestNGSpringContextTests
* @throws LDAPException if the in-memory directory server cannot be created
* @throws IOException if the LDIF resource cannot be imported
*/
- @BeforeTest public void setupDirectoryServer() throws LDAPException, IOException {
+ @BeforeMethod
+ public void setupDirectoryServer() throws LDAPException, IOException {
directoryServer =
new InMemoryDirectory(new ClassPathResource(LDIF_FILE), 10389, new ClassPathResource(KEYSTORE_FILE));
directoryServer.start();
@@ -247,7 +248,7 @@ public abstract class AbstractFlowTest extends AbstractTestNGSpringContextTests
*
* Always run this method to avoid starting the server multiple times when tests fail.
*/
- @AfterTest(alwaysRun = true) public void teardownDirectoryServer() {
+ @AfterMethod(alwaysRun = true) public void teardownDirectoryServer() {
if (directoryServer != null) {
directoryServer.stop();
}
diff --git a/idp-profile-api/src/test/java/net/shibboleth/idp/profile/ScriptedActionTest.java b/idp-profile-api/src/test/java/net/shibboleth/idp/profile/ScriptedActionTest.java
index c075c27..16b87e1 100644
--- a/idp-profile-api/src/test/java/net/shibboleth/idp/profile/ScriptedActionTest.java
+++ b/idp-profile-api/src/test/java/net/shibboleth/idp/profile/ScriptedActionTest.java
@@ -25,7 +25,7 @@ import org.opensaml.profile.action.EventIds;
import org.springframework.webflow.execution.Event;
import org.springframework.webflow.execution.RequestContext;
import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
/** Unit test for {@link ScriptedAction}. */
@@ -33,7 +33,7 @@ public class ScriptedActionTest {
private RequestContext rc;
- @BeforeTest
+ @BeforeMethod
public void setUp() throws ComponentInitializationException {
rc = new RequestContextBuilder().buildRequestContext();
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list