[java-identity-provider] 02/02: IDP-1501 Require that ServicableComponents set and application context
Rod Widdowson
rdw at steadingsoftware.com
Sat Sep 21 11:14:00 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=8f7834c5cbffa961b60995e5d039b121e749dc82
commit 8f7834c5cbffa961b60995e5d039b121e749dc82
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Sep 21 16:11:47 2019 +0100
IDP-1501 Require that ServicableComponents set and application context
https://issues.shibboleth.net/jira/browse/IDP-1501
Fix tests.
---
idp-attribute-filter-impl/pom.xml | 6 ++++++
.../impl/TargettedAttributeValueFilterTest.java | 11 ++++++++---
.../impl/UntargettedAttributeValueFilterTest.java | 8 +++++---
.../attribute/filter/impl/AttributeFilterImplTest.java | 18 +++++++++++++++---
.../impl/ValidateExternalAuthenticationTest.java | 2 ++
.../filter/policyrule/saml/impl/BaseMetadataTests.java | 2 ++
idp-attribute-impl/pom.xml | 6 ++++++
.../impl/AttributeTranscoderRegistryImplTest.java | 3 ++-
idp-attribute-resolver-impl/pom.xml | 7 ++++++-
.../resolver/impl/AttributeResolverImplTest.java | 2 ++
idp-cas-impl/pom.xml | 6 ++++++
.../impl/CASScopedStringAttributeTranscoderTest.java | 3 ++-
.../impl/CASStringAttributeTranscoderTest.java | 3 ++-
idp-profile-impl/pom.xml | 7 ++++++-
.../idp/profile/impl/FilterAttributesTest.java | 6 ++++++
.../DefaultRelyingPartyConfigurationResolverTest.java | 4 ++++
...gCriteriaRelyingPartyConfigurationResolverTest.java | 5 +++++
idp-saml-impl/pom.xml | 6 ++++++
.../impl/SAML1ByteAttributeTranscoderTest.java | 3 ++-
.../impl/SAML1ScopedStringAttributeTranscoderTest.java | 3 ++-
.../impl/SAML1StringAttributeTranscoderTest.java | 3 ++-
.../impl/SAML2ByteAttributeTranscoderTest.java | 3 ++-
.../impl/SAML2ScopedStringAttributeTranscoderTest.java | 3 ++-
.../impl/SAML2StringAttributeTranscoderTest.java | 3 ++-
.../impl/SAML2XMLObjectAttributeTranscoderTest.java | 3 ++-
.../impl/AddAttributeStatementToAssertionTest.java | 5 ++++-
.../impl/AddAttributeStatementToAssertionTest.java | 5 ++++-
27 files changed, 113 insertions(+), 23 deletions(-)
diff --git a/idp-attribute-filter-impl/pom.xml b/idp-attribute-filter-impl/pom.xml
index f336674..f4494ea 100644
--- a/idp-attribute-filter-impl/pom.xml
+++ b/idp-attribute-filter-impl/pom.xml
@@ -151,6 +151,12 @@
<artifactId>opensaml-saml-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.ext</groupId>
+ <artifactId>spring-extensions</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
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 169d4c5..3bc069c 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
@@ -25,6 +25,7 @@ import java.util.Map;
import org.testng.annotations.Test;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.filter.AttributeFilter;
import net.shibboleth.idp.attribute.filter.AttributeFilterException;
@@ -97,7 +98,8 @@ public class TargettedAttributeValueFilterTest extends BaseComplexAttributeFilte
new AttributeFilterPolicy("targettedAtPermit", PolicyRequirementRule.MATCHES_ALL,
Collections.singleton(attributeValueFilterPolicy));
- final AttributeFilter engine = new AttributeFilterImpl("engine", Collections.singleton(policy));
+ final AttributeFilterImpl engine = new AttributeFilterImpl("engine", Collections.singleton(policy));
+ engine.setApplicationContext(new MockApplicationContext());
ComponentSupport.initialize(attributeValueFilterPolicy);
ComponentSupport.initialize(policy);
@@ -159,7 +161,9 @@ public class TargettedAttributeValueFilterTest extends BaseComplexAttributeFilte
new AttributeFilterPolicy("targettedAtPermit", PolicyRequirementRule.MATCHES_ALL,
Collections.singleton(attributeValueFilterPolicy));
- final AttributeFilter engine = new AttributeFilterImpl("engine", Collections.singleton(policy));
+ final AttributeFilterImpl engine = new AttributeFilterImpl("engine", Collections.singleton(policy));
+ engine.setApplicationContext(new MockApplicationContext());
+
ComponentSupport.initialize(attributeValueFilterPolicy);
ComponentSupport.initialize(policy);
@@ -213,7 +217,8 @@ public class TargettedAttributeValueFilterTest extends BaseComplexAttributeFilte
final AttributeFilterPolicy policy =
new AttributeFilterPolicy("targettedAtPermit", rule, Collections.singleton(attributeValueFilterPolicy));
- final AttributeFilter engine = new AttributeFilterImpl("engine", Collections.singleton(policy));
+ final AttributeFilterImpl engine = new AttributeFilterImpl("engine", Collections.singleton(policy));
+ engine.setApplicationContext(new MockApplicationContext());
ComponentSupport.initialize(attributeValueFilterPolicy);
ComponentSupport.initialize(policy);
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 abc0038..36f93df 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
@@ -25,6 +25,7 @@ import java.util.Map;
import org.testng.annotations.Test;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.filter.AttributeFilter;
import net.shibboleth.idp.attribute.filter.AttributeFilterException;
@@ -89,8 +90,8 @@ public class UntargettedAttributeValueFilterTest extends BaseComplexAttributeFil
final AttributeFilterPolicy policy =
new AttributeFilterPolicy("targettedAtPermit", PolicyRequirementRule.MATCHES_ALL,
Collections.singleton(attributeValueFilterPolicy));
-
- final AttributeFilter engine = new AttributeFilterImpl("engine", Collections.singleton(policy));
+ final AttributeFilterImpl engine = new AttributeFilterImpl("engine", Collections.singleton(policy));
+ engine.setApplicationContext(new MockApplicationContext());
ComponentSupport.initialize(attributeValueFilterPolicy);
ComponentSupport.initialize(policy);
@@ -144,7 +145,8 @@ public class UntargettedAttributeValueFilterTest extends BaseComplexAttributeFil
final AttributeFilterPolicy policy =
new AttributeFilterPolicy("targettedAtPermit", rule, Collections.singleton(attributeValueFilterPolicy));
- final AttributeFilter engine = new AttributeFilterImpl("engine", Collections.singleton(policy));
+ final AttributeFilterImpl engine = new AttributeFilterImpl("engine", Collections.singleton(policy));
+ engine.setApplicationContext(new MockApplicationContext());
ComponentSupport.initialize(attributeValueFilterPolicy);
ComponentSupport.initialize(policy);
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
index 97cb407..144001b 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
@@ -79,6 +80,7 @@ public class AttributeFilterImplTest {
AttributeFilterPolicy policy3 = new AttributeFilterPolicy("policy3", PolicyRequirementRule.MATCHES_NONE, null);
AttributeFilterImpl filter = new AttributeFilterImpl("engine", Arrays.asList(policy1, policy1, policy2));
+ filter.setApplicationContext(new MockApplicationContext());
policy1.initialize();
policy2.initialize();
filter.initialize();
@@ -93,6 +95,7 @@ public class AttributeFilterImplTest {
Assert.assertFalse(policy3.isInitialized());
filter = new AttributeFilterImpl("engine", Arrays.asList(policy1, policy2));
+ filter.setApplicationContext(new MockApplicationContext());
filter.initialize();
Assert.assertEquals(filter.getFilterPolicies().size(), 2);
@@ -135,6 +138,7 @@ public class AttributeFilterImplTest {
filterContext.getPrefilteredIdPAttributes().put(attribute2.getId(), attribute2);
final AttributeFilterImpl filter = new AttributeFilterImpl("engine", Collections.singletonList(policy));
+ filter.setApplicationContext(new MockApplicationContext());
attribute1Policy.initialize();
policy.initialize();
ComponentSupport.initialize(filter);
@@ -169,6 +173,7 @@ public class AttributeFilterImplTest {
attribute1Policy.initialize();
policy.initialize();
AttributeFilterImpl filter = new AttributeFilterImpl("engine", Collections.singletonList(policy));
+ filter.setApplicationContext(new MockApplicationContext());
filter.initialize();
filter.filterAttributes(filterContext);
@@ -201,6 +206,7 @@ public class AttributeFilterImplTest {
attribute2Policy.initialize();
policy.initialize();
AttributeFilterImpl filter = new AttributeFilterImpl("engine", Collections.singletonList(policy));
+ filter.setApplicationContext(new MockApplicationContext());
filter.initialize();
filter.filterAttributes(filterContext);
@@ -226,7 +232,8 @@ public class AttributeFilterImplTest {
attribute1.setValues(Arrays.asList(new StringAttributeValue("one"), new StringAttributeValue("two")));
filterContext.getPrefilteredIdPAttributes().put(attribute1.getId(), attribute1);
- AttributeFilter filter = new AttributeFilterImpl("engine", Collections.singletonList(policy));
+ AttributeFilterImpl filter = new AttributeFilterImpl("engine", Collections.singletonList(policy));
+ filter.setApplicationContext(new MockApplicationContext());
attribute1Policy.initialize();
policy.initialize();
ComponentSupport.initialize(filter);
@@ -263,6 +270,7 @@ public class AttributeFilterImplTest {
filterContext.getPrefilteredIdPAttributes().put(attribute1.getId(), attribute1);
AttributeFilterImpl filter = new AttributeFilterImpl("engine", Collections.singletonList(policy));
+ filter.setApplicationContext(new MockApplicationContext());
denyPolicy.initialize();
allowPolicy.initialize();
policy.initialize();
@@ -293,7 +301,8 @@ public class AttributeFilterImplTest {
attribute1.setValues(Arrays.asList(new StringAttributeValue("one"), new StringAttributeValue("two")));
filterContext.getPrefilteredIdPAttributes().put(attribute1.getId(), attribute1);
- AttributeFilter filter = new AttributeFilterImpl("engine", Collections.singletonList(policy));
+ AttributeFilterImpl filter = new AttributeFilterImpl("engine", Collections.singletonList(policy));
+ filter.setApplicationContext(new MockApplicationContext());
policy.initialize();
ComponentSupport.initialize(filter);
@@ -324,7 +333,8 @@ public class AttributeFilterImplTest {
attribute1.setValues(Arrays.asList(new StringAttributeValue("one"), new StringAttributeValue("two")));
filterContext.getPrefilteredIdPAttributes().put(attribute1.getId(), attribute1);
- AttributeFilter filter = new AttributeFilterImpl("engine", Collections.singletonList(policy));
+ AttributeFilterImpl filter = new AttributeFilterImpl("engine", Collections.singletonList(policy));
+ filter.setApplicationContext(new MockApplicationContext());
allowPolicy.initialize();
denyPolicy.initialize();
policy.initialize();
@@ -352,6 +362,8 @@ public class AttributeFilterImplTest {
Assert.assertFalse(matcher.isDestroyed());
AttributeFilterImpl filter = new AttributeFilterImpl("engine", Collections.singletonList(policy));
+ filter.setApplicationContext(new MockApplicationContext());
+
policy.initialize();
matcher.initialize();
policyRule.initialize();
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/ValidateExternalAuthenticationTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/ValidateExternalAuthenticationTest.java
index f68eb52..eafd979 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/ValidateExternalAuthenticationTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/ValidateExternalAuthenticationTest.java
@@ -23,6 +23,7 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.context.AttributeContext;
@@ -123,6 +124,7 @@ public class ValidateExternalAuthenticationTest extends BaseAuthenticationContex
policy.initialize();
final AttributeFilterImpl filter = new AttributeFilterImpl("test", Collections.singletonList(policy));
+ filter.setApplicationContext(new MockApplicationContext());
filter.initialize();
return new MockReloadableService<>(filter);
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/BaseMetadataTests.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/BaseMetadataTests.java
index 7a67ed9..a934942 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/BaseMetadataTests.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/BaseMetadataTests.java
@@ -20,6 +20,7 @@ package net.shibboleth.idp.attribute.filter.policyrule.saml.impl;
import java.util.Arrays;
import java.util.Collections;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeExactPolicyRule;
import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
@@ -70,6 +71,7 @@ public class BaseMetadataTests extends XMLObjectBaseTestCase {
final AttributeTranscoderRegistryImpl registry = new AttributeTranscoderRegistryImpl();
registry.setId("test");
registry.setNamingRegistry(Collections.singletonMap(Attribute.class, new AbstractSAML2AttributeTranscoder.NamingFunction()));
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
final NodeProcessingMetadataFilter filter = new NodeProcessingMetadataFilter();
diff --git a/idp-attribute-impl/pom.xml b/idp-attribute-impl/pom.xml
index 7821dfe..ab5e968 100644
--- a/idp-attribute-impl/pom.xml
+++ b/idp-attribute-impl/pom.xml
@@ -47,6 +47,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>net.shibboleth.ext</groupId>
+ <artifactId>spring-extensions</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
diff --git a/idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java b/idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
index 367cc6d..3c1d4ba 100644
--- a/idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
+++ b/idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
@@ -33,6 +33,7 @@ import org.testng.annotations.Test;
import com.google.common.base.Predicates;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributeDecodingException;
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.EmptyAttributeValue;
@@ -94,7 +95,7 @@ public class AttributeTranscoderRegistryImplTest {
new TranscodingRule(ruleset2),
new TranscodingRule(ruleset3),
new TranscodingRule(ruleset4)));
-
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
assertEquals(registry.getDisplayNames(new IdPAttribute("foo")).size(), 2);
diff --git a/idp-attribute-resolver-impl/pom.xml b/idp-attribute-resolver-impl/pom.xml
index 6ba0e0b..35a7bca 100644
--- a/idp-attribute-resolver-impl/pom.xml
+++ b/idp-attribute-resolver-impl/pom.xml
@@ -159,7 +159,12 @@
<artifactId>opensaml-storage-impl</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>net.shibboleth.ext</groupId>
+ <artifactId>spring-extensions</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
index ce30405..5b095a9 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
@@ -41,6 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.EmptyAttributeValue;
import net.shibboleth.idp.attribute.EmptyAttributeValue.EmptyType;
import net.shibboleth.idp.attribute.context.AttributeContext;
@@ -927,6 +928,7 @@ public class AttributeResolverImplTest {
result.setId(resolverId);
result.setAttributeDefinitions(definitions);
result.setDataConnectors(connectors);
+ result.setApplicationContext(new MockApplicationContext());
return result;
}
diff --git a/idp-cas-impl/pom.xml b/idp-cas-impl/pom.xml
index 6cf65a0..ce5aa30 100644
--- a/idp-cas-impl/pom.xml
+++ b/idp-cas-impl/pom.xml
@@ -183,6 +183,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>net.shibboleth.ext</groupId>
+ <artifactId>spring-extensions</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASScopedStringAttributeTranscoderTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASScopedStringAttributeTranscoderTest.java
index 27fc238..48bcf75 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASScopedStringAttributeTranscoderTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASScopedStringAttributeTranscoderTest.java
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.ByteAttributeValue;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -76,7 +77,7 @@ public class CASScopedStringAttributeTranscoderTest {
ruleset1.put(CASScopedStringAttributeTranscoder.PROP_SCOPE_DELIMITER, DELIMITER);
registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset1)));
-
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
}
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASStringAttributeTranscoderTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASStringAttributeTranscoderTest.java
index 16c1d92..b906373 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASStringAttributeTranscoderTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/attribute/transcoding/impl/CASStringAttributeTranscoderTest.java
@@ -29,6 +29,7 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.ByteAttributeValue;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -71,7 +72,7 @@ public class CASStringAttributeTranscoderTest {
ruleset1.put(CASAttributeTranscoder.PROP_NAME, ATTR_NAME);
registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset1)));
-
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
}
diff --git a/idp-profile-impl/pom.xml b/idp-profile-impl/pom.xml
index 2c9e525..c95921d 100644
--- a/idp-profile-impl/pom.xml
+++ b/idp-profile-impl/pom.xml
@@ -167,7 +167,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>net.shibboleth.ext</groupId>
+ <artifactId>spring-extensions</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<distributionManagement>
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java
index 2e2f7f3..131cba9 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
@@ -65,6 +66,7 @@ public class FilterAttributesTest {
prc.getSubcontext(SubjectContext.class, true);
final AttributeFilterImpl engine = new AttributeFilterImpl("test", null);
+ engine.setApplicationContext(new MockApplicationContext());
engine.initialize();
final FilterAttributes action = new FilterAttributes(new MockReloadableService<>(engine));
@@ -81,6 +83,7 @@ public class FilterAttributesTest {
prc.getSubcontext(RelyingPartyContext.class).getSubcontext(AttributeContext.class, true);
final AttributeFilterImpl engine = new AttributeFilterImpl("test", null);
+ engine.setApplicationContext(new MockApplicationContext());
engine.initialize();
final FilterAttributes action = new FilterAttributes(new MockReloadableService<>(engine));
@@ -118,6 +121,7 @@ public class FilterAttributesTest {
policy.initialize();
attribute1Policy.initialize();
attribute1Matcher.initialize();
+ engine.setApplicationContext(new MockApplicationContext());
engine.initialize();
prc.getSubcontext(SubjectContext.class, true);
@@ -177,6 +181,7 @@ public class FilterAttributesTest {
policy.initialize();
attribute1Policy.initialize();
attribute1Matcher.initialize();
+ engine.setApplicationContext(new MockApplicationContext());
engine.initialize();
prc.getSubcontext(SubjectContext.class, true);
@@ -236,6 +241,7 @@ public class FilterAttributesTest {
policy.initialize();
attribute1Policy.initialize();
attribute1Matcher.initialize();
+ engine.setApplicationContext(new MockApplicationContext());
engine.initialize();
prc.getSubcontext(SubjectContext.class, true);
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
index d28e2aa..ef4e1c7 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -93,6 +94,7 @@ public class DefaultRelyingPartyConfigurationResolverTest {
resolver.setId("test");
resolver.setUnverifiedConfiguration(anonRP);
resolver.setDefaultConfiguration(defaultRP);
+ resolver.setApplicationContext(new MockApplicationContext());
resolver.initialize();
final Iterable<RelyingPartyConfiguration> results = resolver.resolve(requestContext);
@@ -127,6 +129,7 @@ public class DefaultRelyingPartyConfigurationResolverTest {
resolver.setId("test");
resolver.setUnverifiedConfiguration(anonRP);
resolver.setDefaultConfiguration(defaultRP);
+ resolver.setApplicationContext(new MockApplicationContext());
resolver.initialize();
final Iterable<RelyingPartyConfiguration> results = resolver.resolve(requestContext);
@@ -182,6 +185,7 @@ public class DefaultRelyingPartyConfigurationResolverTest {
resolver.setRelyingPartyConfigurations(rpConfigs);
resolver.setUnverifiedConfiguration(anonRP);
resolver.setDefaultConfiguration(defaultRP);
+ resolver.setApplicationContext(new MockApplicationContext());
resolver.initialize();
Iterable<RelyingPartyConfiguration> results = resolver.resolve(requestContext);
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolverTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolverTest.java
index b59d876..cd170ba 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolverTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolverTest.java
@@ -44,6 +44,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.idp.saml.relyingparty.impl.RelyingPartyConfigurationSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -138,6 +139,7 @@ public class DelegatingCriteriaRelyingPartyConfigurationResolverTest extends XML
final List<RelyingPartyConfiguration> rpConfigs = Arrays.asList(oneByName, twoByName, threeByName);
delegate.setId("delegate");
+ delegate.setApplicationContext(new MockApplicationContext());
delegate.setRelyingPartyConfigurations(rpConfigs);
delegate.initialize();
@@ -171,6 +173,7 @@ public class DelegatingCriteriaRelyingPartyConfigurationResolverTest extends XML
final List<RelyingPartyConfiguration> rpConfigs = Arrays.asList(oneByName, twoByName, threeByName);
delegate.setId("delegate");
+ delegate.setApplicationContext(new MockApplicationContext());
delegate.setRelyingPartyConfigurations(rpConfigs);
delegate.initialize();
@@ -200,6 +203,7 @@ public class DelegatingCriteriaRelyingPartyConfigurationResolverTest extends XML
delegate.setId("delegate");
delegate.setRelyingPartyConfigurations(rpConfigs);
+ delegate.setApplicationContext(new MockApplicationContext());
delegate.initialize();
EntityDescriptor ed = (EntityDescriptor) XMLObjectSupport.buildXMLObject(EntityDescriptor.DEFAULT_ELEMENT_NAME);
@@ -242,6 +246,7 @@ public class DelegatingCriteriaRelyingPartyConfigurationResolverTest extends XML
final List<RelyingPartyConfiguration> rpConfigs = Arrays.asList(oneByTag, twoByTag);
delegate.setId("delegate");
+ delegate.setApplicationContext(new MockApplicationContext());
delegate.setRelyingPartyConfigurations(rpConfigs);
delegate.initialize();
diff --git a/idp-saml-impl/pom.xml b/idp-saml-impl/pom.xml
index bab0986..2dc0143 100644
--- a/idp-saml-impl/pom.xml
+++ b/idp-saml-impl/pom.xml
@@ -216,6 +216,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>net.shibboleth.ext</groupId>
+ <artifactId>spring-extensions</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
index 1557f61..b49d3e6 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributeDecodingException;
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.ByteAttributeValue;
@@ -100,7 +101,7 @@ public class SAML1ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
ruleset1.put(SAML1AttributeTranscoder.PROP_NAMESPACE, ATTR_NAMESPACE);
registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset1)));
-
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
index e5dc7fb..69e530d 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.ByteAttributeValue;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -109,7 +110,7 @@ public class SAML1ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
ruleset1.put(SAML1ScopedStringAttributeTranscoder.PROP_SCOPE_TYPE, "attribute");
registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset1)));
-
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
index e69b763..a41e3f1 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.ByteAttributeValue;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -97,7 +98,7 @@ public class SAML1StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
ruleset1.put(SAML1AttributeTranscoder.PROP_NAMESPACE, ATTR_NAMESPACE);
registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset1)));
-
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
index 67026d8..d635272 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
@@ -39,6 +39,7 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributeDecodingException;
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.ByteAttributeValue;
@@ -102,7 +103,7 @@ public class SAML2ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
ruleset1.put(SAML2AttributeTranscoder.PROP_FRIENDLY_NAME, ATTR_FRIENDLYNAME);
registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset1)));
-
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
index 6743451..724ba28 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.ByteAttributeValue;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -104,7 +105,7 @@ public class SAML2ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
ruleset1.put(SAML2ScopedStringAttributeTranscoder.PROP_SCOPE_TYPE, "inline");
registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset1)));
-
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
index 15c6275..4babccc 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.ByteAttributeValue;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -99,7 +100,7 @@ public class SAML2StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
ruleset1.put(SAML2AttributeTranscoder.PROP_FRIENDLY_NAME, ATTR_FRIENDLYNAME);
registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset1)));
-
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
index 6d862bd..d8bcb1c 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
@@ -26,6 +26,7 @@ import java.util.Map;
import javax.xml.namespace.QName;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.ByteAttributeValue;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -106,7 +107,7 @@ public class SAML2XMLObjectAttributeTranscoderTest extends OpenSAMLInitBaseTestC
ruleset1.put(SAML2AttributeTranscoder.PROP_FRIENDLY_NAME, ATTR_FRIENDLYNAME);
registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset1)));
-
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java
index 4415d9f..aaf8d37 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
@@ -125,7 +126,7 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
new TranscodingRule(rule1_1),
new TranscodingRule(rule1_2),
new TranscodingRule(rule2_1)));
-
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
action = new AddAttributeStatementToAssertion();
@@ -189,6 +190,7 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
rule.put(SAML1AttributeTranscoder.PROP_NAMESPACE, MY_NAMESPACE);
localregistry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(rule)));
+ localregistry.setApplicationContext(new MockApplicationContext());
localregistry.initialize();
action.setTranscoderRegistry(new MockReloadableService<>(localregistry));
@@ -225,6 +227,7 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
rule.put(SAML1AttributeTranscoder.PROP_NAMESPACE, MY_NAMESPACE);
localregistry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(rule)));
+ localregistry.setApplicationContext(new MockApplicationContext());
localregistry.initialize();
action.setTranscoderRegistry(new MockReloadableService<>(localregistry));
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java
index d3626eb..bb25fa5 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.ext.spring.service.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributeEncodingException;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
@@ -134,8 +135,8 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
new TranscodingRule(rule1_2),
new TranscodingRule(rule2_1),
new TranscodingRule(rule3_1)));
+ registry.setApplicationContext(new MockApplicationContext());
registry.initialize();
-
action = new AddAttributeStatementToAssertion();
action.setTranscoderRegistry(new MockReloadableService<>(registry));
}
@@ -197,6 +198,7 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
rule.put(SAML2AttributeTranscoder.PROP_NAME_FORMAT, MY_NAMESPACE);
localregistry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(rule)));
+ localregistry.setApplicationContext(new MockApplicationContext());
localregistry.initialize();
action.setTranscoderRegistry(new MockReloadableService<>(localregistry));
@@ -233,6 +235,7 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
rule.put(SAML2AttributeTranscoder.PROP_NAME_FORMAT, MY_NAMESPACE);
localregistry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(rule)));
+ localregistry.setApplicationContext(new MockApplicationContext());
localregistry.initialize();
action.setTranscoderRegistry(new MockReloadableService<>(localregistry));
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list