[java-identity-provider] 22/27: IDP-1434 Add properties testing to old 'encoder' tests
Scott Cantor
cantor.2 at osu.edu
Fri May 3 14:32:12 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch feature/IDP-1434
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=24cc476d566bb1cf99771bcd2404b13251c635f4
commit 24cc476d566bb1cf99771bcd2404b13251c635f4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu May 2 16:22:32 2019 +0100
IDP-1434 Add properties testing to old 'encoder' tests
---
.../spring/BaseAttributeDefinitionParserTest.java | 15 +++++++++++++++
.../spring/enc/SAML1Base64AttributeEncoderParserTest.java | 9 +++++++--
.../enc/SAML1ScopedStringAttributeEncoderParserTest.java | 9 +++++++--
.../spring/enc/SAML1StringAttributeEncoderParserTest.java | 10 +++++++---
.../enc/SAML1XMLObjectAttributeEncoderParserTest.java | 9 +++++++--
.../spring/enc/SAML2Base64AttributeEncoderParserTest.java | 9 +++++++--
.../enc/SAML2ScopedStringAttributeEncoderParserTest.java | 9 +++++++--
.../spring/enc/SAML2StringAttributeEncoderParserTest.java | 9 +++++++--
.../enc/SAML2XMLObjectAttributeEncoderParserTest.java | 8 ++++++--
.../resolver/spring/enc/resolver/saml1Base64.xml | 2 +-
.../resolver/spring/enc/resolver/saml1Scoped.xml | 2 +-
.../resolver/spring/enc/resolver/saml1String.xml | 2 +-
.../resolver/spring/enc/resolver/saml1XmlObject.xml | 2 +-
.../resolver/spring/enc/resolver/saml2Base64.xml | 2 +-
.../resolver/spring/enc/resolver/saml2Scoped.xml | 2 +-
.../resolver/spring/enc/resolver/saml2String.xml | 2 +-
.../resolver/spring/enc/resolver/saml2XmlObject.xml | 2 +-
17 files changed, 78 insertions(+), 25 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
index 33fada4..7e24fd9 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
@@ -29,6 +29,9 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ConversionServiceFactoryBean;
import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.mock.env.MockPropertySource;
import org.testng.annotations.AfterMethod;
import net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor;
@@ -192,8 +195,20 @@ public abstract class BaseAttributeDefinitionParserTest extends OpenSAMLInitBase
}
protected Collection<Map<String,Object>> getAttributeTranscoderRule(final String fileName, final Class<Collection> claz) {
+ return getAttributeTranscoderRule(fileName, claz, (String)null);
+ }
+
+ protected Collection<Map<String,Object>> getAttributeTranscoderRule(final String fileName, final Class<Collection> claz, String propValue) {
final GenericApplicationContext context = new GenericApplicationContext();
+
+ if (propValue != null) {
+ final MockPropertySource mockEnvVars = new MockPropertySource();
+ mockEnvVars.setProperty("the.boolean.variable", propValue);
+ final MutablePropertySources propertySources = context.getEnvironment().getPropertySources();
+ propertySources.replace(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME, mockEnvVars);
+ }
+
setTestContext(context);
context.setDisplayName("ApplicationContext: " + claz);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
index f1ac9ed..1f6d522 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
@@ -38,8 +38,13 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1ByteAttributeTran
public class SAML1Base64AttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
@Test public void newNameSpace() {
+ boolTest(true);
+ boolTest(false);
+ }
+
+ private void boolTest(boolean value) {
final Collection<Map<String,Object>> rules =
- getAttributeTranscoderRule("resolver/saml1Base64.xml", Collection.class);
+ getAttributeTranscoderRule("resolver/saml1Base64.xml", Collection.class, value?"true":"false");
assertEquals(rules.size(), 1);
final Map<String,Object> rule = rules.iterator().next();
@@ -47,7 +52,7 @@ public class SAML1Base64AttributeEncoderParserTest extends BaseAttributeDefiniti
assertTrue(rule.get(AttributeTranscoderRegistry.PROP_TRANSCODER) instanceof SAML1ByteAttributeTranscoder);
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAME), "SAML1_BASE64_ATTRIBUTE_NAME");
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAMESPACE), "SAML1_BASE64_ATTRIBUTE_NAME_SPACE");
- assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
index 2cc265d..bc16590 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
@@ -38,8 +38,13 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1ScopedStringAttri
public class SAML1ScopedStringAttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
@Test public void newNamespace() {
+ boolTest(true);
+ boolTest(false);
+ }
+
+ private void boolTest(boolean value) {
final Collection<Map<String,Object>> rules =
- getAttributeTranscoderRule("resolver/saml1Scoped.xml", Collection.class);
+ getAttributeTranscoderRule("resolver/saml1Scoped.xml", Collection.class, value?"true":"false");
assertEquals(rules.size(), 1);
final Map<String,Object> rule = rules.iterator().next();
@@ -50,7 +55,7 @@ public class SAML1ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
assertEquals(rule.get(SAML1ScopedStringAttributeTranscoder.PROP_SCOPE_TYPE), "attribute");
assertEquals(rule.get(SAML1ScopedStringAttributeTranscoder.PROP_SCOPE_ATTR_NAME), "saml1ScopeAttrib");
assertEquals(rule.get(SAML1ScopedStringAttributeTranscoder.PROP_SCOPE_DELIMITER), "#@#");
- assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
index 3767ed8..334ac11 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
@@ -37,9 +37,13 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1StringAttributeTr
*/
public class SAML1StringAttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
- @Test public void newNamespace() {
+ @Test public void newNameFormat() {
+ newNameFormat(true);
+ newNameFormat(false);
+ }
+ private void newNameFormat(boolean value) {
final Collection<Map<String,Object>> rules =
- getAttributeTranscoderRule("resolver/saml1String.xml", Collection.class);
+ getAttributeTranscoderRule("resolver/saml1String.xml", Collection.class, value?"true":"false");
assertEquals(rules.size(), 1);
final Map<String,Object> rule = rules.iterator().next();
@@ -47,7 +51,7 @@ public class SAML1StringAttributeEncoderParserTest extends BaseAttributeDefiniti
assertTrue(rule.get(AttributeTranscoderRegistry.PROP_TRANSCODER) instanceof SAML1StringAttributeTranscoder);
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAME), "SAML1_STRING_ATTRIBUTE_NAME");
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAMESPACE), "SAML1_STRING_ATTRIBUTE_NAME_SPACE");
- assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
index ccb118b..bb99754 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
@@ -38,8 +38,13 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1XMLObjectAttribut
public class SAML1XMLObjectAttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
@Test public void newNamespace() {
+ boolTest(true);
+ boolTest(false);
+ }
+
+ private void boolTest(boolean value) {
final Collection<Map<String,Object>> rules =
- getAttributeTranscoderRule("resolver/saml1XmlObject.xml", Collection.class);
+ getAttributeTranscoderRule("resolver/saml1XmlObject.xml", Collection.class, value?"true":"false");
assertEquals(rules.size(), 1);
final Map<String,Object> rule = rules.iterator().next();
@@ -47,7 +52,7 @@ public class SAML1XMLObjectAttributeEncoderParserTest extends BaseAttributeDefin
assertTrue(rule.get(AttributeTranscoderRegistry.PROP_TRANSCODER) instanceof SAML1XMLObjectAttributeTranscoder);
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAME), "SAML1_XMLObject_ATTRIBUTE_NAME");
assertEquals(rule.get(AbstractSAML1AttributeTranscoder.PROP_NAMESPACE), "SAML1_XMLObject_ATTRIBUTE_NAME_SPACE");
- assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
}
@Test public void defaultCase() {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
index a880331..550b1e4 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
@@ -38,8 +38,13 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2ByteAttributeTran
public class SAML2Base64AttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
@Test public void newNameFormat() {
+ boolTest(true);
+ boolTest(false);
+ }
+
+ private void boolTest(boolean value) {
final Collection<Map<String,Object>> rules =
- getAttributeTranscoderRule("resolver/saml2Base64.xml", Collection.class);
+ getAttributeTranscoderRule("resolver/saml2Base64.xml", Collection.class, value?"true":"false");
assertEquals(rules.size(), 1);
final Map<String,Object> rule = rules.iterator().next();
@@ -48,7 +53,7 @@ public class SAML2Base64AttributeEncoderParserTest extends BaseAttributeDefiniti
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_NAME), "Saml2Base64_ATTRIBUTE_NAME");
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_NAME_FORMAT), "Saml2Base64_ATTRIBUTE_NAME_FORMAT");
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_FRIENDLY_NAME), "Saml2Base64_ATTRIBUTE_FRIENDLY_NAME");
- assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
}
@Test public void defaultCase() {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
index 651b75b..fd305cc 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
@@ -38,8 +38,13 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2ScopedStringAttri
public class SAML2ScopedStringAttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
@Test public void resolver() {
+ boolTest(true);
+ boolTest(false);
+ }
+
+ private void boolTest(boolean value) {
final Collection<Map<String,Object>> rules =
- getAttributeTranscoderRule("resolver/saml2Scoped.xml", Collection.class);
+ getAttributeTranscoderRule("resolver/saml2Scoped.xml", Collection.class, value?"true":"false");
assertEquals(rules.size(), 1);
final Map<String,Object> rule = rules.iterator().next();
@@ -51,7 +56,7 @@ public class SAML2ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
assertEquals(rule.get(SAML2ScopedStringAttributeTranscoder.PROP_SCOPE_TYPE), "attribute");
assertEquals(rule.get(SAML2ScopedStringAttributeTranscoder.PROP_SCOPE_ATTR_NAME), "scopeAttrib");
assertEquals(rule.get(SAML2ScopedStringAttributeTranscoder.PROP_SCOPE_DELIMITER), "###");
- assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
}
@Test public void defaultCase() {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
index 109e53d..c193e58 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
@@ -38,8 +38,13 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2StringAttributeTr
public class SAML2StringAttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
@Test public void newNameFormat() {
+ boolTest(true);
+ boolTest(false);
+ }
+
+ private void boolTest(boolean value) {
final Collection<Map<String,Object>> rules =
- getAttributeTranscoderRule("resolver/saml2String.xml", Collection.class);
+ getAttributeTranscoderRule("resolver/saml2String.xml", Collection.class, value?"true":"false");
assertEquals(rules.size(), 1);
final Map<String,Object> rule = rules.iterator().next();
@@ -48,7 +53,7 @@ public class SAML2StringAttributeEncoderParserTest extends BaseAttributeDefiniti
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_NAME), "Saml2String_ATTRIBUTE_NAME");
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_NAME_FORMAT), "Saml2String_ATTRIBUTE_NAME_FORMAT");
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_FRIENDLY_NAME), "Saml2String_ATTRIBUTE_FRIENDLY_NAME");
- assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
}
@Test public void defaultCase() {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
index fa68ada..7ba989e 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
@@ -38,8 +38,12 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2XMLObjectAttribut
public class SAML2XMLObjectAttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
@Test public void newNameFormat() {
+ newNameFormat(true);
+ newNameFormat(false);
+ }
+ private void newNameFormat(boolean value) {
final Collection<Map<String,Object>> rules =
- getAttributeTranscoderRule("resolver/saml2XmlObject.xml", Collection.class);
+ getAttributeTranscoderRule("resolver/saml2XmlObject.xml", Collection.class, value?"true":"false");
assertEquals(rules.size(), 1);
final Map<String,Object> rule = rules.iterator().next();
@@ -48,7 +52,7 @@ public class SAML2XMLObjectAttributeEncoderParserTest extends BaseAttributeDefin
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_NAME), "Saml2XmlObject_ATTRIBUTE_NAME");
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_NAME_FORMAT), "Saml2XmlObject_ATTRIBUTE_NAME_FORMAT");
assertEquals(rule.get(AbstractSAML2AttributeTranscoder.PROP_FRIENDLY_NAME), "Saml2XmlObject_ATTRIBUTE_FRIENDLY_NAME");
- assertFalse(((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
+ assertEquals(value, ((Predicate) rule.get(AttributeTranscoderRegistry.PROP_CONDITION)).test(null));
}
@Test public void defaultCase() {
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64.xml
index 7246be4..f7e1990 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64.xml
@@ -7,7 +7,7 @@
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
- <Script>false</Script>
+ <Script>%{the.boolean.variable}</Script>
</ActivationConditionScript>
</AttributeEncoder>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Scoped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Scoped.xml
index 5386708..ddfdbd7 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Scoped.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Scoped.xml
@@ -10,7 +10,7 @@
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
- <Script>false</Script>
+ <Script>%{the.boolean.variable}</Script>
</ActivationConditionScript>
</AttributeEncoder>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1String.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1String.xml
index d4af1c4..0cd4827 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1String.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1String.xml
@@ -7,7 +7,7 @@
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
- <Script>false</Script>
+ <Script>%{the.boolean.variable}</Script>
</ActivationConditionScript>
</AttributeEncoder>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObject.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObject.xml
index 3f012fb..de4d0c1 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObject.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObject.xml
@@ -7,7 +7,7 @@
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
- <Script>false</Script>
+ <Script>%{the.boolean.variable}</Script>
</ActivationConditionScript>
</AttributeEncoder>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64.xml
index 24216d5..8d6ee2d 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64.xml
@@ -8,7 +8,7 @@
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
- <Script>false</Script>
+ <Script>%{the.boolean.variable}</Script>
</ActivationConditionScript>
</AttributeEncoder>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Scoped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Scoped.xml
index 7b6502d..7ecac0e 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Scoped.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Scoped.xml
@@ -11,7 +11,7 @@
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
- <Script>false</Script>
+ <Script>%{the.boolean.variable}</Script>
</ActivationConditionScript>
</AttributeEncoder>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2String.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2String.xml
index 1c2cdff..0576dbb 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2String.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2String.xml
@@ -8,7 +8,7 @@
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
- <Script>false</Script>
+ <Script>%{the.boolean.variable}</Script>
</ActivationConditionScript>
</AttributeEncoder>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObject.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObject.xml
index 9e69400..c87848e 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObject.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObject.xml
@@ -8,7 +8,7 @@
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ActivationConditionScript>
- <Script>false</Script>
+ <Script>%{the.boolean.variable}</Script>
</ActivationConditionScript>
</AttributeEncoder>
\ 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