[java-shib-attribute] branch main updated: Remove null testing, tighten back up JDT settings.
Scott Cantor
cantor.2 at osu.edu
Tue Nov 22 15:06:37 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=ce8eaf688e61e8511b25c478443478479e5195ca
The following commit(s) were added to refs/heads/main by this push:
new ce8eaf688 Remove null testing, tighten back up JDT settings.
ce8eaf688 is described below
commit ce8eaf688e61e8511b25c478443478479e5195ca
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Nov 22 10:06:34 2022 -0500
Remove null testing, tighten back up JDT settings.
---
.../context/AttributeFilterWorkContextTest.java | 14 -----
.../filter/impl/AttributeFilterImplTest.java | 6 ---
.../filter/matcher/impl/ScriptedMatcherTest.java | 52 +-----------------
.../filter/matcher/logic/impl/AndMatcherTest.java | 35 +------------
.../filter/matcher/logic/impl/NotMatcherTest.java | 37 -------------
.../filter/matcher/logic/impl/OrMatcherTest.java | 35 +------------
.../impl/AttributeIssuerPolicyRuleTest.java | 16 +-----
.../impl/AttributeIssuerRegexpPolicyRuleTest.java | 11 +---
.../impl/AttributeRequesterPolicyRuleTest.java | 14 +----
.../AttributeRequesterRegexpPolicyRuleTest.java | 13 +----
.../impl/PrincipalNamePolicyRuleTest.java | 16 +-----
.../impl/PrincipalNameRegexpPolicyRuleTest.java | 12 +----
.../filtercontext/impl/ProfilePolicyRuleTest.java | 14 +----
.../impl/ProxiedRequesterPolicyRuleTest.java | 14 +----
.../impl/ProxiedRequesterRegexpPolicyRuleTest.java | 16 ++----
.../policyrule/impl/ScriptedPolicyRuleTest.java | 30 ++---------
.../policyrule/logic/impl/AndPolicyRuleTest.java | 17 +-----
.../policyrule/logic/impl/NotPolicyRuleTest.java | 33 ++----------
.../policyrule/logic/impl/OrPolicyRuleTest.java | 18 +------
.../filter/tests/AttributeFilterPolicyTest.java | 40 ++++----------
.../tests/AttributeValueFilterPolicyTest.java | 61 ++++++----------------
.../TemplatedExecutableSearchFilterBuilder.java | 4 +-
.../rdbms/TemplatedExecutableStatementBuilder.java | 4 +-
.../resolver/AbstractResolverPluginTest.java | 9 +---
.../resolver/ad/impl/PrescopedAtributeTest.java | 20 +------
.../resolver/ad/impl/RegexAtributeTest.java | 19 +------
.../resolver/ad/impl/ScopedAttributeTest.java | 20 +------
.../dc/ldap/impl/LDAPDataConnectorTest.java | 42 ++-------------
.../dc/rdbms/impl/RDBMSDataConnectorTest.java | 39 ++------------
.../resolver/impl/AttributeResolverImplTest.java | 13 +----
.../tests/ResolvedAttributeDefinitionTest.java | 15 ++----
.../resolver/tests/ResolvedDataConnectorTest.java | 13 ++---
32 files changed, 79 insertions(+), 623 deletions(-)
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContextTest.java b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContextTest.java
index 7f98d14d2..c5c2f406b 100644
--- a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContextTest.java
+++ b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContextTest.java
@@ -67,13 +67,6 @@ public class AttributeFilterWorkContextTest {
context.addPermittedIdPAttributeValues("one", Collections.singletonList(bStringAttributeValue));
Assert.assertEquals(context.getPermittedIdPAttributeValues().get("one").size(), 2);
- try {
- context.addPermittedIdPAttributeValues(null, Collections.singletonList(aStringAttributeValue));
- Assert.fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
try {
context.addPermittedIdPAttributeValues("", Collections.singletonList(aStringAttributeValue));
Assert.fail();
@@ -122,13 +115,6 @@ public class AttributeFilterWorkContextTest {
context.addDeniedIdPAttributeValues("one", Collections.singletonList(bStringAttributeValue));
Assert.assertEquals(context.getDeniedAttributeValues().get("one").size(), 2);
- try {
- context.addDeniedIdPAttributeValues(null, Collections.singletonList(bStringAttributeValue));
- Assert.fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
try {
context.addDeniedIdPAttributeValues("", Collections.singletonList(bStringAttributeValue));
Assert.fail();
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
index 0161411e8..20016a5fc 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
@@ -71,12 +71,6 @@ public class AttributeFilterImplTest {
} catch (final ConstraintViolationException e) {
// expected
}
-
- try (final AttributeFilterImpl engine = new AttributeFilterImpl(null, null)) {
- Assert.fail();
- } catch (final ConstraintViolationException e) {
- // expected
- }
}
/**
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
index 68e7abcda..1a9ba5f6e 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
@@ -17,19 +17,12 @@
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 static org.testng.Assert.*;
import java.util.Collections;
import java.util.Set;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -40,7 +33,6 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
import net.shibboleth.shared.component.UnmodifiableComponentException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.scripting.EvaluableScript;
/** {@link ScriptedMatcher} unit test. */
@@ -114,48 +106,6 @@ public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
assertNotNull(matcher.getScript());
}
- @Test public void testNullArguments() throws Exception {
-
- ScriptedMatcher matcher = newScriptedMatcher(returnOneValueScript);
- matcher.setId("Test");
- matcher.initialize();
-
- try {
- matcher.getMatchingValues(null, filterContext);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- try {
- matcher.getMatchingValues(attribute, null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- try {
- matcher.getMatchingValues(null, null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- matcher = newScriptedMatcher(returnOneValueScript);
- try {
- matcher.setScript(null);
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- try {
- newScriptedMatcher(null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
- }
-
@Test public void testValidScript() throws Exception {
final ScriptedMatcher matcher = newScriptedMatcher(returnOneValueScript);
matcher.setId("Test");
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
index 342a9327c..ec2bfb1dd 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
@@ -19,11 +19,7 @@ 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 static org.testng.Assert.*;
import java.util.Arrays;
import java.util.Collections;
@@ -43,7 +39,6 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
/** {@link AndMatcher} unit test. */
@SuppressWarnings("javadoc")
@@ -53,34 +48,6 @@ public class AndMatcherTest extends AbstractMatcherPolicyRuleTest {
super.setUp();
}
- @Test public void testNullArguments() throws Exception {
- final Matcher valuePredicate = Matcher.MATCHES_ALL;
- final AndMatcher matcher = newAndMatcher(Collections.singletonList(valuePredicate));
- matcher.setId("test");
- matcher.initialize();
-
- try {
- matcher.getMatchingValues(null, filterContext);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- try {
- matcher.getMatchingValues(attribute, null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- try {
- matcher.getMatchingValues(null, null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
- }
-
@Test public void testSingleton() throws Exception {
final AndMatcher matcher =
newAndMatcher(Collections.singletonList((Matcher) new MockValuePredicateMatcher(or(equalTo(value1),
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
index 2461d71f8..763d3612e 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
@@ -34,7 +34,6 @@ import net.shibboleth.idp.attribute.filter.matcher.impl.MockValuePredicateMatche
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
/** Test the {@link NotMatcher} matcher. */
@SuppressWarnings("javadoc")
@@ -44,42 +43,6 @@ public class NotMatcherTest extends AbstractMatcherPolicyRuleTest {
super.setUp();
}
- @Test public void testNullArguments() throws Exception {
-
- final Matcher valuePredicate = Matcher.MATCHES_ALL;
- final NotMatcher matcher = newNotMatcher(valuePredicate);
- matcher.setId("NullArgs");
- matcher.initialize();
-
- try {
- matcher.getMatchingValues(null, filterContext);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- try {
- matcher.getMatchingValues(attribute, null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- try {
- matcher.getMatchingValues(null, null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- try {
- newNotMatcher(null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
- }
-
@Test public void testInitDestroy() throws ComponentInitializationException {
final AbstractComposedMatcherTest.TestMatcher inMatcher = new AbstractComposedMatcherTest.TestMatcher();
final NotMatcher matcher = newNotMatcher(inMatcher);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
index 71ac08616..51b507fba 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
@@ -19,11 +19,7 @@ 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 static org.testng.Assert.*;
import java.util.Arrays;
import java.util.Collections;
@@ -46,7 +42,6 @@ import net.shibboleth.idp.attribute.filter.matcher.impl.MockValuePredicateMatche
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
/** {@link OrMatcher} unit test. */
@SuppressWarnings("javadoc")
@@ -55,34 +50,6 @@ public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
@BeforeClass public void setup() throws Exception {
super.setUp();
}
-
- @Test public void testNullArguments() throws Exception {
- final Matcher valuePredicate = Matcher.MATCHES_ALL;
- final OrMatcher matcher = newOrMatcher(Collections.singletonList(valuePredicate));
- matcher.setId("test");
- matcher.initialize();
-
- try {
- matcher.getMatchingValues(null, filterContext);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- try {
- matcher.getMatchingValues(attribute, null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- try {
- matcher.getMatchingValues(null, null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
- }
@Test public void testSingleton() throws Exception {
final OrMatcher matcher =
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerPolicyRuleTest.java
index 134a8b784..5553abb92 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerPolicyRuleTest.java
@@ -17,17 +17,13 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
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.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.UninitializedComponentException;
/**
* Tests for {@link AttributeIssuerPolicyRule}.
@@ -48,16 +44,6 @@ public class AttributeIssuerPolicyRuleTest {
return matcher;
}
- @Test public void testNull() throws ComponentInitializationException {
-
- try {
- new AttributeIssuerPolicyRule().matches(null);
- fail();
- } catch (UninitializedComponentException ex) {
- // OK
- }
- }
-
@Test public void testUnpopulated()
throws ComponentInitializationException {
assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerRegexpPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerRegexpPolicyRuleTest.java
index 7cb751c31..aa7ac16f7 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerRegexpPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerRegexpPolicyRuleTest.java
@@ -17,8 +17,7 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
import java.util.regex.Pattern;
@@ -27,7 +26,6 @@ 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.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.UninitializedComponentException;
/**
* Tests for {@link AttributeIssuerRegexpPolicyRule}.
@@ -50,13 +48,6 @@ public class AttributeIssuerRegexpPolicyRuleTest {
}
@Test public void testAll() throws ComponentInitializationException {
-
- try {
- new AttributeIssuerRegexpPolicyRule().matches(null);
- fail();
- } catch (UninitializedComponentException ex) {
- // OK
- }
AttributeIssuerRegexpPolicyRule matcher = getMatcher(true);
assertEquals(matcher.matches(DataSources.populatedFilterContext(null, "wibble", null)), Tristate.FALSE);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterPolicyRuleTest.java
index 4dc7c80d1..12a8d326e 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterPolicyRuleTest.java
@@ -17,15 +17,13 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
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.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.UninitializedComponentException;
/**
* Tests for {@link AttributeRequesterPolicyRule}.
@@ -47,16 +45,6 @@ public class AttributeRequesterPolicyRuleTest {
return getMatcher(true);
}
- @Test public void testNull() throws ComponentInitializationException {
-
- try {
- new AttributeRequesterPolicyRule().matches(null);
- fail();
- } catch (UninitializedComponentException ex) {
- // OK
- }
- }
-
@Test public void testUnpopulated()
throws ComponentInitializationException {
assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterRegexpPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterRegexpPolicyRuleTest.java
index 84e206cd1..7046afc75 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterRegexpPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterRegexpPolicyRuleTest.java
@@ -17,8 +17,7 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
import java.util.regex.Pattern;
@@ -27,7 +26,6 @@ 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.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.UninitializedComponentException;
/**
* Tests for {@link AttributeRequesterRegexpPolicyRule}.
@@ -44,14 +42,7 @@ public class AttributeRequesterRegexpPolicyRuleTest {
}
@Test public void testAll() throws ComponentInitializationException {
-
- try {
- new AttributeRequesterRegexpPolicyRule().matches(null);
- fail();
- } catch (UninitializedComponentException ex) {
- // OK
- }
- AttributeRequesterRegexpPolicyRule matcher = getMatcher();
+ final AttributeRequesterRegexpPolicyRule matcher = getMatcher();
assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "wibble")), Tristate.FALSE);
assertEquals(matcher.matches(DataSources.populatedFilterContext(null, null, "REQUESTER")), Tristate.FALSE);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNamePolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNamePolicyRuleTest.java
index 94c000ffd..69a005a61 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNamePolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNamePolicyRuleTest.java
@@ -17,15 +17,13 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
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.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.UninitializedComponentException;
/**
@@ -42,17 +40,7 @@ public class PrincipalNamePolicyRuleTest {
matcher.initialize();
return matcher;
}
-
- @Test public void testNull() throws ComponentInitializationException {
-
- try {
- new PrincipalNamePolicyRule().matches(null);
- fail();
- } catch (UninitializedComponentException ex) {
- // OK
- }
- }
-
+
@Test public void testUnpopulated() throws ComponentInitializationException {
final PrincipalNamePolicyRule matcher = getMatcher(true);
assertEquals(matcher.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNameRegexpPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNameRegexpPolicyRuleTest.java
index 0a4d21da8..4cb7f7aae 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNameRegexpPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNameRegexpPolicyRuleTest.java
@@ -17,8 +17,7 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
import java.util.regex.Pattern;
@@ -27,7 +26,6 @@ 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.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.UninitializedComponentException;
/**
* Tests for {@link PrincipalNameRegexpPolicyRule}.
@@ -44,14 +42,6 @@ public class PrincipalNameRegexpPolicyRuleTest {
}
@Test public void testAll() throws ComponentInitializationException {
-
- try {
- new PrincipalNameRegexpPolicyRule().matches(null);
- fail();
- } catch (UninitializedComponentException ex) {
- // OK
- }
-
final PrincipalNameRegexpPolicyRule matcher = getMatcher();
assertEquals(matcher.matches(DataSources.populatedFilterContext("wibble", null, null)), Tristate.FALSE);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProfilePolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProfilePolicyRuleTest.java
index 267908837..07f7e502f 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProfilePolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProfilePolicyRuleTest.java
@@ -17,8 +17,7 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
import org.opensaml.profile.context.ProfileRequestContext;
import org.testng.annotations.Test;
@@ -27,7 +26,6 @@ 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.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.UninitializedComponentException;
/**
@@ -45,16 +43,6 @@ public class ProfilePolicyRuleTest {
return matcher;
}
- @Test public void testNull() throws ComponentInitializationException {
-
- try {
- new ProfilePolicyRule().matches(null);
- fail();
- } catch (UninitializedComponentException ex) {
- // OK
- }
- }
-
@Test public void testUnpopulated() throws ComponentInitializationException {
final ProfilePolicyRule matcher = getMatcher(true);
assertEquals(matcher.matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java
index 8c3efe40b..47a87c678 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java
@@ -17,8 +17,7 @@
package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
import java.util.Arrays;
@@ -32,7 +31,6 @@ 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.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.UninitializedComponentException;
/**
* Tests for {@link ProxiedRequesterPolicyRule}.
@@ -55,16 +53,6 @@ public class ProxiedRequesterPolicyRuleTest {
return getMatcher(true);
}
- @Test public void testNull() throws ComponentInitializationException {
-
- try {
- new ProxiedRequesterPolicyRule().matches(null);
- fail();
- } catch (UninitializedComponentException ex) {
- // OK
- }
- }
-
@Test public void testUnpopulated()
throws ComponentInitializationException {
assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java
index f25daa016..99c212bc3 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+package net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl;
+
+import static org.testng.Assert.*;
import java.util.Arrays;
import java.util.regex.Pattern;
@@ -29,7 +30,6 @@ 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.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.UninitializedComponentException;
/**
* Tests for {@link ProxiedRequesterRegexpPolicyRule}.
@@ -45,16 +45,6 @@ public class ProxiedRequesterRegexpPolicyRuleTest {
return matcher;
}
- @Test public void testNull() throws ComponentInitializationException {
-
- try {
- new ProxiedRequesterRegexpPolicyRule().matches(null);
- fail();
- } catch (UninitializedComponentException ex) {
- // OK
- }
- }
-
@Test public void testUnpopulated()
throws ComponentInitializationException {
assertEquals(getMatcher().matches(DataSources.unPopulatedFilterContext()), Tristate.FALSE);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java
index dd76ba031..532597234 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java
@@ -17,12 +17,9 @@
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 static org.testng.Assert.*;
+import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
import org.testng.annotations.BeforeClass;
@@ -35,7 +32,6 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
import net.shibboleth.shared.component.UnmodifiableComponentException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.scripting.EvaluableScript;
/** {@link ScriptedPolicyRule} unit test. */
@@ -105,26 +101,6 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
scReturnScript.initialize();
}
- @Test public void testNullArguments() throws Exception {
- final ScriptedPolicyRule rule = newScriptedPolicyRule(trueReturnScript);
- rule.setId("Test");
- rule.initialize();
-
- try {
- rule.matches(null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- try {
- newScriptedPolicyRule(null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
- }
-
@Test public void testNullReturnScript() throws Exception {
final ScriptedPolicyRule rule = newScriptedPolicyRule(nullReturnScript);
rule.setId("Test");
@@ -205,7 +181,7 @@ public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
}
- static public ScriptedPolicyRule newScriptedPolicyRule(final EvaluableScript script) {
+ static private ScriptedPolicyRule newScriptedPolicyRule(@Nonnull final EvaluableScript script) {
final ScriptedPolicyRule what = new ScriptedPolicyRule();
what.setScript(script);
return what;
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java
index ff89cfee9..bbc0abd75 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java
@@ -17,8 +17,7 @@
package net.shibboleth.idp.attribute.filter.policyrule.logic.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
import java.util.Arrays;
import java.util.Collections;
@@ -34,7 +33,6 @@ import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.matcher.impl.AbstractMatcherPolicyRuleTest;
import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
/** {@link AndPolicyRule} unit test. */
@SuppressWarnings("javadoc")
@@ -44,19 +42,6 @@ public class AndPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
super.setUp();
}
- @Test public void testNullArguments() throws Exception {
- final AndPolicyRule rule = newAndPolicyRule(Arrays.asList(PolicyRequirementRule.MATCHES_ALL));
- rule.setId("test");
- rule.initialize();
-
- try {
- rule.matches(null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
- }
-
@Test(expectedExceptions = {ComponentInitializationException.class}) public void emptyInput()
throws ComponentInitializationException {
final AndPolicyRule rule = newAndPolicyRule(Collections.emptyList());
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
index 08e1c5b3c..2470b6f2f 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
@@ -17,11 +17,10 @@
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 static org.testng.Assert.*;
+
+import javax.annotation.Nonnull;
-import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -32,7 +31,6 @@ import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
/** Test the {@link NotPolicyRule} matcher. */
@SuppressWarnings("javadoc")
@@ -42,29 +40,6 @@ public class NotPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
super.setUp();
}
- @Test public void testNullArguments() throws Exception {
- final NotPolicyRule rule = newNotPolicyRule(PolicyRequirementRule.MATCHES_ALL);
- rule.setId("NullArgs");
- rule.initialize();
-
- assertEquals(rule.getNegatedRule(), PolicyRequirementRule.MATCHES_ALL);
- LoggerFactory.getLogger(AbstractComposedPolicyRuleTest.class).debug(rule.toString());
-
- try {
- rule.matches(null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- try {
- newNotPolicyRule(null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
- }
-
@Test public void testInitDestroy() throws ComponentInitializationException {
final AbstractComposedPolicyRuleTest.TestMatcher inMatcher = new AbstractComposedPolicyRuleTest.TestMatcher();
final NotPolicyRule rule = newNotPolicyRule(inMatcher);
@@ -108,7 +83,7 @@ public class NotPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
assertEquals(rule.matches(DataSources.unPopulatedFilterContext()), Tristate.FAIL);
}
- public static NotPolicyRule newNotPolicyRule(final PolicyRequirementRule composedRule) {
+ public static NotPolicyRule newNotPolicyRule(@Nonnull final PolicyRequirementRule composedRule) {
final NotPolicyRule rule = new NotPolicyRule();
rule.setNegation(composedRule);
return rule;
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java
index 3fd01422d..5b048a9f1 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java
@@ -17,8 +17,7 @@
package net.shibboleth.idp.attribute.filter.policyrule.logic.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
import java.util.Arrays;
import java.util.Collections;
@@ -34,7 +33,6 @@ import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.matcher.impl.AbstractMatcherPolicyRuleTest;
import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
/** {@link OrPolicyRule} unit test. */
@SuppressWarnings("javadoc")
@@ -44,20 +42,6 @@ public class OrPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
super.setUp();
}
- @Test public void testNullArguments() throws Exception {
- final OrPolicyRule rule = newOrPolicyRule(Collections.singletonList(PolicyRequirementRule.MATCHES_ALL));
- rule.setId("test");
- rule.initialize();
-
- try {
- rule.matches(null);
- fail();
- } catch (final ConstraintViolationException e) {
- // expected this
- }
-
- }
-
@Test(expectedExceptions = {ComponentInitializationException.class}) public void emptyInput()
throws ComponentInitializationException {
final OrPolicyRule rule = newOrPolicyRule(null);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
index b7d2db615..d0aea6203 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
@@ -21,6 +21,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import javax.annotation.Nonnull;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.filter.AttributeFilterException;
@@ -31,6 +33,7 @@ import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterWorkContext;
import net.shibboleth.idp.attribute.filter.testing.MockMatcher;
import net.shibboleth.idp.attribute.filter.testing.MockPolicyRequirementRule;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
@@ -50,11 +53,11 @@ public class AttributeFilterPolicyTest {
private MockMatcher valueMatcher;
- private final String ATTR_NAME = "foo";
+ @Nonnull @NotEmpty private final String ATTR_NAME = "foo";
- private final String ATTR_NAME_2 = "Bar";
+ @Nonnull @NotEmpty private final String ATTR_NAME_2 = "Bar";
- private final String ID = "foo";
+ @Nonnull @NotEmpty private final String ID = "foo";
@BeforeMethod public void setUp() throws ComponentInitializationException {
policyMatcher = new MockPolicyRequirementRule();
@@ -80,13 +83,6 @@ public class AttributeFilterPolicyTest {
Assert.assertEquals(policy.getPolicyRequirementRule(), policyMatcher);
Assert.assertTrue(policy.getAttributeRules().isEmpty());
- try {
- new AttributeFilterPolicy(null, policyMatcher, Arrays.asList(valuePolicy));
- Assert.fail();
- } catch (final ConstraintViolationException e) {
- // expected
- }
-
try {
new AttributeFilterPolicy("", policyMatcher, Arrays.asList(valuePolicy));
Assert.fail();
@@ -100,13 +96,6 @@ public class AttributeFilterPolicyTest {
} catch (final ConstraintViolationException e) {
// expected
}
-
- try {
- new AttributeFilterPolicy("engine", null, Arrays.asList(valuePolicy));
- Assert.fail();
- } catch (final ConstraintViolationException e) {
- // expected
- }
}
@Test public void testInitDestroy() throws ComponentInitializationException {
@@ -166,24 +155,15 @@ public class AttributeFilterPolicyTest {
AttributeFilterPolicy policy = new AttributeFilterPolicy(ID, policyMatcher, Arrays.asList(valuePolicy));
- boolean thrown = false;
try {
policy.apply(new AttributeFilterContext());
- } catch (UninitializedComponentException e) {
- thrown = true;
+ Assert.fail("Should have thrown");
+ } catch (final UninitializedComponentException e) {
+ // expected
}
- Assert.assertTrue(thrown);
-
+
policy.initialize();
- thrown = false;
- try {
- policy.apply(null);
- } catch (ConstraintViolationException e) {
- thrown = true;
- }
- Assert.assertTrue(thrown);
-
AttributeFilterContext context = new AttributeFilterContext();
context.getSubcontext(AttributeFilterWorkContext.class, true);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
index f90099feb..fdcf10438 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
@@ -32,7 +32,6 @@ import net.shibboleth.idp.attribute.filter.testing.MockMatcher;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UnmodifiableComponentException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -83,31 +82,20 @@ public class AttributeValueFilterPolicyTest {
@Test public void testAttributeId() throws ComponentInitializationException {
AttributeRule policy = new AttributeRule();
policy.setId("id");
- boolean thrown = false;
- try {
- policy.initialize();
- } catch (final ComponentInitializationException e) {
- thrown = true;
- }
- Assert.assertTrue(thrown, "AttributeId can never initialized be null");
-
- thrown = false;
try {
- policy.setAttributeId(null);
policy.initialize();
+ Assert.fail("AttributeId can never initialized be null");
} catch (final ComponentInitializationException e) {
- thrown = true;
+ // expected
}
- Assert.assertTrue(thrown, "null Attribute Id");
- thrown = false;
try {
policy.setAttributeId("");
policy.initialize();
+ Assert.fail("empty Attribute Id");
} catch (final ComponentInitializationException e) {
- thrown = true;
+ // expected
}
- Assert.assertTrue(thrown, "empty Attribute Id");
policy = new AttributeRule();
policy.setId("id");
@@ -118,33 +106,32 @@ public class AttributeValueFilterPolicyTest {
policy.initialize();
Assert.assertEquals(policy.getAttributeId(), "ID", "Get Attribute ID");
- thrown = false;
try {
policy.setAttributeId("foo");
+ Assert.fail("SetAttributeId after init");
} catch (final UnmodifiableComponentException e) {
- thrown = true;
+ // expected
}
- Assert.assertTrue(thrown, "SetAttributeId after init");
Assert.assertEquals(policy.getAttributeId(), "ID", "Get Attribute ID");
policy.destroy();
- thrown = false;
+
try {
policy.getAttributeId();
+ Assert.fail("GetAttributeId after destroy");
} catch (final DestroyedComponentException e) {
- thrown = true;
+ // expected
}
- Assert.assertTrue(thrown, "GetAttributeId after destroy");
policy = new AttributeRule();
policy.destroy();
- thrown = false;
+
try {
policy.setAttributeId("foo");
+ Assert.fail("SetAttributeId after destroy");
} catch (final DestroyedComponentException e) {
- thrown = true;
+ // expected
}
- Assert.assertTrue(thrown, "SetAttributeId after destroy");
}
@@ -218,22 +205,6 @@ public class AttributeValueFilterPolicyTest {
policy.setAttributeId(ATTR_NAME);
policy.initialize();
- boolean thrown = false;
- try {
- policy.apply(null, new AttributeFilterContext());
- } catch (final ConstraintViolationException e) {
- thrown = true;
- }
- Assert.assertTrue(thrown, "Null attribute");
-
- thrown = false;
- try {
- policy.apply(new IdPAttribute(ATTR_NAME), null);
- } catch (final ConstraintViolationException e) {
- thrown = true;
- }
- Assert.assertTrue(thrown, "Null context");
-
AttributeFilterContext context = new AttributeFilterContext();
context.setPrefilteredIdPAttributes(Arrays.asList(attribute1));
AttributeFilterWorkContext workCtx = context.getSubcontext(AttributeFilterWorkContext.class, true);
@@ -269,12 +240,12 @@ public class AttributeValueFilterPolicyTest {
policy.destroy();
- thrown = false;
try {
policy.apply(attribute1, context);
+ Assert.fail("validate after destroy");
} catch (DestroyedComponentException e) {
- thrown = true;
+ // expected
}
- Assert.assertTrue(thrown, "validate after destroy");
}
-}
+
+}
\ No newline at end of file
diff --git a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/TemplatedExecutableSearchFilterBuilder.java b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/TemplatedExecutableSearchFilterBuilder.java
index 7111ce979..85f957f0a 100644
--- a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/TemplatedExecutableSearchFilterBuilder.java
+++ b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/TemplatedExecutableSearchFilterBuilder.java
@@ -39,6 +39,7 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.velocity.Template;
@@ -166,7 +167,8 @@ public class TemplatedExecutableSearchFilterBuilder extends AbstractExecutableSe
/** {@inheritDoc} */
@Override
@Nonnull public ExecutableSearchFilter build(@Nonnull final AttributeResolutionContext resolutionContext,
- @Nonnull final Map<String, List<IdPAttributeValue>> dependencyAttributes) throws ResolutionException {
+ @Nonnull @NonnullElements final Map<String, List<IdPAttributeValue>> dependencyAttributes)
+ throws ResolutionException {
final VelocityContext context = new VelocityContext();
log.trace("Creating search filter using attribute resolution context {}", resolutionContext);
diff --git a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/TemplatedExecutableStatementBuilder.java b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/TemplatedExecutableStatementBuilder.java
index 58af5d9ea..1086b0d14 100644
--- a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/TemplatedExecutableStatementBuilder.java
+++ b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/TemplatedExecutableStatementBuilder.java
@@ -38,6 +38,7 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.velocity.Template;
@@ -172,7 +173,8 @@ public class TemplatedExecutableStatementBuilder extends AbstractExecutableState
*/
@Override
public final String getSQLQuery(@Nonnull final AttributeResolutionContext resolutionContext,
- @Nonnull final Map<String, List<IdPAttributeValue>> dependencyAttributes) throws ResolutionException {
+ @Nonnull @NonnullElements final Map<String, List<IdPAttributeValue>> dependencyAttributes)
+ throws ResolutionException {
final VelocityContext context = new VelocityContext();
log.trace("Creating search filter using attribute resolution context {}", resolutionContext);
context.put("resolutionContext", resolutionContext);
diff --git a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java b/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
index 2c9078491..2ccf86aff 100644
--- a/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
+++ b/shib-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
@@ -28,7 +28,6 @@ import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
-import net.shibboleth.shared.logic.ConstraintViolationException;
import org.opensaml.profile.context.ProfileRequestContext;
import org.testng.Assert;
@@ -57,14 +56,8 @@ public class AbstractResolverPluginTest {
@Test public void activationCriteria() {
final MockBaseAttributeResolver plugin = new MockBaseAttributeResolver(" foo ", "bar");
- plugin.setActivationCondition(Predicates.<ProfileRequestContext> alwaysFalse());
+ plugin.setActivationCondition(Predicates.alwaysFalse());
Assert.assertEquals(plugin.getActivationCondition(), Predicates.alwaysFalse());
- try {
- plugin.setActivationCondition(null);
- Assert.fail("Able to set a null activiation criteria");
- } catch (ConstraintViolationException e) {
- // expected this
- }
}
/** Test setters to {@link AbstractResolverPlugin#setPropagateResolutionExceptions(boolean)}. */
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
index eff204000..6ed315230 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
@@ -17,10 +17,7 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
import java.util.ArrayList;
import java.util.Collection;
@@ -50,7 +47,6 @@ import net.shibboleth.shared.collection.LazySet;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
/**
* Test for prescoped attribute definitions.
@@ -235,13 +231,6 @@ public class PrescopedAtributeTest {
attrDef.setDataConnectorDependencies(pluginDependencies);
attrDef.setId(TEST_ATTRIBUTE_NAME);
- try {
- attrDef.setScopeDelimiter(null);
- fail("set null delimiter");
- } catch (final ConstraintViolationException e) {
- // OK
- }
-
attrDef = new PrescopedAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
assertNotNull(attrDef.getScopeDelimiter());
@@ -264,13 +253,6 @@ public class PrescopedAtributeTest {
assertEquals(attrDef.getScopeDelimiter(), DELIMITER);
- try {
- attrDef.resolve(null);
- fail("Null context not allowed");
- } catch (final ConstraintViolationException e) {
- // OK
- }
-
attrDef.destroy();
try {
attrDef.initialize();
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
index 92ab036d9..7b6054b42 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
@@ -17,10 +17,7 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
import java.util.ArrayList;
import java.util.Collection;
@@ -51,7 +48,6 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
import net.shibboleth.shared.component.UnmodifiableComponentException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
/**
* Test for regex attribute definitions.
@@ -197,12 +193,6 @@ public class RegexAtributeTest {
} catch (final ComponentInitializationException e) {
// OK
}
- try {
- attrDef.setRegularExpression(null);
- fail("set null regexp");
- } catch (final ConstraintViolationException e) {
- // OK
- }
attrDef = new RegexSplitAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
@@ -226,13 +216,6 @@ public class RegexAtributeTest {
assertEquals(attrDef.getRegularExpression(), TestSources.CONNECTOR_ATTRIBUTE_VALUE_REGEXP_PATTERN);
- try {
- attrDef.resolve(null);
- fail("Null context not allowed");
- } catch (final ConstraintViolationException e) {
- // OK
- }
-
attrDef.destroy();
try {
attrDef.initialize();
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
index ba9cbf151..5f7fe0161 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
@@ -17,10 +17,7 @@
package net.shibboleth.idp.attribute.resolver.ad.impl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
import java.util.ArrayList;
import java.util.Arrays;
@@ -52,7 +49,6 @@ import net.shibboleth.shared.collection.LazySet;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
/**
* Tester for {@link ScopedAttributeDefinition}.
@@ -214,13 +210,6 @@ public class ScopedAttributeTest {
attrDef.setDataConnectorDependencies(pluginDependencies);
attrDef.setId(TEST_ATTRIBUTE_NAME);
- try {
- attrDef.setScope(null);
- fail("set null delimiter");
- } catch (final ConstraintViolationException e) {
- // OK
- }
-
attrDef = new ScopedAttributeDefinition();
attrDef.setId(TEST_ATTRIBUTE_NAME);
assertNull(attrDef.getScope());
@@ -254,13 +243,6 @@ public class ScopedAttributeTest {
assertEquals(attrDef.getScope(), TEST_SCOPE);
- try {
- attrDef.resolve(null);
- fail("Null context not allowed");
- } catch (final ConstraintViolationException e) {
- // OK
- }
-
attrDef.destroy();
try {
attrDef.initialize();
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
index 3d954f48f..5304b36d4 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
@@ -17,20 +17,15 @@
package net.shibboleth.idp.attribute.resolver.dc.ldap.impl;
-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 static org.testng.Assert.*;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import javax.annotation.Nonnull;
-
import org.apache.velocity.runtime.RuntimeConstants;
import org.ldaptive.ConnectionFactory;
import org.ldaptive.DefaultConnectionFactory;
@@ -58,7 +53,6 @@ import net.shibboleth.idp.attribute.resolver.dc.ldap.StringAttributeValueMapping
import net.shibboleth.idp.attribute.resolver.dc.ldap.TemplatedExecutableSearchFilterBuilder;
import net.shibboleth.idp.attribute.resolver.testing.TestSources;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.UninitializedComponentException;
import net.shibboleth.shared.component.UnmodifiableComponentException;
import net.shibboleth.shared.testing.InMemoryDirectory;
import net.shibboleth.shared.testing.VelocityEngine;
@@ -179,17 +173,9 @@ public class LDAPDataConnectorTest {
final SearchResultMappingStrategy mappingStrategy = new StringAttributeValueMappingStrategy();
connector.setMappingStrategy(mappingStrategy);
-
- try {
- connector.resolve(null);
- fail("Need to initialize first");
- } catch (final UninitializedComponentException e) {
- // OK
- }
-
connector.initialize();
try {
- connector.setConnectionFactory(null);
+ connector.setMappingStrategy(mappingStrategy);
fail("Setter after initialize");
} catch (final UnmodifiableComponentException e) {
// OK
@@ -278,7 +264,7 @@ public class LDAPDataConnectorTest {
final AttributeResolutionContext context =
TestSources.createResolutionContext("domain\\user*", TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
- final ExecutableSearchFilter filter = builder.build(context, null);
+ final ExecutableSearchFilter filter = builder.build(context, Collections.emptyMap());
assertEquals(filter.getSearchFilter().format(), "(cn=domain\\5Cuser\\2A)");
assertEquals(filter.getResultCacheKey(), "(cn=domain\\5Cuser\\2A)");
}
@@ -353,7 +339,7 @@ public class LDAPDataConnectorTest {
final AttributeResolutionContext context =
TestSources.createResolutionContext("domain\\user*", TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
- final ExecutableSearchFilter filter = builder.build(context, null);
+ final ExecutableSearchFilter filter = builder.build(context, Collections.emptyMap());
assertEquals(filter.getSearchFilter().format(), "(cn=domain\\5Cuser\\2A)");
assertEquals(filter.getResultCacheKey(), "(cn=domain\\5Cuser\\2A)");
}
@@ -427,24 +413,6 @@ public class LDAPDataConnectorTest {
assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue(" ")));
assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue(" philip.principal at shibboleth.net ")));
}
-
- @Test(expectedExceptions = ResolutionException.class) public void resolveNoFilter()
- throws ComponentInitializationException, ResolutionException {
- final LDAPDataConnector connector = createLdapDataConnector(new ExecutableSearchBuilder<ExecutableSearchFilter>() {
-
- @Override
- @Nonnull public ExecutableSearchFilter build(@Nonnull final AttributeResolutionContext resolutionContext,
- @Nonnull final Map<String, List<IdPAttributeValue>> dependencyAttributes) throws ResolutionException {
- return null;
- }
- }, null);
- connector.initialize();
-
- final AttributeResolutionContext context =
- TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
- TestSources.SP_ENTITY_ID);
- connector.resolve(context);
- }
@Test(expectedExceptions = ResolutionException.class) public void resolveNoResultIsError()
throws ComponentInitializationException, ResolutionException {
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
index 8d1218d3d..d9121649a 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
@@ -17,15 +17,12 @@
package net.shibboleth.idp.attribute.resolver.dc.rdbms.impl;
-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 static org.testng.Assert.*;
import java.sql.SQLException;
import java.time.Duration;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -52,7 +49,6 @@ import net.shibboleth.idp.attribute.resolver.dc.rdbms.StringResultMappingStrateg
import net.shibboleth.idp.attribute.resolver.dc.rdbms.TemplatedExecutableStatementBuilder;
import net.shibboleth.idp.attribute.resolver.testing.TestSources;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.UninitializedComponentException;
import net.shibboleth.shared.component.UnmodifiableComponentException;
import net.shibboleth.shared.testing.DatabaseTestingSupport;
import net.shibboleth.shared.testing.VelocityEngine;
@@ -157,17 +153,10 @@ public class RDBMSDataConnectorTest {
final StringResultMappingStrategy mappingStrategy = new StringResultMappingStrategy();
connector.setMappingStrategy(mappingStrategy);
-
- try {
- connector.resolve(null);
- fail("Need to initialize first");
- } catch (final UninitializedComponentException e) {
- // OK
- }
-
connector.initialize();
+
try {
- connector.setDataSource(null);
+ connector.setMappingStrategy(mappingStrategy);
fail("Setter after initialize");
} catch (final UnmodifiableComponentException e) {
// OK
@@ -240,7 +229,7 @@ public class RDBMSDataConnectorTest {
final AttributeResolutionContext context =
TestSources.createResolutionContext("McHale's Navy", TestSources.IDP_ENTITY_ID,
TestSources.SP_ENTITY_ID);
- final String query = builder.getSQLQuery(context, null);
+ final String query = builder.getSQLQuery(context, Collections.emptyMap());
assertEquals(query, "SELECT userid FROM people WHERE userid='McHale''s Navy'");
}
@@ -275,24 +264,6 @@ public class RDBMSDataConnectorTest {
.iterator().next());
}
- @Test(expectedExceptions = ResolutionException.class) public void resolveNoStatement()
- throws ComponentInitializationException, ResolutionException {
- final RDBMSDataConnector connector = createUserRdbmsDataConnector(new ExecutableSearchBuilder<ExecutableStatement>() {
-
- @Override
- @Nonnull public ExecutableStatement build(@Nonnull final AttributeResolutionContext resolutionContext,
- @Nonnull final Map<String, List<IdPAttributeValue>> dependencyAttributes) throws ResolutionException {
- return null;
- }
- }, null);
- connector.initialize();
-
- final AttributeResolutionContext context =
- TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
- TestSources.SP_ENTITY_ID);
- connector.resolve(context);
- }
-
@Test(expectedExceptions = ResolutionException.class) public void resolveNoResultIsError()
throws ComponentInitializationException, ResolutionException {
final StringResultMappingStrategy mappingStrategy = new StringResultMappingStrategy();
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
index ad259f1e8..2de98237a 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
@@ -219,18 +219,7 @@ public class AttributeResolverImplTest {
connector3.setId("dc3");
connector3.setValues(List.of(attribute4));
- // IDP-1623 Connector 4 contributes nullness
- final StaticDataConnector connector4 = new StaticDataConnector() {
- @Nonnull public Map<String,IdPAttribute> doDataConnectorResolve(@Nonnull final AttributeResolutionContext resolutionContext,
- @Nonnull final AttributeResolverWorkContext workContext) throws ResolutionException {
- return null;
- }
- };
- connector4.setId("dc4");
- connector4.setValues(List.of(attribute4));
- connector4.setExportAttributes(List.of(attribute4.getId()));
-
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", null, List.of(connector1, connector2, connector3, connector4));
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", null, List.of(connector1, connector2, connector3));
for (DataConnector connector : resolver.getDataConnectors().values()) {
connector.initialize();
}
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedAttributeDefinitionTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedAttributeDefinitionTest.java
index 061eeb381..3a5a605c6 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedAttributeDefinitionTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedAttributeDefinitionTest.java
@@ -36,27 +36,20 @@ import org.testng.annotations.Test;
public class ResolvedAttributeDefinitionTest {
@Test public void init() {
- IdPAttribute attribute = new IdPAttribute("foo");
- MockStaticAttributeDefinition attrDef = new MockStaticAttributeDefinition();
-
- try {
- new ResolvedAttributeDefinition(null, attribute);
- Assert.fail();
- } catch (ConstraintViolationException e) {
- // OK
- }
+ final IdPAttribute attribute = new IdPAttribute("foo");
+ final MockStaticAttributeDefinition attrDef = new MockStaticAttributeDefinition();
try {
new ResolvedAttributeDefinition(attrDef, null);
Assert.fail();
- } catch (ConstraintViolationException e) {
+ } catch (final ConstraintViolationException e) {
// OK
}
try {
new ResolvedAttributeDefinition(new MockStaticAttributeDefinition(), attribute);
Assert.fail();
- } catch (ConstraintViolationException e) {
+ } catch (final ConstraintViolationException e) {
// OK
}
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedDataConnectorTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedDataConnectorTest.java
index 115944fed..2568452c2 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedDataConnectorTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/tests/ResolvedDataConnectorTest.java
@@ -43,26 +43,19 @@ public class ResolvedDataConnectorTest {
private final Map<String, IdPAttribute> resolvedData = Collections.emptyMap();
@Test public void init() {
- MockStaticDataConnector dc = new MockStaticDataConnector();
-
- try {
- new ResolvedDataConnector(null, resolvedData);
- Assert.fail();
- } catch (ConstraintViolationException e) {
- // OK
- }
+ final MockStaticDataConnector dc = new MockStaticDataConnector();
try {
new ResolvedDataConnector(dc, null);
Assert.fail();
- } catch (ConstraintViolationException e) {
+ } catch (final ConstraintViolationException e) {
// OK
}
try {
new ResolvedDataConnector(dc, resolvedData);
Assert.fail();
- } catch (ConstraintViolationException e) {
+ } catch (final ConstraintViolationException e) {
// OK
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list