[java-identity-provider] branch master updated: IDP-1330 All Filter tests in new namespace

[Rod Widdowson]

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=1288c0dc474cce43799850c81a40d1942c1557a3

The following commit(s) were added to refs/heads/master by this push:
       new  1288c0d   IDP-1330 All Filter tests in new namespace
1288c0d is described below

commit 1288c0dc474cce43799850c81a40d1942c1557a3
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Sep 12 14:05:04 2018 +0100

    IDP-1330 All Filter tests in new namespace
    
    https://issues.shibboleth.net/jira/browse/IDP-1330
---
 .../filter/spring/policy/AttributeIssuerRegexRuleParserTest.java   | 6 +++---
 .../shibboleth/idp/attribute/filter/policyrule/afp/issuerRegex.xml | 5 +++++
 .../idp/attribute/filter/policyrule/attributeRegexIssuer.xml       | 7 -------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRegexRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRegexRuleParserTest.java
index 2fb9a1e..8b86bdd 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRegexRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRegexRuleParserTest.java
@@ -17,7 +17,7 @@
 
 package net.shibboleth.idp.attribute.filter.spring.policy;
 
-import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.AttributeRequesterRegexpPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.AttributeIssuerRegexpPolicyRule;
 import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
@@ -29,8 +29,8 @@ public class AttributeIssuerRegexRuleParserTest extends BaseAttributeFilterParse
 
     @Test public void policy() throws ComponentInitializationException {
 
-        AttributeRequesterRegexpPolicyRule arRule = (AttributeRequesterRegexpPolicyRule) getPolicyRule("attributeRegexIssuer.xml", false);
-        Assert.assertEquals(arRule.getRegularExpression(), "^unr:example:.*$");    
+        AttributeIssuerRegexpPolicyRule arRule = (AttributeIssuerRegexpPolicyRule) getPolicyRule("issuerRegex.xml", true);
+        Assert.assertEquals(arRule.getRegularExpression(), "^urn:example:.*$");    
     }
  
 }
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/issuerRegex.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/issuerRegex.xml
new file mode 100644
index 0000000..16cbdeb
--- /dev/null
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/issuerRegex.xml
@@ -0,0 +1,5 @@
+<AttributeFilterPolicy id="MostBasicExample"
+        xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+	<PolicyRequirementRule xsi:type="IssuerRegex" regex="^urn:example:.*$" />
+</AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRegexIssuer.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRegexIssuer.xml
deleted file mode 100644
index c2c9538..0000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRegexIssuer.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<afp:AttributeFilterPolicy id="MostBasicExample"
-    	xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:afp="urn:mace:shibboleth:2.0:afp"
-    	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
-                            urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
-	<afp:PolicyRequirementRule xsi:type="basic:AttributeRequesterRegex" regex="^unr:example:.*$" />
-</afp:AttributeFilterPolicy>
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.