[java-identity-provider] 02/06: IDP-1330 Move mapped AttributeDefinition tests to new namespace

Rod Widdowson rdw at steadingsoftware.com
Wed Oct 17 06:06:07 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=aaa05bb86cabe66514da58483f196380d162b039

commit aaa05bb86cabe66514da58483f196380d162b039
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Sep 12 17:18:43 2018 +0100

    IDP-1330 Move mapped AttributeDefinition tests to new namespace
    
    https://issues.shibboleth.net/jira/browse/IDP-1330
---
 .../ad/mapped/MappedAttributeDefinitionParserTest.java |  6 +++---
 .../spring/ad/mapped/SourceValueParserTest.java        |  4 ++--
 .../resolver/spring/ad/mapped/ValueMapParserTest.java  |  4 ++--
 .../resolver/spring/ad/mapped/mappedNoDefault.xml      | 15 ---------------
 .../resolver/spring/ad/mapped/mappedNoValueMap.xml     | 11 -----------
 .../spring/ad/mapped/resolver/mappedNoDefault.xml      |  9 +++++++++
 .../spring/ad/mapped/resolver/mappedNoValueMap.xml     |  5 +++++
 .../spring/ad/mapped/{ => resolver}/multiDefault.xml   |  2 +-
 .../ad/mapped/resolver/sourceValueAttributes1.xml      | 10 ++++++++++
 .../ad/mapped/resolver/sourceValueAttributes2.xml      | 10 ++++++++++
 .../ad/mapped/resolver/valueMapNoSourceValue.xml       |  3 +++
 .../spring/ad/mapped/resolver/valueMapNoValues.xml     |  2 ++
 .../spring/ad/mapped/sourceValueAttributes1.xml        | 18 ------------------
 .../spring/ad/mapped/sourceValueAttributes2.xml        | 18 ------------------
 .../spring/ad/mapped/valueMapNoSourceValue.xml         | 12 ------------
 .../resolver/spring/ad/mapped/valueMapNoValues.xml     | 10 ----------
 16 files changed, 47 insertions(+), 92 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java
index b6588c7..bb618c5 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java
@@ -43,7 +43,7 @@ public class MappedAttributeDefinitionParserTest extends BaseAttributeDefinition
     }
 
     @Test public void multiDefault() {
-        final MappedAttributeDefinition defn = getDefinition("multiDefault.xml");
+        final MappedAttributeDefinition defn = getDefinition("resolver/multiDefault.xml");
 
         Assert.assertTrue(defn.isPassThru());
         Assert.assertEquals(defn.getValueMaps().size(), 2);
@@ -59,7 +59,7 @@ public class MappedAttributeDefinitionParserTest extends BaseAttributeDefinition
     }
 
     @Test public void noDefault() {
-        final MappedAttributeDefinition defn = getDefinition("mappedNoDefault.xml");
+        final MappedAttributeDefinition defn = getDefinition("resolver/mappedNoDefault.xml");
 
         Assert.assertFalse(defn.isPassThru());
         Assert.assertEquals(defn.getValueMaps().size(), 1);
@@ -69,7 +69,7 @@ public class MappedAttributeDefinitionParserTest extends BaseAttributeDefinition
     @Test public void noValues() {
 
         try {
-            getDefinition("mappedNoValueMap.xml");
+            getDefinition("resolver/mappedNoValueMap.xml");
             Assert.fail();
         } catch (final BeanDefinitionStoreException e) {
             // OK
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java
index 5b9de4f..40118c3 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java
@@ -67,7 +67,7 @@ public class SourceValueParserTest extends BaseAttributeDefinitionParserTest {
     }
 
     @Test public void values1() {
-        SourceValue value = getSourceValue("sourceValueAttributes1.xml");
+        SourceValue value = getSourceValue("resolver/sourceValueAttributes1.xml");
 
         Assert.assertTrue(value.isIgnoreCase());
         Assert.assertTrue(value.isPartialMatch());
@@ -75,7 +75,7 @@ public class SourceValueParserTest extends BaseAttributeDefinitionParserTest {
     }
 
     @Test public void values2() {
-        SourceValue value = getSourceValue("sourceValueAttributes2.xml");
+        SourceValue value = getSourceValue("resolver/sourceValueAttributes2.xml");
 
         Assert.assertFalse(value.isIgnoreCase());
         Assert.assertFalse(value.isPartialMatch());
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java
index 8adaf5e..f39a556 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java
@@ -63,7 +63,7 @@ public class ValueMapParserTest extends BaseAttributeDefinitionParserTest {
     @Test public void noSourceValues() {
 
         try {
-            getValueMap("valueMapNoSourceValue.xml");
+            getValueMap("valueMapNoSourceValue.xml", true);
             Assert.fail();
         } catch (final BeanDefinitionStoreException e) {
             // OK
@@ -73,7 +73,7 @@ public class ValueMapParserTest extends BaseAttributeDefinitionParserTest {
     @Test public void noValues() {
 
         try {
-            getValueMap("valueMapNoValues.xml");
+            getValueMap("valueMapNoValues.xml", true);
             Assert.fail();
         } catch (final BeanDefinitionStoreException e) {
             // OK
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoDefault.xml
deleted file mode 100644
index f9d559e..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoDefault.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<resolver:AttributeDefintion xsi:type="ad:Mapped"
-	xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-	xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
-    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">
-    <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-	<ad:ValueMap>
-		<ad:ReturnValue>return</ad:ReturnValue>
-		<ad:SourceValue>source</ad:SourceValue>
-	</ad:ValueMap>
-</resolver:AttributeDefintion>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoValueMap.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoValueMap.xml
deleted file mode 100644
index c754172..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mappedNoValueMap.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resolver:AttributeDefintion xsi:type="ad:Mapped"
-	xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-	xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
-    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">
-    <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</resolver:AttributeDefintion>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mappedNoDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mappedNoDefault.xml
new file mode 100644
index 0000000..ef8e960
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mappedNoDefault.xml
@@ -0,0 +1,9 @@
+<AttributeDefintion xsi:type="Mapped"
+	xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
+    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
+    <InputAttributeDefinition ref="TheOrphan" />                    
+	<ValueMap>
+		<ReturnValue>return</ReturnValue>
+		<SourceValue>source</SourceValue>
+	</ValueMap>
+</AttributeDefintion>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mappedNoValueMap.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mappedNoValueMap.xml
new file mode 100644
index 0000000..7f5eca1
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mappedNoValueMap.xml
@@ -0,0 +1,5 @@
+<AttributeDefintion xsi:type="Mapped"
+	xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
+    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
+    <InputAttributeDefinition ref="TheOrphan" />                    
+</AttributeDefintion>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/multiDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/multiDefault.xml
similarity index 88%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/multiDefault.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/multiDefault.xml
index d70fcf7..c29355b 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/multiDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/multiDefault.xml
@@ -12,5 +12,5 @@
 		<SourceValue>source2</SourceValue>
 	</ValueMap>
     <DefaultValue passThru="true">foobar3</DefaultValue>
-    <Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+    <InputAttributeDefinition ref="TheOrphan" />                    
 </AttributeDefintion>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueAttributes1.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueAttributes1.xml
new file mode 100644
index 0000000..2386913
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueAttributes1.xml
@@ -0,0 +1,10 @@
+<AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	id="container" 
+	xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+	xsi:type="Mapped">
+    <InputAttributeDefinition ref="TheOrphan" />                    
+	<ValueMap>
+		<ReturnValue>return</ReturnValue>
+		<SourceValue ignoreCase="true" partialMatch="true">sourceValueAttributes1</SourceValue>
+	</ValueMap>
+</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueAttributes2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueAttributes2.xml
new file mode 100644
index 0000000..810dcf6
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueAttributes2.xml
@@ -0,0 +1,10 @@
+<AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	id="container" 
+	xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+	xsi:type="Mapped">
+    <InputAttributeDefinition ref="TheOrphan" />                    
+	<ValueMap>
+		<ReturnValue>return</ReturnValue>
+		<SourceValue ignoreCase="false" partialMatch="false">sourceValueAttributes2</SourceValue>
+	</ValueMap>
+</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMapNoSourceValue.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMapNoSourceValue.xml
new file mode 100644
index 0000000..8689bf2
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMapNoSourceValue.xml
@@ -0,0 +1,3 @@
+<ValueMap xmlns="urn:mace:shibboleth:2.0:resolver" xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
+	<ReturnValue>return</ReturnValue>
+</ValueMap>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMapNoValues.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMapNoValues.xml
new file mode 100644
index 0000000..3622d78
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMapNoValues.xml
@@ -0,0 +1,2 @@
+<ValueMap xmlns="urn:mace:shibboleth:2.0:resolver"
+    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/ad/mapped/sourceValueAttributes1.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes1.xml
deleted file mode 100644
index 40f9ab9..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes1.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-<ad:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
-	id="container" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-	xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	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"
-	xsi:type="ad:Mapped">
-	<resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
-		ref="TheOrphan" />
-	<ad:ValueMap>
-		<ad:ReturnValue>return</ad:ReturnValue>
-		<ad:SourceValue ignoreCase="true" partialMatch="true">sourceValueAttributes1</ad:SourceValue>
-	</ad:ValueMap>
-</ad:AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes2.xml
deleted file mode 100644
index 03dd2df..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValueAttributes2.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-<ad:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
-	id="container" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-	xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	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"
-	xsi:type="ad:Mapped">
-	<resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
-		ref="TheOrphan" />
-	<ad:ValueMap>
-		<ad:ReturnValue>return</ad:ReturnValue>
-		<ad:SourceValue ignoreCase="false" partialMatch="false">sourceValueAttributes2</ad:SourceValue>
-	</ad:ValueMap>
-</ad:AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoSourceValue.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoSourceValue.xml
deleted file mode 100644
index fc00c77..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoSourceValue.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-<ad:ValueMap xmlns="urn:mace:shibboleth:2.0:resolver"
-	xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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">
-	<ad:ReturnValue>return</ad:ReturnValue>
-</ad:ValueMap>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoValues.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoValues.xml
deleted file mode 100644
index a0ca9ce..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMapNoValues.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<ad:ValueMap xmlns="urn:mace:shibboleth:2.0:resolver"
-	xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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"/>

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


More information about the commits mailing list