[java-identity-provider] 02/10: idp-attribute-filter-spring: Use static imports for all the asserts in the tests
Rod Widdowson
rdw at steadingsoftware.com
Thu Apr 11 08:59:54 EDT 2019
This is an automated email from the git hooks/post-receive script.
rdw 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=b51cc72c7f30acffba795394a90a6cf08e98b082
commit b51cc72c7f30acffba795394a90a6cf08e98b082
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Apr 9 16:45:37 2019 +0100
idp-attribute-filter-spring: Use static imports for all the asserts in the tests
---
.../filter/spring/AttributeFilterServiceTest.java | 87 +++++++++++-----------
.../spring/BaseAttributeFilterParserTest.java | 17 +++--
.../idp/attribute/filter/spring/basic/AndTest.java | 27 +++----
.../idp/attribute/filter/spring/basic/AnyTest.java | 11 +--
.../attribute/filter/spring/basic/Implicit.java | 9 ++-
.../idp/attribute/filter/spring/basic/NotTest.java | 11 +--
.../idp/attribute/filter/spring/basic/OrTest.java | 27 +++----
.../filter/spring/basic/ScriptedTest.java | 25 ++++---
.../matcher/AttributeRegexMatcherParserTest.java | 9 ++-
.../matcher/AttributeScopeMatcherParserTest.java | 12 +--
.../AttributeScopeRegexMatcherParserTest.java | 9 ++-
.../matcher/AttributeValueMatcherParserTest.java | 38 +++++-----
.../policy/AttributeIssuerRegexRuleParserTest.java | 9 ++-
.../policy/AttributeIssuerRuleParserTest.java | 18 +++--
.../AttributeRequesterRegexRuleParserTest.java | 9 ++-
.../policy/AttributeRequesterRuleParserTest.java | 25 ++++---
.../policy/NumOfAttributeValuesRuleParserTest.java | 13 ++--
.../spring/policy/PredicateRuleParserTest.java | 34 +++++----
.../policy/PrincipalNameRegexRuleParserTest.java | 9 ++-
.../spring/policy/PrincipalNameRuleParserTest.java | 9 ++-
.../ProxiedRequesterRegexRuleParserTest.java | 11 +--
.../policy/ProxiedRequesterRuleParserTest.java | 31 ++++----
.../saml/AttributeInMetadataRuleParserTest.java | 23 +++---
...equesterEntityAttributeExactRuleParserTest.java | 7 +-
...equesterEntityAttributeRegexRuleParserTest.java | 7 +-
...ributeRequesterInEntityGroupRuleParserTest.java | 5 +-
...tributeRequesterNameIdFormatRuleParserTest.java | 9 ++-
.../MappedAttributeInMetadataRuleParserTest.java | 23 +++---
.../saml/RegistrationAuthorityRuleParserTest.java | 26 ++++---
29 files changed, 297 insertions(+), 253 deletions(-)
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
index 9249d95..f4f289c 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
@@ -17,11 +17,22 @@
package net.shibboleth.idp.attribute.filter.spring;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
import net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor;
import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -33,14 +44,6 @@ import net.shibboleth.idp.attribute.filter.spring.impl.AttributeFilterServiceStr
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.service.ServiceException;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
/** Test the attribute resolver service. */
public class AttributeFilterServiceTest {
@@ -129,20 +132,20 @@ public class AttributeFilterServiceTest {
Map<String, IdPAttribute> filteredAttributes = filterContext.getFilteredIdPAttributes();
- Assert.assertEquals(1, filteredAttributes.size());
+ assertEquals(1, filteredAttributes.size());
- Assert.assertNull(filteredAttributes.get("firstName"));
+ assertNull(filteredAttributes.get("firstName"));
- Assert.assertNull(filteredAttributes.get("lastName"));
+ assertNull(filteredAttributes.get("lastName"));
- Assert.assertNull(filteredAttributes.get("email"));
+ assertNull(filteredAttributes.get("email"));
- Assert.assertEquals(2, filteredAttributes.get("affiliation").getValues().size(), 2);
+ assertEquals(2, filteredAttributes.get("affiliation").getValues().size(), 2);
- Assert.assertTrue(filteredAttributes.get("affiliation").getValues()
+ assertTrue(filteredAttributes.get("affiliation").getValues()
.contains(new StringAttributeValue("employee")));
- Assert.assertTrue(filteredAttributes.get("affiliation").getValues().contains(new StringAttributeValue("staff")));
+ assertTrue(filteredAttributes.get("affiliation").getValues().contains(new StringAttributeValue("staff")));
}
@@ -162,21 +165,21 @@ public class AttributeFilterServiceTest {
Map<String, IdPAttribute> filteredAttributes = filterContext.getFilteredIdPAttributes();
- Assert.assertEquals(filteredAttributes.size(), 1);
+ assertEquals(filteredAttributes.size(), 1);
- Assert.assertNull(filteredAttributes.get("firstName"));
+ assertNull(filteredAttributes.get("firstName"));
- Assert.assertNull(filteredAttributes.get("lastName"));
+ assertNull(filteredAttributes.get("lastName"));
- Assert.assertEquals(filteredAttributes.get("email").getValues().size(), 2);
+ assertEquals(filteredAttributes.get("email").getValues().size(), 2);
- Assert.assertTrue(filteredAttributes.get("email").getValues()
+ assertTrue(filteredAttributes.get("email").getValues()
.contains(new StringAttributeValue("jsmith at example.edu")));
- Assert.assertTrue(filteredAttributes.get("email").getValues()
+ assertTrue(filteredAttributes.get("email").getValues()
.contains(new StringAttributeValue("john.smith at example.edu")));
- Assert.assertNull(filteredAttributes.get("affiliation"));
+ assertNull(filteredAttributes.get("affiliation"));
}
@Test public void testPolicy4() throws ServiceException, AttributeFilterException, ComponentInitializationException {
@@ -200,21 +203,21 @@ public class AttributeFilterServiceTest {
Map<String, IdPAttribute> filteredAttributes = filterContext.getFilteredIdPAttributes();
- Assert.assertEquals(filteredAttributes.size(), 1);
+ assertEquals(filteredAttributes.size(), 1);
- Assert.assertNull(filteredAttributes.get("firstName"));
+ assertNull(filteredAttributes.get("firstName"));
- Assert.assertNull(filteredAttributes.get("lastName"));
+ assertNull(filteredAttributes.get("lastName"));
- Assert.assertEquals(filteredAttributes.get("email").getValues().size(), 2);
+ assertEquals(filteredAttributes.get("email").getValues().size(), 2);
- Assert.assertTrue(filteredAttributes.get("email").getValues()
+ assertTrue(filteredAttributes.get("email").getValues()
.contains(new StringAttributeValue("jsmith at example.edu")));
- Assert.assertTrue(filteredAttributes.get("email").getValues()
+ assertTrue(filteredAttributes.get("email").getValues()
.contains(new StringAttributeValue("john.smith at example.edu")));
- Assert.assertNull(filteredAttributes.get("affiliation"));
+ assertNull(filteredAttributes.get("affiliation"));
}
private void common45(String file, boolean nativeSpring) throws ServiceException, AttributeFilterException,
@@ -229,20 +232,20 @@ public class AttributeFilterServiceTest {
Map<String, IdPAttribute> filteredAttributes = filterContext.getFilteredIdPAttributes();
- Assert.assertEquals(1, filteredAttributes.size());
+ assertEquals(1, filteredAttributes.size());
- Assert.assertNull(filteredAttributes.get("firstName"));
+ assertNull(filteredAttributes.get("firstName"));
- Assert.assertNull(filteredAttributes.get("lastName"));
+ assertNull(filteredAttributes.get("lastName"));
- Assert.assertNull(filteredAttributes.get("email"));
+ assertNull(filteredAttributes.get("email"));
- Assert.assertEquals(2, filteredAttributes.get("affiliation").getValues().size(), 2);
+ assertEquals(2, filteredAttributes.get("affiliation").getValues().size(), 2);
- Assert.assertTrue(filteredAttributes.get("affiliation").getValues()
+ assertTrue(filteredAttributes.get("affiliation").getValues()
.contains(new StringAttributeValue("employee")));
- Assert.assertTrue(filteredAttributes.get("affiliation").getValues().contains(new StringAttributeValue("staff")));
+ assertTrue(filteredAttributes.get("affiliation").getValues().contains(new StringAttributeValue("staff")));
}
@@ -267,17 +270,17 @@ public class AttributeFilterServiceTest {
Map<String, IdPAttribute> filteredAttributes = filterContext.getFilteredIdPAttributes();
- Assert.assertEquals(1, filteredAttributes.size());
+ assertEquals(1, filteredAttributes.size());
- Assert.assertNull(filteredAttributes.get("firstName"));
+ assertNull(filteredAttributes.get("firstName"));
- Assert.assertNull(filteredAttributes.get("lastName"));
+ assertNull(filteredAttributes.get("lastName"));
- Assert.assertNull(filteredAttributes.get("email"));
+ assertNull(filteredAttributes.get("email"));
- Assert.assertEquals(2, filteredAttributes.get("affiliation").getValues().size(), 1);
+ assertEquals(2, filteredAttributes.get("affiliation").getValues().size(), 1);
- Assert.assertTrue(filteredAttributes.get("affiliation").getValues()
+ assertTrue(filteredAttributes.get("affiliation").getValues()
.contains(new StringAttributeValue("employee")));
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
index efd9406..e779563 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
@@ -17,9 +17,16 @@
package net.shibboleth.idp.attribute.filter.spring;
+import static org.testng.Assert.assertEquals;
+
import java.util.Collection;
import java.util.Map;
+import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.saml.ext.saml2mdattr.EntityAttributes;
+import org.springframework.context.support.GenericApplicationContext;
+import org.testng.annotations.AfterMethod;
+
import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -34,12 +41,6 @@ import net.shibboleth.idp.attribute.resolver.dc.impl.SAMLAttributeDataConnector;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import org.opensaml.core.xml.XMLObjectBaseTestCase;
-import org.opensaml.saml.ext.saml2mdattr.EntityAttributes;
-import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-
/**
* Basis of all the matcher and rule parser tests.
*/
@@ -92,7 +93,7 @@ public class BaseAttributeFilterParserTest extends XMLObjectBaseTestCase {
protected <Type> Type getBean(Class<Type> claz, GenericApplicationContext context) {
Collection<Type> beans = context.getBeansOfType(claz).values();
- Assert.assertEquals(beans.size(), 1);
+ assertEquals(beans.size(), 1);
return beans.iterator().next();
}
@@ -137,4 +138,4 @@ public class BaseAttributeFilterParserTest extends XMLObjectBaseTestCase {
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AndTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AndTest.java
index 5bfd8ae..dac90d1 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AndTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AndTest.java
@@ -17,8 +17,12 @@
package net.shibboleth.idp.attribute.filter.spring.basic;
+import static org.testng.Assert.assertEquals;
+
import java.util.List;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
import net.shibboleth.idp.attribute.filter.matcher.logic.impl.AndMatcher;
@@ -29,9 +33,6 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.filter.spring.basic.impl.AndMatcherParser;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link AndMatcherParser}.
*/
@@ -41,18 +42,18 @@ public class AndTest extends BaseAttributeFilterParserTest {
AndMatcher what = (AndMatcher) getMatcher("and.xml");
final List<Matcher> children = what.getComposedMatchers();
- Assert.assertEquals(children.size(), 2);
- Assert.assertEquals(children.get(0).getClass(), NotMatcher.class);
- Assert.assertEquals(children.get(1).getClass(), Matcher.MATCHES_ALL.getClass());
+ assertEquals(children.size(), 2);
+ assertEquals(children.get(0).getClass(), NotMatcher.class);
+ assertEquals(children.get(1).getClass(), Matcher.MATCHES_ALL.getClass());
}
@Test public void policy() throws ComponentInitializationException {
AndPolicyRule what = (AndPolicyRule) getPolicyRule("and.xml");
final List<PolicyRequirementRule> children = what.getComposedRules();
- Assert.assertEquals(children.size(), 2);
- Assert.assertEquals(children.get(0).getClass(), NotPolicyRule.class);
- Assert.assertEquals(children.get(1).getClass(), PolicyRequirementRule.MATCHES_ALL.getClass());
+ assertEquals(children.size(), 2);
+ assertEquals(children.get(0).getClass(), NotPolicyRule.class);
+ assertEquals(children.get(1).getClass(), PolicyRequirementRule.MATCHES_ALL.getClass());
}
@Test public void matcherSingleton() throws ComponentInitializationException {
@@ -60,16 +61,16 @@ public class AndTest extends BaseAttributeFilterParserTest {
final List<Matcher> children = what.getComposedMatchers();
- Assert.assertEquals(children.size(), 1);
- Assert.assertEquals(children.get(0).getClass(), Matcher.MATCHES_ALL.getClass());
+ assertEquals(children.size(), 1);
+ assertEquals(children.get(0).getClass(), Matcher.MATCHES_ALL.getClass());
}
@Test public void policySingleton() throws ComponentInitializationException {
AndPolicyRule what = (AndPolicyRule) getPolicyRule("andSingleton.xml");
final List<PolicyRequirementRule> children = what.getComposedRules();
- Assert.assertEquals(children.size(), 1);
- Assert.assertEquals(children.get(0).getClass(), NotPolicyRule.class);
+ assertEquals(children.size(), 1);
+ assertEquals(children.get(0).getClass(), NotPolicyRule.class);
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyTest.java
index 2a267e1..41de442 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyTest.java
@@ -17,14 +17,15 @@
package net.shibboleth.idp.attribute.filter.spring.basic;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Test for ANY matcher or policy Rule.
*/
@@ -33,12 +34,12 @@ public class AnyTest extends BaseAttributeFilterParserTest {
@Test public void testMatcher() throws ComponentInitializationException {
Matcher matcher = getMatcher("any.xml");
- Assert.assertEquals(Matcher.MATCHES_ALL.getClass(), matcher.getClass());
+ assertEquals(Matcher.MATCHES_ALL.getClass(), matcher.getClass());
}
@Test public void testPolicy() throws ComponentInitializationException {
PolicyRequirementRule policy = getPolicyRule("any.xml");
- Assert.assertEquals(PolicyRequirementRule.MATCHES_ALL.getClass(), policy.getClass());
+ assertEquals(PolicyRequirementRule.MATCHES_ALL.getClass(), policy.getClass());
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/Implicit.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/Implicit.java
index 6570874..613630b 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/Implicit.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/Implicit.java
@@ -17,13 +17,14 @@
package net.shibboleth.idp.attribute.filter.spring.basic;
+import static org.testng.Assert.assertSame;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for an implicit rule.
*/
@@ -32,7 +33,7 @@ public class Implicit extends BaseAttributeFilterParserTest {
@Test public void implicit() throws ComponentInitializationException {
Matcher what = getMatcher("implicit.xml");
- Assert.assertSame(what.getClass(), Matcher.MATCHES_ALL.getClass());
+ assertSame(what.getClass(), Matcher.MATCHES_ALL.getClass());
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/NotTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/NotTest.java
index 70570e5..8292f4b 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/NotTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/NotTest.java
@@ -17,6 +17,10 @@
package net.shibboleth.idp.attribute.filter.spring.basic;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
import net.shibboleth.idp.attribute.filter.matcher.logic.impl.NotMatcher;
@@ -25,9 +29,6 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.filter.spring.basic.impl.NotMatcherParser;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link NotMatcherParser}.
*/
@@ -38,7 +39,7 @@ public class NotTest extends BaseAttributeFilterParserTest {
NotMatcher child = (NotMatcher) what.getNegatedMatcher();
- Assert.assertEquals(child.getNegatedMatcher().getClass(), Matcher.MATCHES_ALL.getClass());
+ assertEquals(child.getNegatedMatcher().getClass(), Matcher.MATCHES_ALL.getClass());
}
@Test public void policy() throws ComponentInitializationException {
@@ -46,6 +47,6 @@ public class NotTest extends BaseAttributeFilterParserTest {
NotPolicyRule child = (NotPolicyRule) what.getNegatedRule();
- Assert.assertEquals(child.getNegatedRule().getClass(), PolicyRequirementRule.MATCHES_ALL.getClass());
+ assertEquals(child.getNegatedRule().getClass(), PolicyRequirementRule.MATCHES_ALL.getClass());
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/OrTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/OrTest.java
index e3d4d66..e6615ff 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/OrTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/OrTest.java
@@ -17,8 +17,12 @@
package net.shibboleth.idp.attribute.filter.spring.basic;
+import static org.testng.Assert.assertEquals;
+
import java.util.List;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
import net.shibboleth.idp.attribute.filter.matcher.logic.impl.NotMatcher;
@@ -29,9 +33,6 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.filter.spring.basic.impl.OrMatcherParser;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link OrMatcherParser}.
*/
@@ -42,18 +43,18 @@ public class OrTest extends BaseAttributeFilterParserTest {
final List<Matcher> children = what.getComposedMatchers();
- Assert.assertEquals(children.size(), 2);
- Assert.assertEquals(children.get(0).getClass(), NotMatcher.class);
- Assert.assertEquals(children.get(1).getClass(), Matcher.MATCHES_ALL.getClass());
+ assertEquals(children.size(), 2);
+ assertEquals(children.get(0).getClass(), NotMatcher.class);
+ assertEquals(children.get(1).getClass(), Matcher.MATCHES_ALL.getClass());
}
@Test public void policy() throws ComponentInitializationException {
OrPolicyRule what = (OrPolicyRule) getPolicyRule("or.xml");
final List<PolicyRequirementRule> children = what.getComposedRules();
- Assert.assertEquals(children.size(), 2);
- Assert.assertEquals(children.get(0).getClass(), NotPolicyRule.class);
- Assert.assertEquals(children.get(1).getClass(), PolicyRequirementRule.MATCHES_ALL.getClass());
+ assertEquals(children.size(), 2);
+ assertEquals(children.get(0).getClass(), NotPolicyRule.class);
+ assertEquals(children.get(1).getClass(), PolicyRequirementRule.MATCHES_ALL.getClass());
}
@Test public void matcherSingleton() throws ComponentInitializationException {
@@ -61,16 +62,16 @@ public class OrTest extends BaseAttributeFilterParserTest {
final List<Matcher> children = what.getComposedMatchers();
- Assert.assertEquals(children.size(), 1);
- Assert.assertEquals(children.get(0).getClass(), NotMatcher.class);
+ assertEquals(children.size(), 1);
+ assertEquals(children.get(0).getClass(), NotMatcher.class);
}
@Test public void policySingleton() throws ComponentInitializationException {
OrPolicyRule what = (OrPolicyRule) getPolicyRule("orSingleton.xml");
final List<PolicyRequirementRule> children = what.getComposedRules();
- Assert.assertEquals(children.size(), 1);
- Assert.assertEquals(children.get(0).getClass(), PolicyRequirementRule.MATCHES_ALL.getClass());
+ assertEquals(children.size(), 1);
+ assertEquals(children.get(0).getClass(), PolicyRequirementRule.MATCHES_ALL.getClass());
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
index 3590bcc..1782999 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
@@ -17,9 +17,17 @@
package net.shibboleth.idp.attribute.filter.spring.basic;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
import java.util.Map;
import java.util.Set;
+import org.springframework.beans.factory.BeanCreationException;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
@@ -31,11 +39,6 @@ import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.testing.TestSupport;
-import org.springframework.beans.factory.BeanCreationException;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
/** test for parsing scripted matchers and scripted parsers.
*
*/
@@ -60,7 +63,7 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUid.values());
- Assert.assertEquals(rule.matches(filterContext), Tristate.FALSE);
+ assertEquals(rule.matches(filterContext), Tristate.FALSE);
}
@Test(expectedExceptions={BeanCreationException.class,}) public void policyNotFound() throws ComponentInitializationException {
@@ -74,9 +77,9 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUid.values());
Set<IdPAttributeValue<?>> x = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
- Assert.assertEquals(x.size(), 1);
+ assertEquals(x.size(), 1);
String val = (String) x.iterator().next().getValue();
- Assert.assertTrue(val.equals("jsmith") || val.equals("daffyDuck"));
+ assertTrue(val.equals("jsmith") || val.equals("daffyDuck"));
}
@@ -84,7 +87,7 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
final ScriptedMatcher what = (ScriptedMatcher) getMatcher(getScript());
- Assert.assertNull(what.getCustomObject());
+ assertNull(what.getCustomObject());
}
@@ -94,8 +97,8 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
final Map custom = (Map) what.getCustomObject();
- Assert.assertEquals(custom.size(), 1);
- Assert.assertEquals(custom.get("bar"), "foo");
+ assertEquals(custom.size(), 1);
+ assertEquals(custom.get("bar"), "foo");
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeRegexMatcherParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeRegexMatcherParserTest.java
index 122e2bf..6174edf 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeRegexMatcherParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeRegexMatcherParserTest.java
@@ -17,14 +17,15 @@
package net.shibboleth.idp.attribute.filter.spring.matcher;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueRegexpMatcher;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.filter.spring.matcher.impl.AttributeValueRegexMatcherParser;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link AttributeValueRegexMatcherParser}.
*/
@@ -33,7 +34,7 @@ public class AttributeRegexMatcherParserTest extends BaseAttributeFilterParserTe
@Test public void matcher() throws ComponentInitializationException {
AttributeValueRegexpMatcher what = (AttributeValueRegexpMatcher) getMatcher("attributeRegex.xml");
- Assert.assertEquals(what.getRegularExpression(), "^jsmit.*$");
+ assertEquals(what.getRegularExpression(), "^jsmit.*$");
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeScopeMatcherParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeScopeMatcherParserTest.java
index 1eac4bf..4428b04 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeScopeMatcherParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeScopeMatcherParserTest.java
@@ -17,14 +17,16 @@
package net.shibboleth.idp.attribute.filter.spring.matcher;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.matcher.impl.AttributeScopeStringMatcher;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.filter.spring.matcher.impl.AttributeScopeMatcherParser;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link AttributeScopeMatcherParser}.
*/
@@ -33,8 +35,8 @@ public class AttributeScopeMatcherParserTest extends BaseAttributeFilterParserTe
@Test public void matcher() throws ComponentInitializationException {
AttributeScopeStringMatcher what = (AttributeScopeStringMatcher) getMatcher("attributeScope.xml");
- Assert.assertEquals(what.getMatchString(), "jSmItH");
- Assert.assertFalse(what.isIgnoreCase());
+ assertEquals(what.getMatchString(), "jSmItH");
+ assertFalse(what.isIgnoreCase());
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeScopeRegexMatcherParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeScopeRegexMatcherParserTest.java
index 1eadba9..8093667 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeScopeRegexMatcherParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeScopeRegexMatcherParserTest.java
@@ -17,14 +17,15 @@
package net.shibboleth.idp.attribute.filter.spring.matcher;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.matcher.impl.AttributeScopeRegexpMatcher;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.filter.spring.matcher.impl.AttributeScopeRegexMatcherParser;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link AttributeScopeRegexMatcherParser}.
*/
@@ -34,7 +35,7 @@ public class AttributeScopeRegexMatcherParserTest extends BaseAttributeFilterPar
AttributeScopeRegexpMatcher what = (AttributeScopeRegexpMatcher) getMatcher("attributeScopeRegex.xml");
- Assert.assertEquals(what.getRegularExpression(), "^example^..*$");
+ assertEquals(what.getRegularExpression(), "^example^..*$");
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
index d908e44..381dc77 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
@@ -17,9 +17,15 @@
package net.shibboleth.idp.attribute.filter.spring.matcher;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.util.Map;
import java.util.Set;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.filter.Matcher;
@@ -31,10 +37,6 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
/**
* This tests not just the parsing of the rule, but also the construction of the complex tests.<br/>
* <code>
@@ -75,15 +77,15 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUid.values());
- Assert.assertEquals(rule.matches(filterContext), Tristate.FALSE);
+ assertEquals(rule.matches(filterContext), Tristate.FALSE);
filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUidJS.values());
- Assert.assertEquals(rule.matches(filterContext), Tristate.TRUE);
+ assertEquals(rule.matches(filterContext), Tristate.TRUE);
filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(uidEpaJS.values());
- Assert.assertEquals(rule.matches(filterContext), Tristate.FALSE);
+ assertEquals(rule.matches(filterContext), Tristate.FALSE);
}
@Test public void unTargetedPolicy() throws ComponentInitializationException {
@@ -91,15 +93,15 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUid.values());
- Assert.assertEquals(rule.matches(filterContext), Tristate.FALSE);
+ assertEquals(rule.matches(filterContext), Tristate.FALSE);
filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUidJS.values());
- Assert.assertEquals(rule.matches(filterContext), Tristate.TRUE);
+ assertEquals(rule.matches(filterContext), Tristate.TRUE);
filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(uidEpaJS.values());
- Assert.assertEquals(rule.matches(filterContext), Tristate.TRUE);
+ assertEquals(rule.matches(filterContext), Tristate.TRUE);
}
@Test public void unTargetedMatcher() throws ComponentInitializationException {
@@ -108,21 +110,21 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUid.values());
Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUidJS.values());
result = matcher.getMatchingValues(epaUidJS.get("uid"), filterContext);
- Assert.assertEquals(result.size(), 1);
+ assertEquals(result.size(), 1);
filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(uidEpaJS.values());
result = matcher.getMatchingValues(uidEpaJS.get("uid"), filterContext);
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
AttributeValueStringMatcher avm = (AttributeValueStringMatcher) matcher;
- Assert.assertTrue(avm.isIgnoreCase());
- Assert.assertEquals(avm.getMatchString(), "jsmith");
+ assertTrue(avm.isIgnoreCase());
+ assertEquals(avm.getMatchString(), "jsmith");
}
@Test public void targetedMatcher() throws ComponentInitializationException {
@@ -132,16 +134,16 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUid.values());
Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(epaUidJS.values());
result = matcher.getMatchingValues(epaUidJS.get("uid"), filterContext);
- Assert.assertEquals(result.size(), 2);
+ assertEquals(result.size(), 2);
filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(uidEpaJS.values());
result = matcher.getMatchingValues(uidEpaJS.get("uid"), filterContext);
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRegexRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRegexRuleParserTest.java
index 7728d51..189a5a2 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRegexRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRegexRuleParserTest.java
@@ -17,20 +17,21 @@
package net.shibboleth.idp.attribute.filter.spring.policy;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.AttributeIssuerRegexpPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
public class AttributeIssuerRegexRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void policy() throws ComponentInitializationException {
AttributeIssuerRegexpPolicyRule arRule = (AttributeIssuerRegexpPolicyRule) getPolicyRule("issuerRegex.xml");
- Assert.assertEquals(arRule.getRegularExpression(), "^urn:example:.*$");
+ assertEquals(arRule.getRegularExpression(), "^urn:example:.*$");
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRuleParserTest.java
index 5023f8c..86d3aa3 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRuleParserTest.java
@@ -17,6 +17,11 @@
package net.shibboleth.idp.attribute.filter.spring.policy;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
@@ -25,9 +30,6 @@ import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.Attribu
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
public class AttributeIssuerRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void policy() throws ComponentInitializationException {
@@ -35,13 +37,13 @@ public class AttributeIssuerRuleParserTest extends BaseAttributeFilterParserTest
AttributeFilterContext filterContext =
DataSources.populatedFilterContext("principal", "urn:example:org:idp:foo", "http://example.org");
- Assert.assertEquals(rule.matches(filterContext), Tristate.TRUE);
+ assertEquals(rule.matches(filterContext), Tristate.TRUE);
filterContext = DataSources.populatedFilterContext("principal", "issuer", "http://example.org");
- Assert.assertEquals(rule.matches(filterContext), Tristate.FALSE);
+ assertEquals(rule.matches(filterContext), Tristate.FALSE);
final AttributeIssuerPolicyRule arRule = (AttributeIssuerPolicyRule) rule;
- Assert.assertEquals(arRule.getMatchString(), "urn:example:org:idp:foo");
- Assert.assertTrue(arRule.isIgnoreCase());
+ assertEquals(arRule.getMatchString(), "urn:example:org:idp:foo");
+ assertTrue(arRule.isIgnoreCase());
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRegexRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRegexRuleParserTest.java
index cfb82d7..1cc4481 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRegexRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRegexRuleParserTest.java
@@ -17,20 +17,21 @@
package net.shibboleth.idp.attribute.filter.spring.policy;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.AttributeRequesterRegexpPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
public class AttributeRequesterRegexRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void policy() throws ComponentInitializationException {
AttributeRequesterRegexpPolicyRule arRule = (AttributeRequesterRegexpPolicyRule) getPolicyRule("attributeRegexRequester.xml");
- Assert.assertEquals(arRule.getRegularExpression(), "^urn:example:.*$");
+ assertEquals(arRule.getRegularExpression(), "^urn:example:.*$");
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
index 0d7e1fe..596a7a2 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
@@ -17,9 +17,16 @@
package net.shibboleth.idp.attribute.filter.spring.policy;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
import java.util.Map;
import java.util.Set;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.filter.Matcher;
@@ -32,10 +39,6 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
/**
* This tests not just the parsing of the rule, but also the construction of the complex tests.<br/>
* <code>
@@ -59,13 +62,13 @@ public class AttributeRequesterRuleParserTest extends BaseAttributeFilterParserT
final PolicyRequirementRule rule = getPolicyRule("attributeRequester.xml");
AttributeFilterContext filterContext = DataSources.populatedFilterContext("principal", "issuer", "http://example.org");
- Assert.assertEquals(rule.matches(filterContext), Tristate.FALSE);
+ assertEquals(rule.matches(filterContext), Tristate.FALSE);
filterContext = DataSources.populatedFilterContext("principal", "issuer", "https://service.example.edu/shibboleth-sp");
- Assert.assertEquals(rule.matches(filterContext), Tristate.TRUE);
+ assertEquals(rule.matches(filterContext), Tristate.TRUE);
final AttributeRequesterPolicyRule arRule = (AttributeRequesterPolicyRule) rule;
- Assert.assertEquals(arRule.getMatchString(), "https://service.example.edu/shibboleth-sp");
- Assert.assertFalse(arRule.isIgnoreCase());
+ assertEquals(arRule.getMatchString(), "https://service.example.edu/shibboleth-sp");
+ assertFalse(arRule.isIgnoreCase());
}
@Test public void matcher() throws ComponentInitializationException {
@@ -74,12 +77,12 @@ public class AttributeRequesterRuleParserTest extends BaseAttributeFilterParserT
AttributeFilterContext filterContext = DataSources.populatedFilterContext("principal", "issuer", "http://example.org");
filterContext.setPrefilteredIdPAttributes(epaUid.values());
Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
filterContext = DataSources.populatedFilterContext("principal", "issuer", "https://service.example.edu/shibboleth-sp");
filterContext.setPrefilteredIdPAttributes(epaUid.values());
result = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
- Assert.assertEquals(result.size(), 1);
- Assert.assertEquals(result.iterator().next().getValue(), "daffyDuck");
+ assertEquals(result.size(), 1);
+ assertEquals(result.iterator().next().getValue(), "daffyDuck");
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/NumOfAttributeValuesRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/NumOfAttributeValuesRuleParserTest.java
index 45ec083..62ed604 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/NumOfAttributeValuesRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/NumOfAttributeValuesRuleParserTest.java
@@ -17,20 +17,21 @@
package net.shibboleth.idp.attribute.filter.spring.policy;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.NumOfAttributeValuesPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
public class NumOfAttributeValuesRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void policy() throws ComponentInitializationException {
NumOfAttributeValuesPolicyRule rule = (NumOfAttributeValuesPolicyRule) getPolicyRule("numberAttrValues.xml");
- Assert.assertEquals(rule.getAttributeId(), "uid");
- Assert.assertEquals(rule.getMinimum(), 1);
- Assert.assertEquals(rule.getMaximum(), 3);
+ assertEquals(rule.getAttributeId(), "uid");
+ assertEquals(rule.getMinimum(), 1);
+ assertEquals(rule.getMaximum(), 3);
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java
index e8d5d4f..5590a91 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java
@@ -17,11 +17,21 @@
package net.shibboleth.idp.attribute.filter.spring.policy;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertSame;
+
import java.util.function.Function;
import java.util.function.Predicate;
import javax.annotation.Nullable;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.io.ClassPathResource;
+import org.testng.annotations.Test;
+
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
@@ -30,12 +40,6 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.core.io.ClassPathResource;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
public class PredicateRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void policy() throws ComponentInitializationException {
@@ -51,10 +55,10 @@ public class PredicateRuleParserTest extends BaseAttributeFilterParserTest {
final PredicatePolicyRule rule = ctx.getBean(PredicatePolicyRule.class);
- Assert.assertEquals(rule.getRulePredicate().getClass(), Foo.class);
- Assert.assertNull(rule.getProfileContextStrategy().apply(new AttributeFilterContext()));
+ assertEquals(rule.getRulePredicate().getClass(), Foo.class);
+ assertNull(rule.getProfileContextStrategy().apply(new AttributeFilterContext()));
ProfileRequestContext pc = new ProfileRequestContext<>();
- Assert.assertSame(
+ assertSame(
rule.getProfileContextStrategy().apply(
pc.getSubcontext(RelyingPartyContext.class, true).getSubcontext(AttributeFilterContext.class,
true)), pc);
@@ -73,9 +77,9 @@ public class PredicateRuleParserTest extends BaseAttributeFilterParserTest {
final PredicatePolicyRule rule = ctx.getBean(PredicatePolicyRule.class);
- Assert.assertEquals(rule.getRulePredicate().getClass(), Foo.class);
- Assert.assertNotNull(rule.getProfileContextStrategy().apply(new AttributeFilterContext()));
- Assert.assertEquals(rule.getProfileContextStrategy().getClass(), Func.class);
+ assertEquals(rule.getRulePredicate().getClass(), Foo.class);
+ assertNotNull(rule.getProfileContextStrategy().apply(new AttributeFilterContext()));
+ assertEquals(rule.getProfileContextStrategy().getClass(), Func.class);
}
private AttributeFilterContext prcFor(String sp) {
@@ -98,9 +102,9 @@ public class PredicateRuleParserTest extends BaseAttributeFilterParserTest {
ctx.refresh();
final PredicatePolicyRule rule = ctx.getBean(PredicatePolicyRule.class);
- Assert.assertEquals(rule.matches(prcFor("https://example.org")), Tristate.FALSE);
- Assert.assertEquals(rule.matches(prcFor("https://sp.example.org")), Tristate.TRUE);
- Assert.assertEquals(rule.matches(prcFor("https://sp2.example.org")), Tristate.TRUE);
+ assertEquals(rule.matches(prcFor("https://example.org")), Tristate.FALSE);
+ assertEquals(rule.matches(prcFor("https://sp.example.org")), Tristate.TRUE);
+ assertEquals(rule.matches(prcFor("https://sp2.example.org")), Tristate.TRUE);
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PrincipalNameRegexRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PrincipalNameRegexRuleParserTest.java
index 42e1869..ef9a594 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PrincipalNameRegexRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PrincipalNameRegexRuleParserTest.java
@@ -17,19 +17,20 @@
package net.shibboleth.idp.attribute.filter.spring.policy;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.PrincipalNameRegexpPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
public class PrincipalNameRegexRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void policy() throws ComponentInitializationException {
PrincipalNameRegexpPolicyRule rule = (PrincipalNameRegexpPolicyRule) getPolicyRule("principalNameRegex.xml");
- Assert.assertEquals(rule.getRegularExpression(), "^jsmit.*$");
+ assertEquals(rule.getRegularExpression(), "^jsmit.*$");
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PrincipalNameRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PrincipalNameRuleParserTest.java
index 5f13724..af19478 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PrincipalNameRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PrincipalNameRuleParserTest.java
@@ -17,18 +17,19 @@
package net.shibboleth.idp.attribute.filter.spring.policy;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.PrincipalNamePolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
public class PrincipalNameRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void policy() throws ComponentInitializationException {
PrincipalNamePolicyRule arRule = (PrincipalNamePolicyRule) getPolicyRule("principalName.xml");
- Assert.assertEquals(arRule.getMatchString(), "jsmith");
+ assertEquals(arRule.getMatchString(), "jsmith");
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRegexRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRegexRuleParserTest.java
index 4ce08e2..e1b7d91 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRegexRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRegexRuleParserTest.java
@@ -17,20 +17,21 @@
package net.shibboleth.idp.attribute.filter.spring.policy;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.ProxiedRequesterRegexpPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
public class ProxiedRequesterRegexRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void policy() throws ComponentInitializationException {
final ProxiedRequesterRegexpPolicyRule arRule = (ProxiedRequesterRegexpPolicyRule) getPolicyRule("proxiedRegexRequester.xml");
- Assert.assertEquals(arRule.getRegularExpression(), "^urn:example:.*$");
+ assertEquals(arRule.getRegularExpression(), "^urn:example:.*$");
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java
index 1c7d262..e5ff867 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java
@@ -17,10 +17,19 @@
package net.shibboleth.idp.attribute.filter.spring.policy;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
import java.util.Arrays;
import java.util.Map;
import java.util.Set;
+import org.opensaml.messaging.context.navigate.ChildContextLookup;
+import org.opensaml.profile.context.ProxiedRequesterContext;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.filter.Matcher;
@@ -33,12 +42,6 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.messaging.context.navigate.ChildContextLookup;
-import org.opensaml.profile.context.ProxiedRequesterContext;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
public class ProxiedRequesterRuleParserTest extends BaseAttributeFilterParserTest {
private Map<String, IdPAttribute> epaUid;
@@ -57,13 +60,13 @@ public class ProxiedRequesterRuleParserTest extends BaseAttributeFilterParserTes
filterContext.getSubcontext(ProxiedRequesterContext.class, true).getRequesters().addAll(Arrays.asList("foo", "bar"));
- Assert.assertEquals(rule.matches(filterContext), Tristate.FALSE);
+ assertEquals(rule.matches(filterContext), Tristate.FALSE);
filterContext.getSubcontext(ProxiedRequesterContext.class).getRequesters().add("https://service.example.edu/shibboleth-sp");
- Assert.assertEquals(rule.matches(filterContext), Tristate.TRUE);
+ assertEquals(rule.matches(filterContext), Tristate.TRUE);
final ProxiedRequesterPolicyRule arRule = (ProxiedRequesterPolicyRule) rule;
- Assert.assertEquals(arRule.getMatchString(), "https://service.example.edu/shibboleth-sp");
- Assert.assertFalse(arRule.isIgnoreCase());
+ assertEquals(arRule.getMatchString(), "https://service.example.edu/shibboleth-sp");
+ assertFalse(arRule.isIgnoreCase());
}
@Test public void matcher() throws ComponentInitializationException {
@@ -76,12 +79,12 @@ public class ProxiedRequesterRuleParserTest extends BaseAttributeFilterParserTes
filterContext.setPrefilteredIdPAttributes(epaUid.values());
Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
filterContext.getSubcontext(ProxiedRequesterContext.class).getRequesters().add("https://service.example.edu/shibboleth-sp");
result = matcher.getMatchingValues(epaUid.get("uid"), filterContext);
- Assert.assertEquals(result.size(), 1);
- Assert.assertEquals(result.iterator().next().getValue(), "daffyDuck");
+ assertEquals(result.size(), 1);
+ assertEquals(result.iterator().next().getValue(), "daffyDuck");
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java
index c9d562a..1f23f28 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java
@@ -17,6 +17,11 @@
package net.shibboleth.idp.attribute.filter.spring.saml;
+import static org.testng.Assert.assertTrue;
+
+import org.springframework.context.support.GenericApplicationContext;
+import org.testng.annotations.Test;
+
import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.idp.attribute.filter.AttributeRule;
import net.shibboleth.idp.attribute.filter.PolicyFromMatcher;
@@ -26,10 +31,6 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeInMetadataRuleParser;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link AttributeInMetadataRuleParser}.
*/
@@ -44,15 +45,15 @@ public class AttributeInMetadataRuleParserTest extends BaseAttributeFilterParse
rule.initialize();
AttributeInMetadataMatcher matcher = (AttributeInMetadataMatcher) rule.getMatcher();
- Assert.assertTrue(matcher.getMatchIfMetadataSilent());
- Assert.assertTrue(matcher.getOnlyIfRequired());
- Assert.assertTrue(matcher.getId().endsWith(":PermitRule"));
+ assertTrue(matcher.getMatchIfMetadataSilent());
+ assertTrue(matcher.getOnlyIfRequired());
+ assertTrue(matcher.getId().endsWith(":PermitRule"));
final PolicyFromMatcher policyRule = (PolicyFromMatcher) getBean(PolicyRequirementRule.class, context);
matcher = (AttributeInMetadataMatcher) policyRule.getMatcher();
- Assert.assertTrue(matcher.getMatchIfMetadataSilent());
- Assert.assertTrue(matcher.getOnlyIfRequired());
- Assert.assertTrue(matcher.getId().endsWith(":PRR"));
+ assertTrue(matcher.getMatchIfMetadataSilent());
+ assertTrue(matcher.getOnlyIfRequired());
+ assertTrue(matcher.getId().endsWith(":PRR"));
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java
index a8c686a..2a6d1c9 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java
@@ -17,7 +17,8 @@
package net.shibboleth.idp.attribute.filter.spring.saml;
-import org.testng.Assert;
+import static org.testng.Assert.assertEquals;
+
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeExactPolicyRule;
@@ -34,7 +35,7 @@ public class AttributeRequesterEntityAttributeExactRuleParserTest extends BaseAt
AttributeRequesterEntityAttributeExactPolicyRule rule =
(AttributeRequesterEntityAttributeExactPolicyRule) getPolicyRule("requesterEA2.xml");
- Assert.assertEquals(rule.getValue(), "urn:example.org:policy:ABCD1234");
- Assert.assertEquals(rule.getAttributeName(), "urn:example.org:policy");
+ assertEquals(rule.getValue(), "urn:example.org:policy:ABCD1234");
+ assertEquals(rule.getAttributeName(), "urn:example.org:policy");
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeRegexRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeRegexRuleParserTest.java
index 394307b..40921c9 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeRegexRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeRegexRuleParserTest.java
@@ -17,7 +17,8 @@
package net.shibboleth.idp.attribute.filter.spring.saml;
-import org.testng.Assert;
+import static org.testng.Assert.assertEquals;
+
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeRegexPolicyRule;
@@ -32,7 +33,7 @@ public class AttributeRequesterEntityAttributeRegexRuleParserTest extends BaseA
@Test public void basic() throws ComponentInitializationException {
final AttributeRequesterEntityAttributeRegexPolicyRule rule = (AttributeRequesterEntityAttributeRegexPolicyRule) getPolicyRule("requesterEARegex2.xml");
- Assert.assertEquals(rule.getValueRegex().pattern(), "^urn:example\\.org:policy:[^:]*$");
- Assert.assertEquals(rule.getAttributeName(), "urn:example.org:policy");
+ assertEquals(rule.getValueRegex().pattern(), "^urn:example\\.org:policy:[^:]*$");
+ assertEquals(rule.getAttributeName(), "urn:example.org:policy");
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterInEntityGroupRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterInEntityGroupRuleParserTest.java
index 82007ad..9ee9f38 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterInEntityGroupRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterInEntityGroupRuleParserTest.java
@@ -17,7 +17,8 @@
package net.shibboleth.idp.attribute.filter.spring.saml;
-import org.testng.Assert;
+import static org.testng.Assert.assertEquals;
+
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterInEntityGroupPolicyRule;
@@ -33,7 +34,7 @@ public class AttributeRequesterInEntityGroupRuleParserTest extends BaseAttribut
@Test public void basic() throws ComponentInitializationException {
final AttributeRequesterInEntityGroupPolicyRule rule = (AttributeRequesterInEntityGroupPolicyRule) getPolicyRule("requesterEG2.xml");
- Assert.assertEquals(rule.getEntityGroup(), "urn:example.org");
+ assertEquals(rule.getEntityGroup(), "urn:example.org");
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterNameIdFormatRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterNameIdFormatRuleParserTest.java
index bdabba8..6a8546c 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterNameIdFormatRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterNameIdFormatRuleParserTest.java
@@ -17,14 +17,15 @@
package net.shibboleth.idp.attribute.filter.spring.saml;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterNameIDFormatExactPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeRequesterNameIdFormatRuleParser;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link AttributeRequesterNameIdFormatRuleParser}.
*/
@@ -34,6 +35,6 @@ public class AttributeRequesterNameIdFormatRuleParserTest extends BaseAttributeF
final AttributeRequesterNameIDFormatExactPolicyRule rule =
(AttributeRequesterNameIDFormatExactPolicyRule) getPolicyRule("requesterNameId2.xml");
- Assert.assertEquals(rule.getNameIdFormat(), "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent");
+ assertEquals(rule.getNameIdFormat(), "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent");
}
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/MappedAttributeInMetadataRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/MappedAttributeInMetadataRuleParserTest.java
index 03f61fe..a97cfac 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/MappedAttributeInMetadataRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/MappedAttributeInMetadataRuleParserTest.java
@@ -17,6 +17,11 @@
package net.shibboleth.idp.attribute.filter.spring.saml;
+import static org.testng.Assert.assertTrue;
+
+import org.springframework.context.support.GenericApplicationContext;
+import org.testng.annotations.Test;
+
import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.idp.attribute.filter.AttributeRule;
import net.shibboleth.idp.attribute.filter.PolicyFromMatcher;
@@ -26,10 +31,6 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.filter.spring.saml.impl.MappedAttributeInMetadataRuleParser;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link MappedAttributeInMetadataRuleParser}.
*/
@@ -44,15 +45,15 @@ public class MappedAttributeInMetadataRuleParserTest extends BaseAttributeFilte
rule.initialize();
MappedAttributeInMetadataMatcher matcher = (MappedAttributeInMetadataMatcher) rule.getMatcher();
- Assert.assertTrue(matcher.getMatchIfMetadataSilent());
- Assert.assertTrue(matcher.getOnlyIfRequired());
- Assert.assertTrue(matcher.getId().endsWith(":PermitRule"));
+ assertTrue(matcher.getMatchIfMetadataSilent());
+ assertTrue(matcher.getOnlyIfRequired());
+ assertTrue(matcher.getId().endsWith(":PermitRule"));
final PolicyFromMatcher policyRule = (PolicyFromMatcher) getBean(PolicyRequirementRule.class, context);
matcher = (MappedAttributeInMetadataMatcher) policyRule.getMatcher();
- Assert.assertTrue(matcher.getMatchIfMetadataSilent());
- Assert.assertTrue(matcher.getOnlyIfRequired());
- Assert.assertTrue(matcher.getId().endsWith(":PRR"));
+ assertTrue(matcher.getMatchIfMetadataSilent());
+ assertTrue(matcher.getOnlyIfRequired());
+ assertTrue(matcher.getId().endsWith(":PRR"));
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RegistrationAuthorityRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RegistrationAuthorityRuleParserTest.java
index d047920..a55b791 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RegistrationAuthorityRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RegistrationAuthorityRuleParserTest.java
@@ -17,16 +17,18 @@
package net.shibboleth.idp.attribute.filter.spring.saml;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.util.Set;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RegistrationAuthorityPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.idp.attribute.filter.spring.saml.impl.RegistrationAuthorityRuleParser;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link RegistrationAuthorityRuleParser}.
*/
@@ -36,23 +38,23 @@ public class RegistrationAuthorityRuleParserTest extends BaseAttributeFilterPars
@Test public void silentTrue() throws ComponentInitializationException {
final RegistrationAuthorityPolicyRule rule = (RegistrationAuthorityPolicyRule) getPolicyRule("registrationAuthorityOne.xml");
- Assert.assertTrue(rule.isMatchIfMetadataSilent());
+ assertTrue(rule.isMatchIfMetadataSilent());
final Set<String> issuers = rule.getIssuers();
- Assert.assertEquals(issuers.size(), 2);
- Assert.assertTrue(issuers.contains("https://example.org/SilentTrue/One"));
- Assert.assertTrue(issuers.contains("https://example.org/SilentTrue/Two"));
+ assertEquals(issuers.size(), 2);
+ assertTrue(issuers.contains("https://example.org/SilentTrue/One"));
+ assertTrue(issuers.contains("https://example.org/SilentTrue/Two"));
}
@Test public void silentFalse() throws ComponentInitializationException {
final RegistrationAuthorityPolicyRule rule = (RegistrationAuthorityPolicyRule) getPolicyRule("registrationAuthorityTwo.xml");
- Assert.assertTrue(rule.isMatchIfMetadataSilent());
+ assertTrue(rule.isMatchIfMetadataSilent());
final Set<String> issuers = rule.getIssuers();
- Assert.assertEquals(issuers.size(), 3);
- Assert.assertTrue(issuers.contains("https://example.org/SilentFalse/One"));
- Assert.assertTrue(issuers.contains("https://example.org/SilentFalse/Two"));
- Assert.assertTrue(issuers.contains("https://example.org/SilentFalse/Three"));
+ assertEquals(issuers.size(), 3);
+ assertTrue(issuers.contains("https://example.org/SilentFalse/One"));
+ assertTrue(issuers.contains("https://example.org/SilentFalse/Two"));
+ assertTrue(issuers.contains("https://example.org/SilentFalse/Three"));
}
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list