[java-identity-provider] 06/06: IDP-1330 Remove old namespace from most StoredDataConnector tests
Rod Widdowson
rdw at steadingsoftware.com
Wed Oct 17 06:06:11 EDT 2018
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=d72c0b3a8f63247f8e9c366e8dcda5ac5659ad27
commit d72c0b3a8f63247f8e9c366e8dcda5ac5659ad27
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Sep 28 14:25:29 2018 +0100
IDP-1330 Remove old namespace from most StoredDataConnector tests
https://issues.shibboleth.net/jira/browse/IDP-1330
---
.../spring/dc/StoredIDDataConnectorParserTest.java | 6 +++---
.../resolver/spring/dc/{ => resolver}/IdP338.xml | 0
.../resolver/spring/dc/resolver/stored.xml | 1 +
.../dc/resolver/{stored.xml => storedNoSalt.xml} | 9 +++-----
.../attribute/resolver/spring/dc/storedNoSalt.xml | 25 ----------------------
5 files changed, 7 insertions(+), 34 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIDDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIDDataConnectorParserTest.java
index ad3521b..81b4d83 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIDDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIDDataConnectorParserTest.java
@@ -44,19 +44,19 @@ public class StoredIDDataConnectorParserTest extends BaseAttributeDefinitionPars
}
@Test public void withSalt() throws ComponentInitializationException {
- final StoredIDDataConnector connector = getDataConnector("stored.xml", StoredIDDataConnector.class);
+ final StoredIDDataConnector connector = getDataConnector("resolver/stored.xml", StoredIDDataConnector.class);
Assert.assertEquals(connector.getSalt(), "abcdefghijklmnopqrst".getBytes());
testIt(connector);
}
@Test public void withOutSalt() throws ComponentInitializationException {
- final StoredIDDataConnector connector = getDataConnector("storedNoSalt.xml", StoredIDDataConnector.class);
+ final StoredIDDataConnector connector = getDataConnector("resolver/storedNoSalt.xml", StoredIDDataConnector.class);
testIt(connector);
}
@Test public void resolver() throws ComponentInitializationException {
- final StoredIDDataConnector connector = getDataConnector("resolver/stored.xml", StoredIDDataConnector.class);
+ final StoredIDDataConnector connector = getDataConnector("stored.xml", StoredIDDataConnector.class);
testIt(connector);
}
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/IdP338.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/IdP338.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/IdP338.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/IdP338.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml
index df0e465..750be85 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml
@@ -8,6 +8,7 @@
retryableErrors="25000 25001"
sourceAttributeID="theSourceRemainsTheSame"
generatedAttributeID="jenny"
+ salt="abcdefghijklmnopqrst"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedNoSalt.xml
similarity index 66%
copy from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml
copy to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedNoSalt.xml
index df0e465..6b15349 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedNoSalt.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<DataConnector id="stored" xsi:type="StoredId"
- xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<DataConnector id="stored"
+ xsi:type="StoredId" xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
failFast="false"
queryTimeout="PT5S"
@@ -8,14 +9,10 @@
retryableErrors="25000 25001"
sourceAttributeID="theSourceRemainsTheSame"
generatedAttributeID="jenny"
-
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ApplicationManagedConnection
jdbcDriver="org.hsqldb.jdbc.JDBCDriver"
jdbcURL="jdbc:hsqldb:mem:RDBMSDataConnectorStore" />
- <FailoverDataConnector ref="sddsadas"/>
- <FailoverDataConnector ref="sddsadas"/>
-
</DataConnector>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storedNoSalt.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storedNoSalt.xml
deleted file mode 100644
index db844a8..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storedNoSalt.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resolver:DataConnector id="stored"
- xsi:type="dc:StoredId" xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
-
- failFast="false"
- queryTimeout="PT5S"
- transactionRetries="5"
- retryableErrors="25000 25001"
- sourceAttributeID="theSourceRemainsTheSame"
- generatedAttributeID="jenny"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <dc:ApplicationManagedConnection
- jdbcDriver="org.hsqldb.jdbc.JDBCDriver"
- jdbcURL="jdbc:hsqldb:mem:RDBMSDataConnectorStore" />
-
-</resolver:DataConnector>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list