[java-shib-metadata] branch main updated: Revert "Fix property replacement in tests in less invasive way."
Scott Cantor
cantor.2 at osu.edu
Tue Jun 13 21:05:38 UTC 2023
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=15ddec6731c4fcee275915fb943a531c78684c04
The following commit(s) were added to refs/heads/main by this push:
new 15ddec67 Revert "Fix property replacement in tests in less invasive way."
15ddec67 is described below
commit 15ddec6731c4fcee275915fb943a531c78684c04
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 13 16:57:19 2023 -0400
Revert "Fix property replacement in tests in less invasive way."
This reverts commit 98ca2b38c44c8d7298a35063ad6d4025433ad578.
---
.../credential/BasicResourceParserTest.java | 2 +-
.../credential/X509FilesystemParserTest.java | 2 +-
.../security/trust/PKIXFilesystemParserTest.java | 2 +-
.../shibboleth/spring/security/credential/beans.xml | 21 ---------------------
.../net/shibboleth/spring/security/trust/beans.xml | 21 ---------------------
5 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/credential/BasicResourceParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/credential/BasicResourceParserTest.java
index 9667d0e2..7f256d1e 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/credential/BasicResourceParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/credential/BasicResourceParserTest.java
@@ -48,7 +48,7 @@ public class BasicResourceParserTest extends AbstractSecurityParserTest {
@Test public void publicPrivate() throws IOException {
final BasicCredential credential =
- (BasicCredential) getBean(Credential.class, "credential/resourcePublicPrivate.xml", "credential/beans.xml");
+ (BasicCredential) getBean(Credential.class, "credential/resourcePublicPrivate.xml");
Assert.assertNotNull(credential.getPrivateKey());
}
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/credential/X509FilesystemParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/credential/X509FilesystemParserTest.java
index c795ee83..2ab34182 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/credential/X509FilesystemParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/credential/X509FilesystemParserTest.java
@@ -38,7 +38,7 @@ import net.shibboleth.spring.security.AbstractSecurityParserTest;
public class X509FilesystemParserTest extends AbstractSecurityParserTest {
private BasicX509Credential lookup(String file) throws IOException {
- return (BasicX509Credential) getBean(Credential.class, "credential/" + file, "credential/beans.xml");
+ return (BasicX509Credential) getBean(Credential.class, "credential/" + file);
}
@Test public void certOnly() throws IOException {
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/PKIXFilesystemParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/PKIXFilesystemParserTest.java
index 143179c4..c1cdeaa5 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/PKIXFilesystemParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/trust/PKIXFilesystemParserTest.java
@@ -36,7 +36,7 @@ import net.shibboleth.spring.security.AbstractSecurityParserTest;
public class PKIXFilesystemParserTest extends AbstractSecurityParserTest {
private BasicPKIXValidationInformation lookup(String file) throws IOException {
- return (BasicPKIXValidationInformation) getBean(PKIXValidationInformation.class, "trust/" + file, "trust/beans.xml");
+ return (BasicPKIXValidationInformation) getBean(PKIXValidationInformation.class, "trust/" + file);
}
@Test public void simple() throws IOException {
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/security/credential/beans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/security/credential/beans.xml
deleted file mode 100644
index 1d5c45e7..00000000
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/security/credential/beans.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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">
-
- <context:annotation-config />
-
- <!-- BIG mystery: WHY is this needed to allow tests to run with property replacement? -->
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
-</beans>
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/security/trust/beans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/security/trust/beans.xml
deleted file mode 100644
index 1d5c45e7..00000000
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/security/trust/beans.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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">
-
- <context:annotation-config />
-
- <!-- BIG mystery: WHY is this needed to allow tests to run with property replacement? -->
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
-</beans>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list