[java-identity-provider] 01/10: idp-attribute-filter-impl: Use static imports for all the asserts in the tests
Rod Widdowson
rdw at steadingsoftware.com
Thu Apr 11 08:59:53 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=fcdbf5c03aead4dd547006da582290c4bb148996
commit fcdbf5c03aead4dd547006da582290c4bb148996
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Apr 9 16:20:18 2019 +0100
idp-attribute-filter-impl: Use static imports for all the asserts in the tests
---
.../impl/TargettedAttributeValueFilterTest.java | 26 ++++---
.../impl/UntargettedAttributeValueFilterTest.java | 20 ++---
.../impl/AbstractRegexpStringMatcherTest.java | 20 ++---
.../matcher/impl/AbstractStringMatcherTest.java | 28 ++++---
.../impl/AttributeScopeRegexpMatcherTest.java | 15 ++--
.../impl/AttributeScopeStringMatcherTest.java | 14 ++--
.../impl/AttributeValueRegexpMatcherTest.java | 25 +++---
.../impl/AttributeValueStringMatcherTest.java | 36 ++++-----
.../filter/matcher/impl/ScriptedMatcherTest.java | 79 ++++++++++---------
.../logic/impl/AbstractComposedMatcherTest.java | 30 ++++----
.../filter/matcher/logic/impl/AndMatcherTest.java | 42 +++++-----
.../filter/matcher/logic/impl/NotMatcherTest.java | 41 +++++-----
.../filter/matcher/logic/impl/OrMatcherTest.java | 54 +++++++------
.../saml/impl/AttributeInMetadataMatcherTest.java | 89 +++++++++++-----------
.../impl/MappedAttributeInMetadataMatcherTest.java | 65 ++++++++--------
.../impl/AttributeIssuerPolicyRuleTest.java | 28 +++----
.../impl/AttributeIssuerRegexpPolicyRuleTest.java | 21 ++---
.../impl/AttributeRequesterPolicyRuleTest.java | 28 +++----
.../AttributeRequesterRegexpPolicyRuleTest.java | 21 ++---
.../impl/NumOfAttributeValuesPolicyRuleTest.java | 27 +++----
.../impl/PredicatePolicyRuleTest.java | 16 ++--
.../impl/PrincipalNamePolicyRuleTest.java | 27 ++++---
.../impl/PrincipalNameRegexpPolicyRuleTest.java | 21 ++---
.../impl/ProxiedRequesterPolicyRuleTest.java | 30 ++++----
.../impl/ProxiedRequesterRegexpPolicyRuleTest.java | 28 +++----
.../policyrule/impl/ScriptedPolicyRuleTest.java | 59 +++++++-------
.../logic/impl/AbstractComposedPolicyRuleTest.java | 32 ++++----
.../policyrule/logic/impl/AndPolicyRuleTest.java | 28 +++----
.../policyrule/logic/impl/NotPolicyRuleTest.java | 31 ++++----
.../policyrule/logic/impl/OrPolicyRuleTest.java | 30 ++++----
...equesterEntityAttributeExactPolicyRuleTest.java | 45 +++++------
...equesterEntityAttributeRegexPolicyRuleTest.java | 16 ++--
...ributeRequesterInEntityGroupPolicyRuleTest.java | 17 +++--
...teRequesterNameIDFormatExactPolicyRuleTest.java | 19 ++---
.../saml/impl/RegistrationAuthorityTest.java | 27 +++----
35 files changed, 606 insertions(+), 529 deletions(-)
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java
index 52cd162..ca99642 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java
@@ -17,9 +17,14 @@
package net.shibboleth.idp.attribute.filter.complex.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
import java.util.Collections;
import java.util.Map;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.filter.AttributeFilter;
import net.shibboleth.idp.attribute.filter.AttributeFilterException;
@@ -38,9 +43,6 @@ import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Complex test for AttributeRuleFilters when the rule is targeted
*/
@@ -106,19 +108,19 @@ public class TargettedAttributeValueFilterTest extends BaseComplexAttributeFilte
engine.filterAttributes(context);
Map<String, IdPAttribute> attributes = context.getFilteredIdPAttributes();
final IdPAttribute attribute = attributes.get("eduPersonAffiliation");
- Assert.assertEquals(attribute.getValues().size(), 3);
+ assertEquals(attribute.getValues().size(), 3);
context = new AttributeFilterContext();
context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml").values());
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
- Assert.assertNull(attributes.get("eduPersonAffiliation"));
+ assertNull(attributes.get("eduPersonAffiliation"));
context = new AttributeFilterContext();
context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml").values());
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
- Assert.assertNull(attributes.get("eduPersonAffiliation"));
+ assertNull(attributes.get("eduPersonAffiliation"));
}
/**
@@ -168,19 +170,19 @@ public class TargettedAttributeValueFilterTest extends BaseComplexAttributeFilte
engine.filterAttributes(context);
Map<String, IdPAttribute> attributes = context.getFilteredIdPAttributes();
final IdPAttribute attribute = attributes.get("eduPersonAffiliation");
- Assert.assertEquals(attribute.getValues().size(), 3);
+ assertEquals(attribute.getValues().size(), 3);
context = new AttributeFilterContext();
context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml").values());
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
- Assert.assertEquals(attribute.getValues().size(), 3);
+ assertEquals(attribute.getValues().size(), 3);
context = new AttributeFilterContext();
context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml").values());
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
- Assert.assertEquals(attribute.getValues().size(), 3);
+ assertEquals(attribute.getValues().size(), 3);
}
/**
@@ -222,19 +224,19 @@ public class TargettedAttributeValueFilterTest extends BaseComplexAttributeFilte
engine.filterAttributes(context);
Map<String, IdPAttribute> attributes = context.getFilteredIdPAttributes();
final IdPAttribute attribute = attributes.get("eduPersonAffiliation");
- Assert.assertEquals(attribute.getValues().size(), 3);
+ assertEquals(attribute.getValues().size(), 3);
context = new AttributeFilterContext();
context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml").values());
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
- Assert.assertNull(attributes.get("eduPersonAffiliation"));
+ assertNull(attributes.get("eduPersonAffiliation"));
context = new AttributeFilterContext();
context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml").values());
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
- Assert.assertNull(attributes.get("eduPersonAffiliation"));
+ assertNull(attributes.get("eduPersonAffiliation"));
}
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java
index c0ba5dd..45c5cc9 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java
@@ -17,9 +17,14 @@
package net.shibboleth.idp.attribute.filter.complex.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
import java.util.Collections;
import java.util.Map;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.filter.AttributeFilter;
import net.shibboleth.idp.attribute.filter.AttributeFilterException;
@@ -35,9 +40,6 @@ import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Complex test for AttributeRuleFilters when the rule is targeted
*/
@@ -98,20 +100,20 @@ public class UntargettedAttributeValueFilterTest extends BaseComplexAttributeFil
context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uidwithjsmith.xml").values());
engine.filterAttributes(context);
Map<String, IdPAttribute> attributes = context.getFilteredIdPAttributes();
- Assert.assertNull(attributes.get("eduPersonAffiliation"));
+ assertNull(attributes.get("eduPersonAffiliation"));
context = new AttributeFilterContext();
context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml").values());
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
IdPAttribute attribute = attributes.get("eduPersonAffiliation");
- Assert.assertEquals(attribute.getValues().size(), 1);
+ assertEquals(attribute.getValues().size(), 1);
context = new AttributeFilterContext();
context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml").values());
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
- Assert.assertNull(attributes.get("eduPersonAffiliation"));
+ assertNull(attributes.get("eduPersonAffiliation"));
}
/**
@@ -152,20 +154,20 @@ public class UntargettedAttributeValueFilterTest extends BaseComplexAttributeFil
engine.filterAttributes(context);
Map<String, IdPAttribute> attributes = context.getFilteredIdPAttributes();
IdPAttribute attribute = attributes.get("eduPersonAffiliation");
- Assert.assertEquals(attribute.getValues().size(), 3);
+ assertEquals(attribute.getValues().size(), 3);
context = new AttributeFilterContext();
context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml").values());
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
attribute = attributes.get("eduPersonAffiliation");
- Assert.assertEquals(attribute.getValues().size(), 3);
+ assertEquals(attribute.getValues().size(), 3);
context = new AttributeFilterContext();
context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml").values());
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
- Assert.assertNull(attributes.get("eduPersonAffiliation"));
+ assertNull(attributes.get("eduPersonAffiliation"));
}
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractRegexpStringMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractRegexpStringMatcherTest.java
index a8a667e..5671457 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractRegexpStringMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractRegexpStringMatcherTest.java
@@ -17,13 +17,15 @@
package net.shibboleth.idp.attribute.filter.matcher.impl;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.attribute.filter.matcher.impl.AbstractRegexpStringMatcher;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/**
* Tests for {@link AbstractRegexpStringMatcher}
*/
@@ -39,10 +41,10 @@ public class AbstractRegexpStringMatcherTest {
predicate.setId("od");
predicate.initialize();
- Assert.assertTrue(predicate.regexpCompare(DataSources.TEST_STRING));
- Assert.assertFalse(predicate.regexpCompare("o" + DataSources.TEST_STRING));
- Assert.assertFalse(predicate.regexpCompare(null));
- Assert.assertEquals(predicate.getRegularExpression(), DataSources.TEST_REGEX);
+ assertTrue(predicate.regexpCompare(DataSources.TEST_STRING));
+ assertFalse(predicate.regexpCompare("o" + DataSources.TEST_STRING));
+ assertFalse(predicate.regexpCompare(null));
+ assertEquals(predicate.getRegularExpression(), DataSources.TEST_REGEX);
predicate = new AbstractRegexpStringMatcher() {
@@ -52,7 +54,7 @@ public class AbstractRegexpStringMatcherTest {
predicate.setRegularExpression("^p.*");
predicate.setId("od");
predicate.initialize();
- Assert.assertFalse(predicate.regexpCompare(DataSources.TEST_STRING));
+ assertFalse(predicate.regexpCompare(DataSources.TEST_STRING));
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractStringMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractStringMatcherTest.java
index 871c6ad..30e53c1 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractStringMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractStringMatcherTest.java
@@ -17,11 +17,15 @@
package net.shibboleth.idp.attribute.filter.matcher.impl;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.IdPAttributeValue;
+
/**
* Tests for {@link AbstractStringMatcher}
*/
@@ -35,16 +39,16 @@ public class AbstractStringMatcherTest {
return false;
}};
- Assert.assertNull(matcher.getMatchString());
- Assert.assertFalse(!matcher.isIgnoreCase());
+ assertNull(matcher.getMatchString());
+ assertFalse(!matcher.isIgnoreCase());
matcher.setIgnoreCase(false);
- Assert.assertFalse(matcher.isIgnoreCase());
+ assertFalse(matcher.isIgnoreCase());
matcher.setIgnoreCase(true);
- Assert.assertTrue(matcher.isIgnoreCase());
+ assertTrue(matcher.isIgnoreCase());
matcher.setMatchString(DataSources.TEST_STRING);
- Assert.assertEquals(matcher.getMatchString(), DataSources.TEST_STRING);
+ assertEquals(matcher.getMatchString(), DataSources.TEST_STRING);
}
@Test public void testApply() {
@@ -57,13 +61,13 @@ public class AbstractStringMatcherTest {
matcher.setIgnoreCase(false);
matcher.setMatchString(DataSources.TEST_STRING);
- Assert.assertTrue(matcher.stringCompare(DataSources.TEST_STRING));
- Assert.assertFalse(matcher.stringCompare(DataSources.TEST_STRING_UPPER));
+ assertTrue(matcher.stringCompare(DataSources.TEST_STRING));
+ assertFalse(matcher.stringCompare(DataSources.TEST_STRING_UPPER));
matcher.setIgnoreCase(true);
- Assert.assertTrue(matcher.stringCompare(DataSources.TEST_STRING));
- Assert.assertTrue(matcher.stringCompare(DataSources.TEST_STRING_UPPER));
+ assertTrue(matcher.stringCompare(DataSources.TEST_STRING));
+ assertTrue(matcher.stringCompare(DataSources.TEST_STRING_UPPER));
- Assert.assertFalse(matcher.stringCompare(null));
+ assertFalse(matcher.stringCompare(null));
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeRegexpMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeRegexpMatcherTest.java
index 1985cbe..d38530d 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeRegexpMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeRegexpMatcherTest.java
@@ -17,12 +17,13 @@
package net.shibboleth.idp.attribute.filter.matcher.impl;
-import net.shibboleth.idp.attribute.filter.matcher.impl.AttributeScopeRegexpMatcher;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/**
* Test For {@link AttributeScopeRegexpMatcher}.
*/
@@ -34,10 +35,10 @@ public class AttributeScopeRegexpMatcherTest {
matcher.setId("TestId");
matcher.initialize();
- Assert.assertFalse(matcher.compareAttributeValue(DataSources.STRING_VALUE));
- Assert.assertFalse(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_VALUE_MATCH));
- Assert.assertTrue(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_SCOPE_MATCH));
- Assert.assertFalse(matcher.compareAttributeValue(null));
+ assertFalse(matcher.compareAttributeValue(DataSources.STRING_VALUE));
+ assertFalse(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_VALUE_MATCH));
+ assertTrue(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_SCOPE_MATCH));
+ assertFalse(matcher.compareAttributeValue(null));
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeStringMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeStringMatcherTest.java
index 976479a..0667049 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeStringMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeStringMatcherTest.java
@@ -17,11 +17,13 @@
package net.shibboleth.idp.attribute.filter.matcher.impl;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/**
* Test For {@link AttributeScopeStringMatcher}.
*/
@@ -34,10 +36,10 @@ public class AttributeScopeStringMatcherTest {
matcher.setId("Test");
matcher.initialize();
- Assert.assertFalse(matcher.compareAttributeValue(DataSources.STRING_VALUE));
- Assert.assertFalse(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_VALUE_MATCH));
- Assert.assertTrue(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_SCOPE_MATCH));
- Assert.assertFalse(matcher.compareAttributeValue(null));
+ assertFalse(matcher.compareAttributeValue(DataSources.STRING_VALUE));
+ assertFalse(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_VALUE_MATCH));
+ assertTrue(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_SCOPE_MATCH));
+ assertFalse(matcher.compareAttributeValue(null));
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcherTest.java
index ca8be12..0e58bfa 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcherTest.java
@@ -17,13 +17,14 @@
package net.shibboleth.idp.attribute.filter.matcher.impl;
-import net.shibboleth.idp.attribute.EmptyAttributeValue;
-import net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueRegexpMatcher;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.EmptyAttributeValue;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/**
* Test For {@link AttributeValueRegexpMatcher}
*/
@@ -35,14 +36,14 @@ public class AttributeValueRegexpMatcherTest {
matcher.setId("Test");
matcher.initialize();
- Assert.assertTrue(matcher.compareAttributeValue(DataSources.STRING_VALUE));
- Assert.assertTrue(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_VALUE_MATCH));
- Assert.assertFalse(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_SCOPE_MATCH));
- Assert.assertFalse(matcher.compareAttributeValue(DataSources.BYTE_ATTRIBUTE_VALUE));
- Assert.assertFalse(matcher.compareAttributeValue(EmptyAttributeValue.NULL));
- Assert.assertFalse(matcher.compareAttributeValue(EmptyAttributeValue.ZERO_LENGTH));
- Assert.assertFalse(matcher.compareAttributeValue(null));
- Assert.assertTrue(matcher.compareAttributeValue(DataSources.OTHER_VALUE));
+ assertTrue(matcher.compareAttributeValue(DataSources.STRING_VALUE));
+ assertTrue(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_VALUE_MATCH));
+ assertFalse(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_SCOPE_MATCH));
+ assertFalse(matcher.compareAttributeValue(DataSources.BYTE_ATTRIBUTE_VALUE));
+ assertFalse(matcher.compareAttributeValue(EmptyAttributeValue.NULL));
+ assertFalse(matcher.compareAttributeValue(EmptyAttributeValue.ZERO_LENGTH));
+ assertFalse(matcher.compareAttributeValue(null));
+ assertTrue(matcher.compareAttributeValue(DataSources.OTHER_VALUE));
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcherTest.java
index 2918400..9dd4bfd 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcherTest.java
@@ -17,12 +17,14 @@
package net.shibboleth.idp.attribute.filter.matcher.impl;
-import net.shibboleth.idp.attribute.EmptyAttributeValue;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.EmptyAttributeValue;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/**
* Test For {@link AttributeValueStringMatcher}.
*/
@@ -35,29 +37,29 @@ public class AttributeValueStringMatcherTest {
matcher.setId("Test");
matcher.initialize();
- Assert.assertTrue(matcher.compareAttributeValue(DataSources.STRING_VALUE));
- Assert.assertTrue(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_VALUE_MATCH));
- Assert.assertFalse(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_SCOPE_MATCH));
- Assert.assertFalse(matcher.compareAttributeValue(DataSources.BYTE_ATTRIBUTE_VALUE));
- Assert.assertFalse(matcher.compareAttributeValue(EmptyAttributeValue.NULL));
- Assert.assertFalse(matcher.compareAttributeValue(EmptyAttributeValue.ZERO_LENGTH));
- Assert.assertFalse(matcher.compareAttributeValue(null));
- Assert.assertTrue(matcher.compareAttributeValue(DataSources.OTHER_VALUE));
+ assertTrue(matcher.compareAttributeValue(DataSources.STRING_VALUE));
+ assertTrue(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_VALUE_MATCH));
+ assertFalse(matcher.compareAttributeValue(DataSources.SCOPED_VALUE_SCOPE_MATCH));
+ assertFalse(matcher.compareAttributeValue(DataSources.BYTE_ATTRIBUTE_VALUE));
+ assertFalse(matcher.compareAttributeValue(EmptyAttributeValue.NULL));
+ assertFalse(matcher.compareAttributeValue(EmptyAttributeValue.ZERO_LENGTH));
+ assertFalse(matcher.compareAttributeValue(null));
+ assertTrue(matcher.compareAttributeValue(DataSources.OTHER_VALUE));
AttributeValueStringMatcher nullMatcher = new AttributeValueStringMatcher();
nullMatcher.setId("NullTest");
nullMatcher.initialize();
- Assert.assertTrue(nullMatcher.compareAttributeValue(EmptyAttributeValue.NULL));
- Assert.assertFalse(nullMatcher.compareAttributeValue(EmptyAttributeValue.ZERO_LENGTH));
- Assert.assertFalse(nullMatcher.compareAttributeValue(DataSources.STRING_VALUE));
+ assertTrue(nullMatcher.compareAttributeValue(EmptyAttributeValue.NULL));
+ assertFalse(nullMatcher.compareAttributeValue(EmptyAttributeValue.ZERO_LENGTH));
+ assertFalse(nullMatcher.compareAttributeValue(DataSources.STRING_VALUE));
AttributeValueStringMatcher emptyMatcher = new AttributeValueStringMatcher();
emptyMatcher.setMatchString("");
emptyMatcher.setId("EmptyTest");
emptyMatcher.initialize();
- Assert.assertTrue(emptyMatcher.compareAttributeValue(EmptyAttributeValue.ZERO_LENGTH));
- Assert.assertFalse(emptyMatcher.compareAttributeValue(EmptyAttributeValue.NULL));
- Assert.assertFalse(emptyMatcher.compareAttributeValue(DataSources.STRING_VALUE));
+ assertTrue(emptyMatcher.compareAttributeValue(EmptyAttributeValue.ZERO_LENGTH));
+ assertFalse(emptyMatcher.compareAttributeValue(EmptyAttributeValue.NULL));
+ assertFalse(emptyMatcher.compareAttributeValue(DataSources.STRING_VALUE));
}
}
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 952330b..f790dbf 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
@@ -17,6 +17,14 @@
package net.shibboleth.idp.attribute.filter.matcher.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNotSame;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -24,6 +32,10 @@ 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.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
@@ -40,11 +52,6 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
import net.shibboleth.utilities.java.support.testing.TestSupport;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
/** {@link ScriptedMatcher} unit test. */
@ThreadSafe
public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
@@ -128,7 +135,7 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.setId("Test");
matcher.initialize();
- Assert.assertNotNull(matcher.getScript());
+ assertNotNull(matcher.getScript());
}
@Test public void testNullArguments() throws Exception {
@@ -139,21 +146,21 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
try {
matcher.getMatchingValues(null, filterContext);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
try {
matcher.getMatchingValues(attribute, null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
try {
matcher.getMatchingValues(null, null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
@@ -167,7 +174,7 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
try {
newScriptedMatcher(null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
@@ -179,9 +186,9 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
final Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNotNull(result);
- Assert.assertEquals(result.size(), 1);
- Assert.assertTrue(result.contains(value1) || result.contains(value2) || result.contains(value3));
+ assertNotNull(result);
+ assertEquals(result.size(), 1);
+ assertTrue(result.contains(value1) || result.contains(value2) || result.contains(value3));
}
@Test public void custom() throws Exception {
@@ -193,9 +200,9 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
final Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNotNull(result);
- Assert.assertEquals(result.size(), 1);
- Assert.assertTrue(result.contains(value1) || result.contains(value2) || result.contains(value3));
+ assertNotNull(result);
+ assertEquals(result.size(), 1);
+ assertTrue(result.contains(value1) || result.contains(value2) || result.contains(value3));
}
@@ -205,7 +212,7 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.setId("Test");
matcher.initialize();
- Assert.assertNull(matcher.getMatchingValues(attribute, filterContext));
+ assertNull(matcher.getMatchingValues(attribute, filterContext));
}
@Test public void testInvalidReturnObjectValue() throws Exception {
@@ -214,7 +221,7 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.setId("Test");
matcher.initialize();
- Assert.assertNull(matcher.getMatchingValues(attribute, filterContext));
+ assertNull(matcher.getMatchingValues(attribute, filterContext));
}
@Test public void testAddedValuesScript() throws Exception {
@@ -224,9 +231,9 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
final Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNotNull(result);
- Assert.assertEquals(result.size(), 1);
- Assert.assertTrue(result.contains(value1) || result.contains(value2) || result.contains(value3));
+ assertNotNull(result);
+ assertEquals(result.size(), 1);
+ assertTrue(result.contains(value1) || result.contains(value2) || result.contains(value3));
}
@Test public void testInitTeardown() throws ComponentInitializationException {
@@ -239,7 +246,7 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
} catch (final UninitializedComponentException e) {
thrown = true;
}
- Assert.assertTrue(thrown, "getMatchingValues before init");
+ assertTrue(thrown, "getMatchingValues before init");
matcher.setId("Test");
matcher.initialize();
@@ -260,7 +267,7 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
} catch (final DestroyedComponentException e) {
thrown = true;
}
- Assert.assertTrue(thrown, "getMatchingValues after destroy");
+ assertTrue(thrown, "getMatchingValues after destroy");
thrown = false;
try {
@@ -268,7 +275,7 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
} catch (final DestroyedComponentException e) {
thrown = true;
}
- Assert.assertTrue(thrown, "getMatchingValues after destroy");
+ assertTrue(thrown, "getMatchingValues after destroy");
}
@SuppressWarnings("unlikely-arg-type")
@@ -278,19 +285,19 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.toString();
- Assert.assertFalse(matcher.equals(null));
- Assert.assertTrue(matcher.equals(matcher));
- Assert.assertFalse(matcher.equals(this));
+ assertFalse(matcher.equals(null));
+ assertTrue(matcher.equals(matcher));
+ assertFalse(matcher.equals(this));
ScriptedMatcher other = newScriptedMatcher(addedValuesScript);
- Assert.assertTrue(matcher.equals(other));
- Assert.assertEquals(matcher.hashCode(), other.hashCode());
+ assertTrue(matcher.equals(other));
+ assertEquals(matcher.hashCode(), other.hashCode());
other = newScriptedMatcher(nullReturnScript);
- Assert.assertFalse(matcher.equals(other));
- Assert.assertNotSame(matcher.hashCode(), other.hashCode());
+ assertFalse(matcher.equals(other));
+ assertNotSame(matcher.hashCode(), other.hashCode());
}
@@ -308,7 +315,7 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
sc.getAuthenticationResults().put("one", new AuthenticationResult("1", subject));
Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertEquals(result.size(), 0);
+ assertEquals(result.size(), 0);
final IdPAttribute newAttr = attribute.clone();
@@ -318,9 +325,9 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
s.add(new StringAttributeValue("FOO"));
newAttr.setValues(s);
result = matcher.getMatchingValues(newAttr, filterContext);
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(new StringAttributeValue(ProfileRequestContext.class.getName())));
- Assert.assertTrue(result.contains(new StringAttributeValue("FOO")));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(new StringAttributeValue(ProfileRequestContext.class.getName())));
+ assertTrue(result.contains(new StringAttributeValue("FOO")));
}
static public ScriptedMatcher newScriptedMatcher(final EvaluableScript script) {
@@ -328,4 +335,4 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
what.setScript(script);
return what;
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcherTest.java
index 59a4dab..4a3f829 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcherTest.java
@@ -17,6 +17,9 @@
package net.shibboleth.idp.attribute.filter.matcher.logic.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -25,6 +28,8 @@ import java.util.Set;
import javax.annotation.Nullable;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.filter.Matcher;
@@ -35,9 +40,6 @@ import net.shibboleth.utilities.java.support.component.DestroyedComponentExcepti
import net.shibboleth.utilities.java.support.component.DestructableComponent;
import net.shibboleth.utilities.java.support.component.InitializableComponent;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/** unit tests for {@link AbstractComposedMatcher}. */
public class AbstractComposedMatcherTest {
@@ -58,7 +60,7 @@ public class AbstractComposedMatcherTest {
thrown = true;
}
- Assert.assertTrue(thrown, "Initialize after destroy");
+ assertTrue(thrown, "Initialize after destroy");
for (int i = 0; i < 2; i++) {
firstList.add(new TestMatcher());
@@ -66,7 +68,7 @@ public class AbstractComposedMatcherTest {
firstList.add(null);
matcher = new ComposedMatcher(firstList);
- Assert.assertEquals(firstList.size() - 1, matcher.getComposedMatchers().size());
+ assertEquals(firstList.size() - 1, matcher.getComposedMatchers().size());
thrown = false;
try {
@@ -74,7 +76,7 @@ public class AbstractComposedMatcherTest {
} catch (final UnsupportedOperationException e) {
thrown = true;
}
- Assert.assertTrue(thrown, "Set into the returned list");
+ assertTrue(thrown, "Set into the returned list");
matcher.setId("Test");
matcher.initialize();
@@ -83,8 +85,8 @@ public class AbstractComposedMatcherTest {
@Test public void testParams() throws ComponentInitializationException {
ComposedMatcher matcher = new ComposedMatcher(null);
- Assert.assertTrue(matcher.getComposedMatchers().isEmpty(), "Initial state - no matchers");
- Assert.assertTrue(matcher.getComposedMatchers().isEmpty(), "Add null - no matchers");
+ assertTrue(matcher.getComposedMatchers().isEmpty(), "Initial state - no matchers");
+ assertTrue(matcher.getComposedMatchers().isEmpty(), "Add null - no matchers");
final List<Matcher> list = new ArrayList<>();
@@ -93,7 +95,7 @@ public class AbstractComposedMatcherTest {
}
matcher = new ComposedMatcher(list);
- Assert.assertTrue(matcher.getComposedMatchers().isEmpty(), "Add List<null> - no matchers");
+ assertTrue(matcher.getComposedMatchers().isEmpty(), "Add List<null> - no matchers");
list.set(2, new TestMatcher());
list.set(3, new TestMatcher());
@@ -104,16 +106,16 @@ public class AbstractComposedMatcherTest {
list.set(19, new TestMatcher());
list.set(23, new TestMatcher());
list.set(29, new TestMatcher());
- Assert.assertTrue(matcher.getComposedMatchers().isEmpty(), "Change to input list - no matchers");
+ assertTrue(matcher.getComposedMatchers().isEmpty(), "Change to input list - no matchers");
matcher = new ComposedMatcher(list);
- Assert.assertEquals(matcher.getComposedMatchers().size(), 9, "Add a List with nulls");
+ assertEquals(matcher.getComposedMatchers().size(), 9, "Add a List with nulls");
list.clear();
- Assert.assertEquals(matcher.getComposedMatchers().size(), 9, "Change to input list");
+ assertEquals(matcher.getComposedMatchers().size(), 9, "Change to input list");
matcher = new ComposedMatcher(list);
- Assert.assertTrue(matcher.getComposedMatchers().isEmpty(), "Empty list");
+ assertTrue(matcher.getComposedMatchers().isEmpty(), "Empty list");
}
@@ -154,4 +156,4 @@ public class AbstractComposedMatcherTest {
}
}
-}
\ No newline at end of file
+}
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 b09bc36..1478c62 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
@@ -19,12 +19,20 @@ package net.shibboleth.idp.attribute.filter.matcher.logic.impl;
import static com.google.common.base.Predicates.equalTo;
import static com.google.common.base.Predicates.or;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.idp.attribute.filter.matcher.impl.AbstractMatcherPolicyRuleTest;
@@ -34,10 +42,6 @@ import net.shibboleth.utilities.java.support.component.DestroyedComponentExcepti
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
/** {@link AndMatcher} unit test. */
public class AndMatcherTest extends AbstractMatcherPolicyRuleTest {
@@ -53,21 +57,21 @@ public class AndMatcherTest extends AbstractMatcherPolicyRuleTest {
try {
matcher.getMatchingValues(null, filterContext);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
try {
matcher.getMatchingValues(attribute, null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
try {
matcher.getMatchingValues(null, null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
@@ -82,9 +86,9 @@ public class AndMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
final Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(value2));
- Assert.assertTrue(result.contains(value1));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(value2));
+ assertTrue(result.contains(value1));
}
@@ -96,7 +100,7 @@ public class AndMatcherTest extends AbstractMatcherPolicyRuleTest {
try {
matcher.getMatchingValues(attribute, filterContext);
- Assert.fail();
+ fail();
} catch (final UninitializedComponentException e) {
// expect this
}
@@ -105,14 +109,14 @@ public class AndMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
final Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNotNull(result);
- Assert.assertEquals(result.size(), 1);
- Assert.assertTrue(result.contains(value2));
+ assertNotNull(result);
+ assertEquals(result.size(), 1);
+ assertTrue(result.contains(value2));
matcher.destroy();
try {
matcher.getMatchingValues(attribute, filterContext);
- Assert.fail();
+ fail();
} catch (final DestroyedComponentException e) {
// expect this
}
@@ -124,14 +128,14 @@ public class AndMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNull(result);
+ assertNull(result);
matcher = newAndMatcher(Arrays.<Matcher> asList(Matcher.MATCHER_FAILS, Matcher.MATCHES_ALL));
matcher.setId("test");
matcher.initialize();
result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNull(result);
+ assertNull(result);
}
@Test(expectedExceptions = {ComponentInitializationException.class}) public void emptyInput()
@@ -149,7 +153,7 @@ public class AndMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.setId("Test");
matcher.initialize();
- Assert.assertTrue(matcher.getMatchingValues(attribute, filterContext).isEmpty());
+ assertTrue(matcher.getMatchingValues(attribute, filterContext).isEmpty());
}
static public AndMatcher newAndMatcher(final Collection<Matcher> what) {
@@ -157,4 +161,4 @@ public class AndMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.setSubsidiaries(what);
return matcher;
}
-}
\ No newline at end of file
+}
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 d6f443a..8dce2f9 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
@@ -19,10 +19,19 @@ package net.shibboleth.idp.attribute.filter.matcher.logic.impl;
import static com.google.common.base.Predicates.equalTo;
import static com.google.common.base.Predicates.or;
+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.fail;
import java.util.Arrays;
import java.util.Set;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.idp.attribute.filter.matcher.impl.AbstractMatcherPolicyRuleTest;
@@ -32,10 +41,6 @@ import net.shibboleth.utilities.java.support.component.DestroyedComponentExcepti
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
/** Test the {@link NotMatcher} matcher. */
public class NotMatcherTest extends AbstractMatcherPolicyRuleTest {
@@ -52,28 +57,28 @@ public class NotMatcherTest extends AbstractMatcherPolicyRuleTest {
try {
matcher.getMatchingValues(null, filterContext);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
try {
matcher.getMatchingValues(attribute, null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
try {
matcher.getMatchingValues(null, null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
try {
newNotMatcher(null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
@@ -85,12 +90,12 @@ public class NotMatcherTest extends AbstractMatcherPolicyRuleTest {
try {
matcher.getMatchingValues(attribute, filterContext);
- Assert.fail();
+ fail();
} catch (final UninitializedComponentException e) {
// expect this
}
- Assert.assertFalse(inMatcher.isInitialized());
- Assert.assertFalse(inMatcher.isDestroyed());
+ assertFalse(inMatcher.isInitialized());
+ assertFalse(inMatcher.isDestroyed());
matcher.setId("test");
matcher.initialize();
@@ -111,13 +116,13 @@ public class NotMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNotNull(result);
- Assert.assertEquals(result.size(), 1);
- Assert.assertTrue(result.contains(value3));
+ assertNotNull(result);
+ assertEquals(result.size(), 1);
+ assertTrue(result.contains(value3));
matcher.destroy();
try {
matcher.getMatchingValues(attribute, filterContext);
- Assert.fail();
+ fail();
} catch (final DestroyedComponentException e) {
// expect this
}
@@ -134,8 +139,8 @@ public class NotMatcherTest extends AbstractMatcherPolicyRuleTest {
orMatcher.initialize();
result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNotNull(result);
- Assert.assertEquals(result.size(), 0);
+ assertNotNull(result);
+ assertEquals(result.size(), 0);
}
@Test public void testFails() throws Exception {
@@ -144,7 +149,7 @@ public class NotMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
final Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNull(result);
+ assertNull(result);
}
public static NotMatcher newNotMatcher(final Matcher m) {
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 bf3d51c..a7ad359 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
@@ -19,12 +19,22 @@ package net.shibboleth.idp.attribute.filter.matcher.logic.impl;
import static com.google.common.base.Predicates.equalTo;
import static com.google.common.base.Predicates.or;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Predicates;
+
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.idp.attribute.filter.matcher.impl.AbstractMatcherPolicyRuleTest;
@@ -34,12 +44,6 @@ import net.shibboleth.utilities.java.support.component.DestroyedComponentExcepti
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicates;
-
/** {@link OrMatcher} unit test. */
public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
@@ -55,21 +59,21 @@ public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
try {
matcher.getMatchingValues(null, filterContext);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
try {
matcher.getMatchingValues(attribute, null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
try {
matcher.getMatchingValues(null, null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
@@ -84,9 +88,9 @@ public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
final Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(value2));
- Assert.assertTrue(result.contains(value1));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(value2));
+ assertTrue(result.contains(value1));
}
@@ -99,7 +103,7 @@ public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
try {
matcher.getMatchingValues(attribute, filterContext);
- Assert.fail();
+ fail();
} catch (final UninitializedComponentException e) {
// expect this
}
@@ -108,14 +112,14 @@ public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
final Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNotNull(result);
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(value2) && result.contains(value1));
+ assertNotNull(result);
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(value2) && result.contains(value1));
matcher.destroy();
try {
matcher.getMatchingValues(attribute, filterContext);
- Assert.fail();
+ fail();
} catch (final DestroyedComponentException e) {
// expect this
}
@@ -124,7 +128,7 @@ public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.setId("test");
try {
matcher.initialize();
- Assert.fail();
+ fail();
} catch (final ComponentInitializationException ex) {
// OK
}
@@ -139,9 +143,9 @@ public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
final Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNotNull(result);
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(value2) && result.contains(value1));
+ assertNotNull(result);
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(value2) && result.contains(value1));
matcher.destroy();
@@ -156,8 +160,8 @@ public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
final Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNotNull(result);
- Assert.assertTrue(result.isEmpty());
+ assertNotNull(result);
+ assertTrue(result.isEmpty());
}
@@ -167,7 +171,7 @@ public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
matcher.initialize();
final Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attribute, filterContext);
- Assert.assertNull(result);
+ assertNull(result);
}
@Test(expectedExceptions = {ComponentInitializationException.class}) public void emptyInput()
@@ -183,4 +187,4 @@ public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
return matcher;
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java
index 8510617..4ef81c6 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java
@@ -17,21 +17,17 @@
package net.shibboleth.idp.attribute.filter.matcher.saml.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import net.shibboleth.idp.attribute.AttributeEncoder;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
-import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
-import net.shibboleth.idp.attribute.filter.matcher.saml.impl.AttributeInMetadataMatcher;
-import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2StringAttributeEncoder;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.opensaml.core.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
@@ -44,10 +40,17 @@ import org.opensaml.saml.saml2.core.Attribute;
import org.opensaml.saml.saml2.core.AttributeValue;
import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
import org.opensaml.saml.saml2.metadata.RequestedAttribute;
-import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.AttributeEncoder;
+import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
+import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
+import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2StringAttributeEncoder;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/**
* Tests for {@link AttributeInMetadataMatcher}
*/
@@ -113,22 +116,22 @@ public class AttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCase {
@Test public void getters() throws ComponentInitializationException {
AttributeInMetadataMatcher matcher = makeMatcher("test", true, true, null, null);
- Assert.assertTrue(matcher.getMatchIfMetadataSilent());
- Assert.assertTrue(matcher.getOnlyIfRequired());
- Assert.assertNull(matcher.getAttributeName());
- Assert.assertNull(matcher.getAttributeNameFormat());
+ assertTrue(matcher.getMatchIfMetadataSilent());
+ assertTrue(matcher.getOnlyIfRequired());
+ assertNull(matcher.getAttributeName());
+ assertNull(matcher.getAttributeNameFormat());
matcher = makeMatcher("test", false, false, null, null);
- Assert.assertFalse(matcher.getMatchIfMetadataSilent());
- Assert.assertFalse(matcher.getOnlyIfRequired());
- Assert.assertNull(matcher.getAttributeName());
- Assert.assertNull(matcher.getAttributeNameFormat());
+ assertFalse(matcher.getMatchIfMetadataSilent());
+ assertFalse(matcher.getOnlyIfRequired());
+ assertNull(matcher.getAttributeName());
+ assertNull(matcher.getAttributeNameFormat());
matcher = makeMatcher("test", false, true, "foo", "bar");
- Assert.assertFalse(matcher.getMatchIfMetadataSilent());
- Assert.assertTrue(matcher.getOnlyIfRequired());
- Assert.assertEquals(matcher.getAttributeName(), "foo");
- Assert.assertEquals(matcher.getAttributeNameFormat(), "bar");
+ assertFalse(matcher.getMatchIfMetadataSilent());
+ assertTrue(matcher.getOnlyIfRequired());
+ assertEquals(matcher.getAttributeName(), "foo");
+ assertEquals(matcher.getAttributeNameFormat(), "bar");
}
@Test public void noRequested() throws ComponentInitializationException {
@@ -139,12 +142,12 @@ public class AttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCase {
Set<IdPAttributeValue<?>> result =
makeMatcher("test", true, true, null, null).getMatchingValues(attr, new AttributeFilterContext());
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(DataSources.STRING_VALUE));
- Assert.assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(DataSources.STRING_VALUE));
+ assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
result = makeMatcher("test", false, true, null, null).getMatchingValues(attr, new AttributeFilterContext());
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
}
@Test public void wrongRequested() throws ComponentInitializationException {
@@ -155,15 +158,15 @@ public class AttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCase {
final AttributeInMetadataMatcher matcher = makeMatcher("test", true, false, null, null);
Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attr, makeContext(null));
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(DataSources.STRING_VALUE));
- Assert.assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(DataSources.STRING_VALUE));
+ assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
final RequestedAttribute wrongAttr = reqAttributeBuilder.buildObject();
wrongAttr.setName("wrongAttr");
wrongAttr.setNameFormat(Attribute.BASIC);
result = matcher.getMatchingValues(attr, makeContext(wrongAttr));
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
}
@Test public void otherRequested() throws ComponentInitializationException {
@@ -178,9 +181,9 @@ public class AttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCase {
wrongAttr.setNameFormat(Attribute.BASIC);
final Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attr, makeContext(wrongAttr));
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(DataSources.STRING_VALUE));
- Assert.assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(DataSources.STRING_VALUE));
+ assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
}
@@ -196,12 +199,12 @@ public class AttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCase {
Set<IdPAttributeValue<?>> result = makeMatcher("test", false, false, null, null).getMatchingValues(attr, context);
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(DataSources.STRING_VALUE));
- Assert.assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(DataSources.STRING_VALUE));
+ assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
result = makeMatcher("test", false, true, null, null).getMatchingValues(attr, context);
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
}
@Test public void values() throws ComponentInitializationException {
@@ -220,8 +223,8 @@ public class AttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCase {
final AttributeFilterContext context = makeContext(req);
Set<IdPAttributeValue<?>> result = makeMatcher("test", false, true, null, null).getMatchingValues(attr, context);
- Assert.assertEquals(result.size(), 1);
- Assert.assertTrue(result.contains(DataSources.STRING_VALUE));
+ assertEquals(result.size(), 1);
+ assertTrue(result.contains(DataSources.STRING_VALUE));
}
@Test public void multiValues() throws ComponentInitializationException {
@@ -247,9 +250,9 @@ public class AttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCase {
setRequestedAttributesInContext(context, Collections.singletonList(req));
Set<IdPAttributeValue<?>> result = makeMatcher("test", false, true, null, null).getMatchingValues(attr, context);
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(DataSources.STRING_VALUE));
- Assert.assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(DataSources.STRING_VALUE));
+ assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/MappedAttributeInMetadataMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/MappedAttributeInMetadataMatcherTest.java
index f9f3e9b..82f1a23 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/MappedAttributeInMetadataMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/MappedAttributeInMetadataMatcherTest.java
@@ -17,19 +17,15 @@
package net.shibboleth.idp.attribute.filter.matcher.saml.impl;
+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.Collections;
import java.util.List;
import java.util.Set;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.attribute.IdPRequestedAttribute;
-import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
-import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
-import net.shibboleth.idp.saml.attribute.mapping.AttributesMapContainer;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.opensaml.core.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
@@ -37,13 +33,20 @@ import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.common.messaging.context.AttributeConsumingServiceContext;
import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
-import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
+import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.idp.attribute.IdPRequestedAttribute;
+import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
+import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
+import net.shibboleth.idp.saml.attribute.mapping.AttributesMapContainer;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/**
* Tests for {@link MappedAttributeInMetadataMatcher}.
*/
@@ -107,12 +110,12 @@ public class MappedAttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCa
@Test public void getters() throws ComponentInitializationException {
MappedAttributeInMetadataMatcher matcher = makeMatcher("test", true, true);
- Assert.assertTrue(matcher.getMatchIfMetadataSilent());
- Assert.assertTrue(matcher.getOnlyIfRequired());
+ assertTrue(matcher.getMatchIfMetadataSilent());
+ assertTrue(matcher.getOnlyIfRequired());
matcher = makeMatcher("test", false, false);
- Assert.assertFalse(matcher.getMatchIfMetadataSilent());
- Assert.assertFalse(matcher.getOnlyIfRequired());
+ assertFalse(matcher.getMatchIfMetadataSilent());
+ assertFalse(matcher.getOnlyIfRequired());
}
@Test public void noRequested() throws ComponentInitializationException {
@@ -123,12 +126,12 @@ public class MappedAttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCa
Set<IdPAttributeValue<?>> result =
makeMatcher("test", true, true).getMatchingValues(attr, new AttributeFilterContext());
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(DataSources.STRING_VALUE));
- Assert.assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(DataSources.STRING_VALUE));
+ assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
result = makeMatcher("test", false, true).getMatchingValues(attr, new AttributeFilterContext());
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
}
@Test public void wrongRequested() throws ComponentInitializationException {
@@ -139,12 +142,12 @@ public class MappedAttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCa
final MappedAttributeInMetadataMatcher matcher = makeMatcher("test", true, true);
Set<IdPAttributeValue<?>> result = matcher.getMatchingValues(attr, makeContext(null));
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(DataSources.STRING_VALUE));
- Assert.assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(DataSources.STRING_VALUE));
+ assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
result = matcher.getMatchingValues(attr, makeContext(new IdPRequestedAttribute("wrongAttr")));
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
}
@Test public void isRequiredOnly() throws ComponentInitializationException {
@@ -159,12 +162,12 @@ public class MappedAttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCa
Set<IdPAttributeValue<?>> result = makeMatcher("test", false, false).getMatchingValues(attr, context);
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(DataSources.STRING_VALUE));
- Assert.assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(DataSources.STRING_VALUE));
+ assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
result = makeMatcher("test", false, true).getMatchingValues(attr, context);
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
}
@Test public void values() throws ComponentInitializationException {
@@ -179,8 +182,8 @@ public class MappedAttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCa
AttributeFilterContext context = makeContext(required);
Set<IdPAttributeValue<?>> result = makeMatcher("test", false, true).getMatchingValues(attr, context);
- Assert.assertEquals(result.size(), 1);
- Assert.assertTrue(result.contains(DataSources.STRING_VALUE));
+ assertEquals(result.size(), 1);
+ assertTrue(result.contains(DataSources.STRING_VALUE));
}
@Test public void valuesButNoConvert() throws ComponentInitializationException {
@@ -191,7 +194,7 @@ public class MappedAttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCa
AttributeFilterContext context = makeContext("attr", null);
Set<IdPAttributeValue<?>> result = makeMatcher("test", false, true).getMatchingValues(attr, context);
- Assert.assertTrue(result.isEmpty());
+ assertTrue(result.isEmpty());
}
@Test public void multiValues() throws ComponentInitializationException {
@@ -215,9 +218,9 @@ public class MappedAttributeInMetadataMatcherTest extends OpenSAMLInitBaseTestCa
setRequestedAttributesInContext(context, multimap);
Set<IdPAttributeValue<?>> result = makeMatcher("test", false, true).getMatchingValues(attr, context);
- Assert.assertEquals(result.size(), 2);
- Assert.assertTrue(result.contains(DataSources.STRING_VALUE));
- Assert.assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
+ assertEquals(result.size(), 2);
+ assertTrue(result.contains(DataSources.STRING_VALUE));
+ assertTrue(result.contains(DataSources.NON_MATCH_STRING_VALUE));
}
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerPolicyRuleTest.java
index 0ce1a3a..8fae726 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerPolicyRuleTest.java
@@ -17,14 +17,16 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Tests for {@link AttributeIssuerPolicyRule}.
*/
@@ -47,7 +49,7 @@ public class AttributeIssuerPolicyRuleTest {
try {
new AttributeIssuerPolicyRule().matches(null);
- Assert.fail();
+ fail();
} catch (UninitializedComponentException ex) {
// OK
}
@@ -55,29 +57,29 @@ public class AttributeIssuerPolicyRuleTest {
@Test public void testUnpopulated()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
+ assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
}
@Test public void testNoIssuer()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(DataSources.populatedFilterContext(null, null, null)), Tristate.FAIL);
+ assertEquals(getMatcher().matches(DataSources.populatedFilterContext(null, null, null)), Tristate.FAIL);
}
@Test public void testCaseSensitive() throws ComponentInitializationException {
final AttributeIssuerPolicyRule matcher = getMatcher();
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "wibble", null)), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "ISSUER", null)), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "issuer", null)), Tristate.TRUE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "wibble", null)), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "ISSUER", null)), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "issuer", null)), Tristate.TRUE);
}
@Test public void testCaseInsensitive() throws ComponentInitializationException {
final AttributeIssuerPolicyRule matcher = getMatcher(false);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "wibble", null)), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "ISSUER", null)), Tristate.TRUE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "issuer", null)), Tristate.TRUE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "wibble", null)), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "ISSUER", null)), Tristate.TRUE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "issuer", null)), Tristate.TRUE);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerRegexpPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerRegexpPolicyRuleTest.java
index 5b80a81..7229119 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerRegexpPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerRegexpPolicyRuleTest.java
@@ -17,15 +17,16 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
-import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.AttributeIssuerRegexpPolicyRule;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Tests for {@link AttributeIssuerRegexpPolicyRule}.
*/
@@ -43,25 +44,25 @@ public class AttributeIssuerRegexpPolicyRuleTest {
try {
new AttributeIssuerRegexpPolicyRule().matches(null);
- Assert.fail();
+ fail();
} catch (UninitializedComponentException ex) {
// OK
}
AttributeIssuerRegexpPolicyRule matcher = getMatcher();
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "wibble", null)), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "ISSUER", null)), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "issuer", null)), Tristate.TRUE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "wibble", null)), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "ISSUER", null)), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "issuer", null)), Tristate.TRUE);
}
@Test public void testUnpopulated()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);;
+ assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);;
}
@Test public void testNoIssuer()
throws ComponentInitializationException{
- Assert.assertEquals(getMatcher().matches(DataSources.populatedFilterContext(null, null, null)), Tristate.FAIL);;
+ assertEquals(getMatcher().matches(DataSources.populatedFilterContext(null, null, null)), Tristate.FAIL);;
}
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterPolicyRuleTest.java
index ea3fd59..7f17eb5 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterPolicyRuleTest.java
@@ -17,14 +17,16 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Tests for {@link AttributeRequesterPolicyRule}.
*/
@@ -48,7 +50,7 @@ public class AttributeRequesterPolicyRuleTest {
try {
new AttributeRequesterPolicyRule().matches(null);
- Assert.fail();
+ fail();
} catch (UninitializedComponentException ex) {
// OK
}
@@ -56,29 +58,29 @@ public class AttributeRequesterPolicyRuleTest {
@Test public void testUnpopulated()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
+ assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
}
@Test public void testNoRequester()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(DataSources.populatedFilterContext(null, null, null)), Tristate.FAIL);
+ assertEquals(getMatcher().matches(DataSources.populatedFilterContext(null, null, null)), Tristate.FAIL);
}
@Test public void testCaseSensitive() throws ComponentInitializationException {
final AttributeRequesterPolicyRule matcher = getMatcher();
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "wibble")), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "REQUESTER")), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "requester")), Tristate.TRUE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "wibble")), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "REQUESTER")), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "requester")), Tristate.TRUE);
}
@Test public void testCaseInsensitive() throws ComponentInitializationException {
final AttributeRequesterPolicyRule matcher = getMatcher(false);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "wibble")), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "REQUESTER")), Tristate.TRUE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "requester")), Tristate.TRUE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "wibble")), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "REQUESTER")), Tristate.TRUE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "requester")), Tristate.TRUE);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterRegexpPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterRegexpPolicyRuleTest.java
index ef45b2d..70333ed 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterRegexpPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterRegexpPolicyRuleTest.java
@@ -17,15 +17,16 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
-import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.AttributeRequesterRegexpPolicyRule;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Tests for {@link AttributeRequesterRegexpPolicyRule}.
*/
@@ -43,25 +44,25 @@ public class AttributeRequesterRegexpPolicyRuleTest {
try {
new AttributeRequesterRegexpPolicyRule().matches(null);
- Assert.fail();
+ fail();
} catch (UninitializedComponentException ex) {
// OK
}
AttributeRequesterRegexpPolicyRule matcher = getMatcher();
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "wibble")), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "REQUESTER")), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "requester")), Tristate.TRUE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "wibble")), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "REQUESTER")), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "requester")), Tristate.TRUE);
}
@Test public void testUnpopulated()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
+ assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
}
@Test public void testNoRequester()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(DataSources.populatedFilterContext(null, null, null)), Tristate.FAIL);
+ assertEquals(getMatcher().matches(DataSources.populatedFilterContext(null, null, null)), Tristate.FAIL);
}
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRuleTest.java
index 3c37869..b64bae0 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRuleTest.java
@@ -17,20 +17,21 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
import java.util.Collections;
import java.util.HashSet;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
-import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.NumOfAttributeValuesPolicyRule;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link NumOfAttributeValuesPolicyRule}.
*/
@@ -43,7 +44,7 @@ public class NumOfAttributeValuesPolicyRuleTest {
@Test public void setterGetterInit() throws ComponentInitializationException {
NumOfAttributeValuesPolicyRule rule = new NumOfAttributeValuesPolicyRule();
- Assert.assertNull(rule.getAttributeId());
+ assertNull(rule.getAttributeId());
rule.setId("id");
rule.setAttributeId(attrId);
@@ -52,9 +53,9 @@ public class NumOfAttributeValuesPolicyRuleTest {
rule.initialize();
- Assert.assertEquals(rule.getAttributeId(), attrId);
- Assert.assertEquals(rule.getMaximum(), testMax);
- Assert.assertEquals(rule.getMinimum(), testMin);
+ assertEquals(rule.getAttributeId(), attrId);
+ assertEquals(rule.getMaximum(), testMax);
+ assertEquals(rule.getMinimum(), testMin);
}
@Test(expectedExceptions={ComponentInitializationException.class,})
@@ -128,11 +129,11 @@ public class NumOfAttributeValuesPolicyRuleTest {
rule.initialize();
- Assert.assertEquals(rule.matches(manufactureWith(testMin-1)), Tristate.FALSE);
- Assert.assertEquals(rule.matches(manufactureWith(testMin)), Tristate.TRUE);
- Assert.assertEquals(rule.matches(manufactureWith(testMax)), Tristate.TRUE);
- Assert.assertEquals(rule.matches(manufactureWith(testMax+1)), Tristate.FALSE);
+ assertEquals(rule.matches(manufactureWith(testMin-1)), Tristate.FALSE);
+ assertEquals(rule.matches(manufactureWith(testMin)), Tristate.TRUE);
+ assertEquals(rule.matches(manufactureWith(testMax)), Tristate.TRUE);
+ assertEquals(rule.matches(manufactureWith(testMax+1)), Tristate.FALSE);
- Assert.assertEquals(rule.matches(manufactureWith("foo", testMin)), Tristate.FALSE);
+ assertEquals(rule.matches(manufactureWith("foo", testMin)), Tristate.FALSE);
}
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java
index 3deeed1..2c02e99 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java
@@ -17,19 +17,21 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
+import static org.testng.Assert.assertEquals;
+
import java.util.function.Function;
import java.util.function.Predicate;
import javax.annotation.Nullable;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
/**
* test for {@link PredicatePolicyRule}.
@@ -42,7 +44,7 @@ public class PredicatePolicyRuleTest {
rule.setProfileContextStrategy(new Func());
rule.setRulePredicate(new TestPred(true));
rule.initialize();
- Assert.assertEquals(rule.matches(null), Tristate.TRUE);
+ assertEquals(rule.matches(null), Tristate.TRUE);
}
@Test public void falseTest() throws ComponentInitializationException {
@@ -52,7 +54,7 @@ public class PredicatePolicyRuleTest {
rule.initialize();
ProfileRequestContext pc = new ProfileRequestContext<>();
RelyingPartyContext rpc = pc.getSubcontext(RelyingPartyContext.class, true);
- Assert.assertEquals(rule.matches(rpc.getSubcontext(AttributeFilterContext.class, true)), Tristate.FALSE);
+ assertEquals(rule.matches(rpc.getSubcontext(AttributeFilterContext.class, true)), Tristate.FALSE);
}
@Test public void navigateFail() throws ComponentInitializationException {
@@ -60,7 +62,7 @@ public class PredicatePolicyRuleTest {
rule.setId("id");
rule.setRulePredicate(new TestPred(true));
rule.initialize();
- Assert.assertEquals(rule.matches(null), Tristate.FAIL);
+ assertEquals(rule.matches(null), Tristate.FAIL);
}
@Test public void throwFail() throws ComponentInitializationException {
@@ -69,7 +71,7 @@ public class PredicatePolicyRuleTest {
rule.setProfileContextStrategy(new Func());
rule.setRulePredicate(new ThrowPred());
rule.initialize();
- Assert.assertEquals(rule.matches(null), Tristate.FAIL);
+ assertEquals(rule.matches(null), Tristate.FAIL);
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNamePolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNamePolicyRuleTest.java
index 80f9e29..026681d 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNamePolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNamePolicyRuleTest.java
@@ -17,13 +17,16 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
/**
* Tests for {@link PrincipalNamePolicyRule}.
@@ -43,7 +46,7 @@ public class PrincipalNamePolicyRuleTest {
try {
new PrincipalNamePolicyRule().matches(null);
- Assert.fail();
+ fail();
} catch (UninitializedComponentException ex) {
// OK
}
@@ -51,21 +54,21 @@ public class PrincipalNamePolicyRuleTest {
@Test public void testUnpopulated() throws ComponentInitializationException {
final PrincipalNamePolicyRule matcher = getMatcher(true);
- Assert.assertEquals(matcher.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
+ assertEquals(matcher.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
}
@Test public void testNoPrincipal() throws ComponentInitializationException {
final PrincipalNamePolicyRule matcher = getMatcher(true);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, null)), Tristate.FAIL);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, null)), Tristate.FAIL);
}
@Test public void testCaseSensitive() throws ComponentInitializationException {
PrincipalNamePolicyRule matcher = getMatcher(true);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext("wibble", null, null)), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext("PRINCIPAL", null, null)), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext("principal", null, null)), Tristate.TRUE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext("wibble", null, null)), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext("PRINCIPAL", null, null)), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext("principal", null, null)), Tristate.TRUE);
}
@@ -73,8 +76,8 @@ public class PrincipalNamePolicyRuleTest {
PrincipalNamePolicyRule matcher = getMatcher(false);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext("wibble", null, null)), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext("PRINCIPAL", null, null)), Tristate.TRUE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext("principal", null, null)), Tristate.TRUE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext("wibble", null, null)), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext("PRINCIPAL", null, null)), Tristate.TRUE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext("principal", null, null)), Tristate.TRUE);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNameRegexpPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNameRegexpPolicyRuleTest.java
index 8571278..d5cf2e9 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNameRegexpPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNameRegexpPolicyRuleTest.java
@@ -17,15 +17,16 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
-import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.PrincipalNameRegexpPolicyRule;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* Tests for {@link PrincipalNameRegexpPolicyRule}.
*/
@@ -43,26 +44,26 @@ public class PrincipalNameRegexpPolicyRuleTest {
try {
new PrincipalNameRegexpPolicyRule().matches(null);
- Assert.fail();
+ fail();
} catch (UninitializedComponentException ex) {
// OK
}
final PrincipalNameRegexpPolicyRule matcher = getMatcher();
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext("wibble", null, null)), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext("PRINCIPAL", null, null)), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext("principal", null, null)), Tristate.TRUE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext("wibble", null, null)), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext("PRINCIPAL", null, null)), Tristate.FALSE);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext("principal", null, null)), Tristate.TRUE);
}
@Test public void testNoPrincipal() throws ComponentInitializationException {
final PrincipalNameRegexpPolicyRule matcher = getMatcher();
- Assert.assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, null)), Tristate.FAIL);
+ assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, null)), Tristate.FAIL);
}
@Test public void testUnpopulated() throws ComponentInitializationException {
final PrincipalNameRegexpPolicyRule matcher = getMatcher();
- Assert.assertEquals(matcher.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
+ assertEquals(matcher.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
}
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java
index a1fcc71..e0251b3 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java
@@ -17,19 +17,21 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
-import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
-import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
-import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
import java.util.Arrays;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.context.ProxiedRequesterContext;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
+import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
+import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
+
/**
* Tests for {@link ProxiedRequesterPolicyRule}.
*/
@@ -53,7 +55,7 @@ public class ProxiedRequesterPolicyRuleTest {
try {
new ProxiedRequesterPolicyRule().matches(null);
- Assert.fail();
+ fail();
} catch (UninitializedComponentException ex) {
// OK
}
@@ -61,12 +63,12 @@ public class ProxiedRequesterPolicyRuleTest {
@Test public void testUnpopulated()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
+ assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
}
@Test public void testNoProxies()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(DataSources.populatedFilterContext(null, null, "foo")), Tristate.FALSE);
+ assertEquals(getMatcher().matches(DataSources.populatedFilterContext(null, null, "foo")), Tristate.FALSE);
}
@Test public void testCaseSensitive() throws ComponentInitializationException {
@@ -78,10 +80,10 @@ public class ProxiedRequesterPolicyRuleTest {
new ChildContextLookup<AttributeFilterContext,ProxiedRequesterContext>(ProxiedRequesterContext.class));
ctx.getSubcontext(ProxiedRequesterContext.class, true).getRequesters().addAll(Arrays.asList("foo", "bar"));
- Assert.assertEquals(matcher.matches(ctx), Tristate.FALSE);
+ assertEquals(matcher.matches(ctx), Tristate.FALSE);
ctx.getSubcontext(ProxiedRequesterContext.class).getRequesters().add("requester");
- Assert.assertEquals(matcher.matches(ctx), Tristate.TRUE);
+ assertEquals(matcher.matches(ctx), Tristate.TRUE);
}
@Test public void testCaseInsensitive() throws ComponentInitializationException {
@@ -93,10 +95,10 @@ public class ProxiedRequesterPolicyRuleTest {
new ChildContextLookup<AttributeFilterContext,ProxiedRequesterContext>(ProxiedRequesterContext.class));
ctx.getSubcontext(ProxiedRequesterContext.class, true).getRequesters().addAll(Arrays.asList("foo", "bar"));
- Assert.assertEquals(matcher.matches(ctx), Tristate.FALSE);
+ assertEquals(matcher.matches(ctx), Tristate.FALSE);
ctx.getSubcontext(ProxiedRequesterContext.class).getRequesters().add("REQUESTER");
- Assert.assertEquals(matcher.matches(ctx), Tristate.TRUE);
+ assertEquals(matcher.matches(ctx), Tristate.TRUE);
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java
index aad7249..375f90f 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
-
-import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
-import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
-import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
+package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
import java.util.Arrays;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.context.ProxiedRequesterContext;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
+import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
+import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
+
/**
* Tests for {@link ProxiedRequesterRegexpPolicyRule}.
*/
@@ -47,7 +47,7 @@ public class ProxiedRequesterRegexpPolicyRuleTest {
try {
new ProxiedRequesterRegexpPolicyRule().matches(null);
- Assert.fail();
+ fail();
} catch (UninitializedComponentException ex) {
// OK
}
@@ -55,12 +55,12 @@ public class ProxiedRequesterRegexpPolicyRuleTest {
@Test public void testUnpopulated()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
+ assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
}
@Test public void testNoRequester()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(DataSources.populatedFilterContext(null, null, "foo")), Tristate.FALSE);
+ assertEquals(getMatcher().matches(DataSources.populatedFilterContext(null, null, "foo")), Tristate.FALSE);
}
@Test public void testAll() throws ComponentInitializationException {
@@ -72,10 +72,10 @@ public class ProxiedRequesterRegexpPolicyRuleTest {
new ChildContextLookup<AttributeFilterContext,ProxiedRequesterContext>(ProxiedRequesterContext.class));
ctx.getSubcontext(ProxiedRequesterContext.class, true).getRequesters().addAll(Arrays.asList("foo", "bar"));
- Assert.assertEquals(matcher.matches(ctx), Tristate.FALSE);
+ assertEquals(matcher.matches(ctx), Tristate.FALSE);
ctx.getSubcontext(ProxiedRequesterContext.class).getRequesters().add("requester");
- Assert.assertEquals(matcher.matches(ctx), Tristate.TRUE);
+ assertEquals(matcher.matches(ctx), Tristate.TRUE);
}
-}
\ No newline at end of file
+}
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 8e01427..2063cb1 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
@@ -17,9 +17,19 @@
package net.shibboleth.idp.attribute.filter.policyrule.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotSame;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
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.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.idp.attribute.filter.matcher.impl.AbstractMatcherPolicyRuleTest;
@@ -34,11 +44,6 @@ import net.shibboleth.utilities.java.support.component.UnmodifiableComponentExce
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
/** {@link ScriptedPolicyRule} unit test. */
@ThreadSafe
public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
@@ -91,14 +96,14 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
try {
rule.matches(null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
try {
newScriptedPolicyRule(null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
@@ -109,7 +114,7 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(filterContext), Tristate.FAIL);
+ assertEquals(rule.matches(filterContext), Tristate.FAIL);
}
@Test public void testInvalidReturnObjectValue() throws Exception {
@@ -117,7 +122,7 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(filterContext), Tristate.FAIL);
+ assertEquals(rule.matches(filterContext), Tristate.FAIL);
}
@Test public void testInitTeardown() throws ComponentInitializationException {
@@ -129,7 +134,7 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
} catch (final UninitializedComponentException e) {
thrown = true;
}
- Assert.assertTrue(thrown, "matches before init");
+ assertTrue(thrown, "matches before init");
rule.setId("Test");
rule.initialize();
@@ -150,7 +155,7 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
} catch (final DestroyedComponentException e) {
thrown = true;
}
- Assert.assertTrue(thrown, "init after destroy");
+ assertTrue(thrown, "init after destroy");
thrown = false;
try {
@@ -158,7 +163,7 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
} catch (final DestroyedComponentException e) {
thrown = true;
}
- Assert.assertTrue(thrown, "matches after destroy");
+ assertTrue(thrown, "matches after destroy");
}
@@ -168,19 +173,19 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
rule.toString();
- Assert.assertFalse(rule.equals(null));
- Assert.assertTrue(rule.equals(rule));
- Assert.assertFalse(rule.equals(this));
+ assertFalse(rule.equals(null));
+ assertTrue(rule.equals(rule));
+ assertFalse(rule.equals(this));
ScriptedPolicyRule other = newScriptedPolicyRule(trueReturnScript);
- Assert.assertTrue(rule.equals(other));
- Assert.assertEquals(rule.hashCode(), other.hashCode());
+ assertTrue(rule.equals(other));
+ assertEquals(rule.hashCode(), other.hashCode());
other = newScriptedPolicyRule(nullReturnScript);
- Assert.assertFalse(rule.equals(other));
- Assert.assertNotSame(rule.hashCode(), other.hashCode());
+ assertFalse(rule.equals(other));
+ assertNotSame(rule.hashCode(), other.hashCode());
}
@@ -192,24 +197,24 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
rule = newScriptedPolicyRule(trueReturnScript);
rule.setId("test");
rule.initialize();
- Assert.assertEquals(rule.matches(filterContext), Tristate.TRUE);
+ assertEquals(rule.matches(filterContext), Tristate.TRUE);
rule = newScriptedPolicyRule(customReturnScript);
rule.setCustomObject(Boolean.valueOf(true));
rule.setId("test");
rule.initialize();
- Assert.assertEquals(rule.matches(filterContext), Tristate.TRUE);
+ assertEquals(rule.matches(filterContext), Tristate.TRUE);
rule = newScriptedPolicyRule(falseReturnScript);
rule.setId("test");
rule.initialize();
- Assert.assertEquals(rule.matches(filterContext), Tristate.FALSE);
+ assertEquals(rule.matches(filterContext), Tristate.FALSE);
rule = newScriptedPolicyRule(prcReturnScript);
rule.setId("test");
rule.initialize();
- Assert.assertEquals(rule.matches(filterContext), Tristate.FAIL);
+ assertEquals(rule.matches(filterContext), Tristate.FAIL);
final ProfileRequestContext<Object, Object> prc = new ProfileRequestContext<>();
prc.getSubcontext(RelyingPartyContext.class, true).addSubcontext(filterContext);
@@ -218,17 +223,17 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
final Subject subject = new Subject();
sc.getAuthenticationResults().put("one", new AuthenticationResult("1", subject));
- Assert.assertEquals(rule.matches(filterContext), Tristate.TRUE);
+ assertEquals(rule.matches(filterContext), Tristate.TRUE);
final ScriptedPolicyRule scRule = newScriptedPolicyRule(scReturnScript);
scRule.setId("ScTest");
scRule.initialize();
subject.getPrincipals().add(new AuthenticationMethodPrincipal("BAR"));
- Assert.assertEquals(scRule.matches(filterContext), Tristate.FALSE);
+ assertEquals(scRule.matches(filterContext), Tristate.FALSE);
subject.getPrincipals().clear();
subject.getPrincipals().add(new AuthenticationMethodPrincipal("FOO"));
- Assert.assertEquals(scRule.matches(filterContext), Tristate.TRUE);
+ assertEquals(scRule.matches(filterContext), Tristate.TRUE);
}
static public ScriptedPolicyRule newScriptedPolicyRule(final EvaluableScript script) {
@@ -238,4 +243,4 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java
index 327a956..21ae67f 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java
@@ -17,6 +17,9 @@
package net.shibboleth.idp.attribute.filter.policyrule.logic.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -24,6 +27,9 @@ import java.util.List;
import javax.annotation.Nullable;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
@@ -32,10 +38,6 @@ import net.shibboleth.utilities.java.support.component.DestroyedComponentExcepti
import net.shibboleth.utilities.java.support.component.DestructableComponent;
import net.shibboleth.utilities.java.support.component.InitializableComponent;
-import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/** unit tests for {@link AbstractComposedPolicyRule}. */
public class AbstractComposedPolicyRuleTest {
@@ -57,7 +59,7 @@ public class AbstractComposedPolicyRuleTest {
thrown = true;
}
- Assert.assertTrue(thrown, "Initialize after destroy");
+ assertTrue(thrown, "Initialize after destroy");
for (int i = 0; i < 2;i++) {
firstList.add(new TestMatcher());
@@ -65,7 +67,7 @@ public class AbstractComposedPolicyRuleTest {
firstList.add(null);
rule = new ComposedPolicyRule(firstList);
- Assert.assertEquals(firstList.size()-1, rule.getComposedRules().size());
+ assertEquals(firstList.size()-1, rule.getComposedRules().size());
thrown = false;
try {
@@ -73,7 +75,7 @@ public class AbstractComposedPolicyRuleTest {
} catch (final UnsupportedOperationException e) {
thrown = true;
}
- Assert.assertTrue(thrown, "Set into the returned list");
+ assertTrue(thrown, "Set into the returned list");
rule.setId("Test");
rule.initialize();
@@ -85,8 +87,8 @@ public class AbstractComposedPolicyRuleTest {
public void testParams() throws ComponentInitializationException {
ComposedPolicyRule rule = new ComposedPolicyRule(null);
- Assert.assertTrue(rule.getComposedRules().isEmpty(), "Initial state - no matchers");
- Assert.assertTrue(rule.getComposedRules().isEmpty(), "Add null - no matchers");
+ assertTrue(rule.getComposedRules().isEmpty(), "Initial state - no matchers");
+ assertTrue(rule.getComposedRules().isEmpty(), "Add null - no matchers");
final List<PolicyRequirementRule> list = new ArrayList<>();
@@ -95,7 +97,7 @@ public class AbstractComposedPolicyRuleTest {
}
rule = new ComposedPolicyRule(list);
- Assert.assertTrue(rule.getComposedRules().isEmpty(), "Add List<null> - no matchers");
+ assertTrue(rule.getComposedRules().isEmpty(), "Add List<null> - no matchers");
list.set(2, new TestMatcher());
list.set(3, new TestMatcher());
@@ -106,16 +108,16 @@ public class AbstractComposedPolicyRuleTest {
list.set(19, new TestMatcher());
list.set(23, new TestMatcher());
list.set(29, new TestMatcher());
- Assert.assertTrue(rule.getComposedRules().isEmpty(), "Change to input list - no matchers");
+ assertTrue(rule.getComposedRules().isEmpty(), "Change to input list - no matchers");
rule = new ComposedPolicyRule(list);
- Assert.assertEquals(rule.getComposedRules().size(), 9, "Add a List with nulls");
+ assertEquals(rule.getComposedRules().size(), 9, "Add a List with nulls");
list.clear();
- Assert.assertEquals(rule.getComposedRules().size(), 9, "Change to input list");
+ assertEquals(rule.getComposedRules().size(), 9, "Change to input list");
rule = new ComposedPolicyRule(list);
- Assert.assertTrue(rule.getComposedRules().isEmpty(), "Empty list");
+ assertTrue(rule.getComposedRules().isEmpty(), "Empty list");
LoggerFactory.getLogger(AbstractComposedPolicyRuleTest.class).debug(rule.toString());
}
@@ -153,4 +155,4 @@ public class AbstractComposedPolicyRuleTest {
}
}
-}
\ No newline at end of file
+}
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 039fcc6..6d96f2a 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
@@ -17,12 +17,18 @@
package net.shibboleth.idp.attribute.filter.policyrule.logic.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import javax.annotation.Nullable;
+import org.testng.annotations.BeforeTest;
+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.matcher.impl.AbstractMatcherPolicyRuleTest;
@@ -31,10 +37,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NullableEleme
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
/** {@link AndPolicyRule} unit test. */
public class AndPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
@@ -50,7 +52,7 @@ public class AndPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
try {
rule.matches(null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
@@ -67,39 +69,39 @@ public class AndPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
AndPolicyRule rule = newAndPolicyRule(Arrays.asList(PolicyRequirementRule.MATCHES_NONE, PolicyRequirementRule.MATCHES_NONE));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
rule = newAndPolicyRule(Arrays.asList(PolicyRequirementRule.MATCHES_ALL, PolicyRequirementRule.MATCHES_NONE));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
rule = newAndPolicyRule(Arrays.asList(PolicyRequirementRule.MATCHES_ALL, PolicyRequirementRule.MATCHES_ALL));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.TRUE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.TRUE);
rule = newAndPolicyRule(Arrays.asList(PolicyRequirementRule.MATCHES_ALL, PolicyRequirementRule.REQUIREMENT_RULE_FAILS));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
}
@Test public void testSingletons() throws ComponentInitializationException {
AndPolicyRule rule = newAndPolicyRule(Collections.singletonList(PolicyRequirementRule.MATCHES_NONE));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
rule = newAndPolicyRule(Collections.singletonList(PolicyRequirementRule.REQUIREMENT_RULE_FAILS));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
rule = newAndPolicyRule(Collections.singletonList(PolicyRequirementRule.MATCHES_ALL));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.TRUE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.TRUE);
}
public static AndPolicyRule newAndPolicyRule(@Nullable @NullableElements
@@ -108,4 +110,4 @@ public class AndPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
rule.setSubsidiaries(composedRules);
return rule;
}
-}
\ No newline at end of file
+}
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 24f276d..9c84ff6 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
@@ -17,6 +17,14 @@
package net.shibboleth.idp.attribute.filter.policyrule.logic.impl;
+import static org.testng.Assert.assertEquals;
+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.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.matcher.impl.AbstractMatcherPolicyRuleTest;
@@ -26,11 +34,6 @@ import net.shibboleth.utilities.java.support.component.DestroyedComponentExcepti
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
/** Test the {@link NotPolicyRule} matcher. */
public class NotPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
@@ -43,19 +46,19 @@ public class NotPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
rule.setId("NullArgs");
rule.initialize();
- Assert.assertEquals(rule.getNegatedRule(), PolicyRequirementRule.MATCHES_ALL);
+ assertEquals(rule.getNegatedRule(), PolicyRequirementRule.MATCHES_ALL);
LoggerFactory.getLogger(AbstractComposedPolicyRuleTest.class).debug(rule.toString());
try {
rule.matches(null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
try {
newNotPolicyRule(null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
@@ -67,12 +70,12 @@ public class NotPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
try {
rule.matches(filterContext);
- Assert.fail();
+ fail();
} catch (final UninitializedComponentException e) {
// expect this
}
- Assert.assertFalse(inMatcher.isInitialized());
- Assert.assertFalse(inMatcher.isDestroyed());
+ assertFalse(inMatcher.isInitialized());
+ assertFalse(inMatcher.isDestroyed());
rule.setId("test");
rule.initialize();
@@ -91,17 +94,17 @@ public class NotPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
NotPolicyRule rule = newNotPolicyRule(PolicyRequirementRule.MATCHES_ALL);
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
rule = newNotPolicyRule(PolicyRequirementRule.MATCHES_NONE);
rule.setId("test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.TRUE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.TRUE);
rule = newNotPolicyRule(PolicyRequirementRule.REQUIREMENT_RULE_FAILS);
rule.setId("test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
}
public static NotPolicyRule newNotPolicyRule(final PolicyRequirementRule composedRule) {
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 42abc52..3259791 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
@@ -17,12 +17,18 @@
package net.shibboleth.idp.attribute.filter.policyrule.logic.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import javax.annotation.Nullable;
+import org.testng.annotations.BeforeTest;
+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.matcher.impl.AbstractMatcherPolicyRuleTest;
@@ -31,10 +37,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NullableEleme
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
/** {@link OrPolicyRule} unit test. */
public class OrPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
@@ -49,7 +51,7 @@ public class OrPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
try {
rule.matches(null);
- Assert.fail();
+ fail();
} catch (final ConstraintViolationException e) {
// expected this
}
@@ -67,47 +69,47 @@ public class OrPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
OrPolicyRule rule = newOrPolicyRule(Arrays.asList(PolicyRequirementRule.MATCHES_NONE, PolicyRequirementRule.MATCHES_NONE));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
rule = newOrPolicyRule(Arrays.asList(PolicyRequirementRule.MATCHES_NONE, null, PolicyRequirementRule.MATCHES_NONE));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
rule = newOrPolicyRule(Arrays.asList(PolicyRequirementRule.MATCHES_NONE, null, PolicyRequirementRule.MATCHES_ALL));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.TRUE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.TRUE);
rule = newOrPolicyRule(Arrays.asList(PolicyRequirementRule.MATCHES_NONE, null, PolicyRequirementRule.MATCHES_ALL,
PolicyRequirementRule.REQUIREMENT_RULE_FAILS));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.TRUE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.TRUE);
rule = newOrPolicyRule(Arrays.asList(PolicyRequirementRule.MATCHES_NONE, null, PolicyRequirementRule.MATCHES_NONE,
PolicyRequirementRule.REQUIREMENT_RULE_FAILS));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
}
@Test public void testSingletons() throws ComponentInitializationException {
OrPolicyRule rule = newOrPolicyRule(Collections.singletonList(PolicyRequirementRule.MATCHES_NONE));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
rule = newOrPolicyRule(Collections.singletonList(PolicyRequirementRule.REQUIREMENT_RULE_FAILS));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
rule = newOrPolicyRule(Collections.singletonList(PolicyRequirementRule.MATCHES_ALL));
rule.setId("Test");
rule.initialize();
- Assert.assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.TRUE);
+ assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.TRUE);
}
public static OrPolicyRule newOrPolicyRule(@Nullable @NullableElements
@@ -117,4 +119,4 @@ public class OrPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
return rule;
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeExactPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeExactPolicyRuleTest.java
index 27ea9d7..f7b14f4 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeExactPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeExactPolicyRuleTest.java
@@ -17,13 +17,14 @@
package net.shibboleth.idp.attribute.filter.policyrule.saml.impl;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link AttributeRequesterEntityAttributeExactPolicyRule}.
*/
@@ -47,9 +48,9 @@ public class AttributeRequesterEntityAttributeExactPolicyRuleTest extends BaseMe
@Test public void testValue() throws ComponentInitializationException {
AttributeRequesterEntityAttributeExactPolicyRule matcher = getMatcher();
- Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
+ assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
- Assert.assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
}
@@ -57,55 +58,55 @@ public class AttributeRequesterEntityAttributeExactPolicyRuleTest extends BaseMe
AttributeRequesterEntityAttributeExactPolicyRule matcher =
getMatcher("urn:example.org:entitlements", "urn:example.org:entitlements:1234", null);
- Assert.assertEquals(matcher.getValue(), "urn:example.org:entitlements:1234");
- Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
+ assertEquals(matcher.getValue(), "urn:example.org:entitlements:1234");
+ assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
- Assert.assertEquals(matcher.matches(metadataContext(wikiEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(wikiEntity, "Principal")), Tristate.FALSE);
matcher = getMatcher("urn:example.org:entitlements", "urn:example.org:entitlements:1234", "foo");
- Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
matcher =
getMatcher("urn:example.org:entitlements", "urn:example.org:entitlements:1234",
"urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
- Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
+ assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
- Assert.assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
}
@Test public void testNoMatch() throws ComponentInitializationException {
AttributeRequesterEntityAttributeExactPolicyRule matcher =
getMatcher("urn:example.org:policies", "urn:example.org:policy:1235", null);
- Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
matcher = getMatcher("urn:example.org:policiess", "urn:example.org:policy:1234", null);
- Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(metadataContext(noneEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(noneEntity, "Principal")), Tristate.FALSE);
}
@Test public void testSplitAttribute() throws ComponentInitializationException {
AttributeRequesterEntityAttributeExactPolicyRule matcher =
getMatcher("urn:example.org:policies", "urn:example.org:policy:1234", null);
- Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
- Assert.assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
+ assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
matcher = getMatcher("urn:example.org:policies", "urn:example.org:policy:5678", null);
- Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
- Assert.assertEquals(matcher.matches(metadataContext(noneEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
+ assertEquals(matcher.matches(metadataContext(noneEntity, "Principal")), Tristate.FALSE);
}
@Test public void testUnpopulated()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
+ assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
}
@Test public void testNoMetadata()
throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().matches(metadataContext(null, "Principal")), Tristate.FALSE);
+ assertEquals(getMatcher().matches(metadataContext(null, "Principal")), Tristate.FALSE);
}
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRuleTest.java
index 4f8e427..89f2cfd 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRuleTest.java
@@ -17,15 +17,15 @@
package net.shibboleth.idp.attribute.filter.policyrule.saml.impl;
+import static org.testng.Assert.assertEquals;
+
import java.util.regex.Pattern;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeRegexPolicyRule;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link AttributeRequesterEntityAttributeRegexPolicyRule}.
*/
@@ -50,13 +50,13 @@ public class AttributeRequesterEntityAttributeRegexPolicyRuleTest extends BaseM
@Test public void simple() throws ComponentInitializationException {
AttributeRequesterEntityAttributeRegexPolicyRule matcher = getMatcher();
- Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
+ assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
- Assert.assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
}
@Test public void getter() throws ComponentInitializationException {
- Assert.assertEquals(getMatcher().getValueRegex().pattern(), "urn\\:example.org\\:policy\\:56.*");
+ assertEquals(getMatcher().getValueRegex().pattern(), "urn\\:example.org\\:policy\\:56.*");
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRuleTest.java
index c639c02..d51cbe9 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRuleTest.java
@@ -17,12 +17,13 @@
package net.shibboleth.idp.attribute.filter.policyrule.saml.impl;
-import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import static org.testng.Assert.assertEquals;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/**
* test for {@link AttributeRequesterInEntityGroupPolicyRule}.
*/
@@ -40,21 +41,21 @@ public class AttributeRequesterInEntityGroupPolicyRuleTest extends BaseMetadataT
@Test public void parent() throws ComponentInitializationException {
AttributeRequesterInEntityGroupPolicyRule matcher = getMatcher("http://shibboleth.net");
- Assert.assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.TRUE);
- Assert.assertEquals(matcher.matches(metadataContext(null, null)), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.TRUE);
+ assertEquals(matcher.matches(metadataContext(null, null)), Tristate.FALSE);
matcher = getMatcher("urn:otherstuff");
- Assert.assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
}
@Test public void getter() throws ComponentInitializationException {
- Assert.assertEquals(getMatcher("http://shibboleth.net").getEntityGroup(), "http://shibboleth.net");
+ assertEquals(getMatcher("http://shibboleth.net").getEntityGroup(), "http://shibboleth.net");
}
@Test public void noGroup() throws ComponentInitializationException {
AttributeRequesterInEntityGroupPolicyRule matcher = new AttributeRequesterInEntityGroupPolicyRule();
matcher.setId("matcher");
matcher.initialize();
- Assert.assertEquals(matcher.matches(metadataContext(null, null)), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(null, null)), Tristate.FALSE);
}
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRuleTest.java
index 8d3fa7e..312ff09 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRuleTest.java
@@ -17,12 +17,13 @@
package net.shibboleth.idp.attribute.filter.policyrule.saml.impl;
-import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import static org.testng.Assert.assertEquals;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/**
* test for {@link AttributeRequesterNameIDFormatExactPolicyRule}.
*/
@@ -40,15 +41,15 @@ public class AttributeRequesterNameIDFormatExactPolicyRuleTest extends BaseMetad
@Test public void simple() throws ComponentInitializationException {
AttributeRequesterNameIDFormatExactPolicyRule matcher = getMatcher("https://example.org/foo");
- Assert.assertEquals(matcher.getNameIdFormat(), "https://example.org/foo");
+ assertEquals(matcher.getNameIdFormat(), "https://example.org/foo");
- Assert.assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.TRUE);
- Assert.assertEquals(matcher.matches(metadataContext(null, "Principal")), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.TRUE);
+ assertEquals(matcher.matches(metadataContext(null, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.FALSE);
matcher = getMatcher("urn:otherstuff");
- Assert.assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
- Assert.assertEquals(matcher.matches(metadataContext(wikiEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
+ assertEquals(matcher.matches(metadataContext(wikiEntity, "Principal")), Tristate.FALSE);
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RegistrationAuthorityTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RegistrationAuthorityTest.java
index 12f9715..dcdf48d 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RegistrationAuthorityTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RegistrationAuthorityTest.java
@@ -17,18 +17,19 @@
package net.shibboleth.idp.attribute.filter.policyrule.saml.impl;
-import java.util.Arrays;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
-import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
-import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RegistrationAuthorityPolicyRule;
+import java.util.Arrays;
import org.opensaml.saml.saml2.metadata.EntitiesDescriptor;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
-import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
+import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
+
/** {@link RegistrationAuthorityPolicyRule} unit test. */
public class RegistrationAuthorityTest extends BaseMetadataTests {
@@ -54,7 +55,7 @@ public class RegistrationAuthorityTest extends BaseMetadataTests {
return entity;
}
}
- Assert.fail("Could not find " + entityID);
+ fail("Could not find " + entityID);
return null;
}
@@ -65,10 +66,10 @@ public class RegistrationAuthorityTest extends BaseMetadataTests {
String[] array = {REQUESTED_REG_INFO, "foo",};
filter.setIssuers(Arrays.asList(array));
- Assert.assertEquals(filter.matches(context), Tristate.TRUE);
+ assertEquals(filter.matches(context), Tristate.TRUE);
array[0] = INCOMMON_REG_INFO;
filter.setIssuers(Arrays.asList(array));
- Assert.assertEquals(filter.matches(context), Tristate.FALSE);
+ assertEquals(filter.matches(context), Tristate.FALSE);
}
@Test public void ligo() {
@@ -77,10 +78,10 @@ public class RegistrationAuthorityTest extends BaseMetadataTests {
String[] array = {REQUESTED_REG_INFO, "foo",};
filter.setIssuers(Arrays.asList(array));
- Assert.assertEquals(filter.matches(context), Tristate.FALSE);
+ assertEquals(filter.matches(context), Tristate.FALSE);
array[0] = INCOMMON_REG_INFO;
filter.setIssuers(Arrays.asList(array));
- Assert.assertEquals(filter.matches(context), Tristate.TRUE);
+ assertEquals(filter.matches(context), Tristate.TRUE);
}
@Test public void none() {
@@ -90,8 +91,8 @@ public class RegistrationAuthorityTest extends BaseMetadataTests {
filter.setIssuers(Arrays.asList(array));
filter.setMatchIfMetadataSilent(true);
- Assert.assertEquals(filter.matches(context), Tristate.TRUE);
+ assertEquals(filter.matches(context), Tristate.TRUE);
filter.setMatchIfMetadataSilent(false);
- Assert.assertEquals(filter.matches(context), Tristate.FALSE);
+ assertEquals(filter.matches(context), Tristate.FALSE);
}
-}
\ No newline at end of file
+}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list