[java-shib-metadata] branch main updated: Test fixes.
Scott Cantor
cantor.2 at osu.edu
Thu Jun 16 20:06:48 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-metadata.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=74175934c7532856afb6341709a0ca1ca7292355
The following commit(s) were added to refs/heads/main by this push:
new 74175934c Test fixes.
74175934c is described below
commit 74175934c7532856afb6341709a0ca1ca7292355
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jun 16 16:06:45 2022 -0400
Test fixes.
---
.../http/HTTPResourceConfigurationTests.java | 2 +-
.../FileBackedHTTPMetadataProviderParserTest.java | 2 +-
.../net/shibboleth/spring/http/parent.xml | 3 +--
.../net/shibboleth/spring/metadata/beans.xml | 28 +++++++++++++---------
.../spring/metadata/filter/algorithmBeans.xml | 2 +-
.../filter/algorithmWithScriptResource.xml | 2 +-
.../metadata/filter/entityAttributesBeans.xml | 8 ++++---
.../metadata/filter/entityAttributesByRefBeans.xml | 4 ++--
.../filter/entityAttributesWithScriptResource.xml | 4 ++--
.../metadata/filter/schemaValidationRefs-beans.xml | 7 +-----
.../filter/signatureValidationRefs-beans.xml | 2 +-
11 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
index cf5e73e9a..054e4de32 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
@@ -47,7 +47,7 @@ public class HTTPResourceConfigurationTests {
private static final String REPO_IDP = "java-shib-metadata";
- private static final String DOC_XML = "shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/document.xml";
+ private static final String DOC_XML = "shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/document.xml";
private File theDir = null;
private GenericApplicationContext theContext = null;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParserTest.java
index b6482a56b..8d607f786 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParserTest.java
@@ -40,7 +40,7 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
private static final String ENTITY_XML = "shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/entity.xml";
- private static final String ENTITIES_XML = "shib-metadata-spring/src/test/resources/net/shibboleth/spring//entities.xml";
+ private static final String ENTITIES_XML = "shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/entities.xml";
@Test public void entity() throws Exception {
MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/parent.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/parent.xml
index 78bf71dfb..68db2024c 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/parent.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/parent.xml
@@ -9,8 +9,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
index 9632d50f1..4802213a3 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
@@ -26,9 +26,11 @@
p:coalescing="true" p:ignoreComments="true"
p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
- <bean id="shibboleth.SchemaBuilder" class="org.opensaml.saml.common.xml.SAMLSchemaBuilder" c:ver="SAML_11"/>
+ <bean id="shibboleth.SchemaBuilder" destroy-method=""
+ class="org.opensaml.saml.common.xml.SAMLSchemaBuilder" c:ver="SAML_11"/>
- <bean id="shibboleth.VelocityEngine" class="net.shibboleth.ext.spring.velocity.VelocityEngineFactoryBean">
+ <bean id="shibboleth.VelocityEngine" destroy-method=""
+ class="net.shibboleth.ext.spring.velocity.VelocityEngineFactoryBean">
<property name="velocityProperties">
<props>
<prop key="resource.loaders">classpath, string</prop>
@@ -42,16 +44,17 @@
</property>
</bean>
- <bean id="digester.SHA1HexLower" class="net.shibboleth.utilities.java.support.codec.StringDigester"
- c:_0="SHA-1"
- c:_1="HEX_LOWER"/>
+ <bean id="digester.SHA1HexLower" destroy-method=""
+ class="net.shibboleth.utilities.java.support.codec.StringDigester"
+ c:_0="SHA-1"
+ c:_1="HEX_LOWER"/>
- <bean id="shibboleth.MetadataSignatureValidationStaticCriteria"
+ <bean id="shibboleth.MetadataSignatureValidationStaticCriteria" destroy-method=""
class="net.shibboleth.spring.metadata.filter.SignatureValidationCriteriaSetFactoryBean"
p:includeOpenSAMLGlobalConfig="true">
<property name="signatureValidationConfigurations">
<util:list>
- <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration">
+ <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration" destroy-method="">
<property name="whitelistedAlgorithms">
<list>
</list>
@@ -68,14 +71,17 @@
</property>
</bean>
- <bean id="predicate.AlwaysFalse" class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
+ <bean id="predicate.AlwaysFalse" destroy-method=""
+ class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
- <bean id="metadata.persistentCacheManager" class="org.opensaml.core.xml.persist.MapLoadSaveManager" />
+ <bean id="metadata.persistentCacheManager" destroy-method=""
+ class="org.opensaml.core.xml.persist.MapLoadSaveManager" />
<bean id="metadata.HttpClientSecurityParameters" destroy-method=""
class="org.opensaml.security.httpclient.HttpClientSecurityParameters" />
- <bean id="metadata.CredentialsProvider" class="org.apache.http.impl.client.SystemDefaultCredentialsProvider" />
+ <bean id="metadata.CredentialsProvider" destroy-method=""
+ class="org.apache.http.impl.client.SystemDefaultCredentialsProvider" />
<util:set id="metadata.Indexes">
<bean class="org.opensaml.saml.metadata.resolver.index.impl.RoleMetadataIndex" destroy-method="" />
@@ -84,7 +90,7 @@
</util:set>
<util:set id="metadata.MDQ.secondaryURLBuilders">
- <bean class="org.opensaml.saml.metadata.resolver.impl.SAMLArtifactURLBuilder" />
+ <bean class="org.opensaml.saml.metadata.resolver.impl.SAMLArtifactURLBuilder" destroy-method="" />
</util:set>
<bean id="metadata.LocalDynamicSourceManager" destroy-method=""
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/algorithmBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/algorithmBeans.xml
index 5ad20a06a..78d85a404 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/algorithmBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/algorithmBeans.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
+ default-init-method="initialize" default-lazy-init="true">
<bean id="predicate.AlwaysFalse" class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/algorithmWithScriptResource.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/algorithmWithScriptResource.xml
index dbe2aa091..ea6e37ed7 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/algorithmWithScriptResource.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/algorithmWithScriptResource.xml
@@ -26,7 +26,7 @@
Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
</EncryptionMethod>
<metadata:ConditionScript language="javascript">
- <metadata:ScriptFile>classpath:/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/algorithmConditionScript.js</metadata:ScriptFile>
+ <metadata:ScriptFile>classpath:/net/shibboleth/spring/metadata/filter/algorithmConditionScript.js</metadata:ScriptFile>
</metadata:ConditionScript>
</metadata:MetadataFilter>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml
index 241811e30..fb93c8aa4 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml
@@ -9,11 +9,13 @@
default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
- <bean id="predicate.NotRandS" class="net.shibboleth.ext.spring.util.SpringExpressionPredicate"
+ <bean id="predicate.NotRandS" destroy-method=""
+ class="net.shibboleth.ext.spring.util.SpringExpressionPredicate"
c:_0="!#input.getName().equals('http://macedir.org/entity-category')" />
- <bean id="MetadataResource" class="org.springframework.core.io.ClassPathResource"
- c:_0="net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesMetadata.xml" />
+ <bean id="MetadataResource" destroy-method=""
+ class="org.springframework.core.io.ClassPathResource"
+ c:_0="net/shibboleth/spring/metadata/filter/entityAttributesMetadata.xml" />
<bean id="shibboleth.ParserPool"
class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesByRefBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesByRefBeans.xml
index b7f064539..f84a93271 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesByRefBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesByRefBeans.xml
@@ -7,10 +7,10 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
+ default-init-method="initialize" default-lazy-init="true">
<bean id="predicate.AlwaysFalse" class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
- <bean class="net.shibboleth.idp.profile.spring.relyingparty.metadata.impl.ByReferenceFilterBeanPostProcessor" />
+ <bean class="net.shibboleth.spring.metadata.ByReferenceFilterBeanPostProcessor" />
</beans>
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesWithScriptResource.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesWithScriptResource.xml
index c629fa5a6..f9df64993 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesWithScriptResource.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesWithScriptResource.xml
@@ -10,7 +10,7 @@
<metadata:MetadataFilter xsi:type="metadata:EntityAttributes">
<metadata:AttributeFilterScript>
- <metadata:ScriptFile>classpath:/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesAttributeFilterScript.js</metadata:ScriptFile>
+ <metadata:ScriptFile>classpath:/net/shibboleth/spring/metadata/filter/entityAttributesAttributeFilterScript.js</metadata:ScriptFile>
</metadata:AttributeFilterScript>
<saml:Attribute Name="foo">
<saml:AttributeValue>fooValue</saml:AttributeValue>
@@ -19,7 +19,7 @@
<saml:AttributeValue>barValue</saml:AttributeValue>
</saml:Attribute>
<metadata:ConditionScript language="javascript">
- <metadata:ScriptFile>classpath:/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesConditionScript.js</metadata:ScriptFile>
+ <metadata:ScriptFile>classpath:/net/shibboleth/spring/metadata/filter/entityAttributesConditionScript.js</metadata:ScriptFile>
</metadata:ConditionScript>
</metadata:MetadataFilter>
</metadata:MetadataProvider>
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/schemaValidationRefs-beans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/schemaValidationRefs-beans.xml
index 65a507aeb..466838dc4 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/schemaValidationRefs-beans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/schemaValidationRefs-beans.xml
@@ -6,13 +6,8 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize">
- <context:property-placeholder
- location="classpath:/net/shibboleth/idp/profile/spring/relyingparty/file.properties" />
-
- <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name
- (if not already set). -->
<bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/signatureValidationRefs-beans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/signatureValidationRefs-beans.xml
index 2d63bc62d..01a9cf7c1 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/signatureValidationRefs-beans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/signatureValidationRefs-beans.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="test.CriteriaSet" class="net.shibboleth.utilities.java.support.resolver.CriteriaSet" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list