[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src: main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Apr  2 10:44:06 2014
New Revision: 5684

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5684&view=rev
Log:
IDP-389 extra tests for validUntil filter

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParserTest.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParser.java?rev=5684&r1=5683&r2=5684&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParser.java Wed Apr  2 10:44:06 2014
@@ -44,7 +44,7 @@
     @Override
     protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
         if (element.hasAttributeNS(null, "maxValidityInterval")) {
-            builder.addPropertyReference("maxValidityInterval", element.getAttributeNS(null, "maxValidityInterval"));
+            builder.addPropertyValue("maxValidityInterval", element.getAttributeNS(null, "maxValidityInterval"));
         }
     }
 

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParserTest.java?rev=5684&r1=5683&r2=5684&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParserTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParserTest.java Wed Apr  2 10:44:06 2014
@@ -20,7 +20,6 @@
 import java.io.IOException;
 
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataParserTest;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.opensaml.saml.metadata.resolver.filter.impl.RequiredValidUntilFilter;
@@ -31,10 +30,19 @@
  *
  */
 public class RequiredValidUntilParserTest extends AbstractMetadataParserTest {
+
+    @Test public void validUntil() throws IOException {
+        MetadataResolver resolver = getBean(MetadataResolver.class, true, "filter/requiredValidUntil.xml");
+
+        final RequiredValidUntilFilter filter = (RequiredValidUntilFilter) resolver.getMetadataFilter();
+        Assert.assertEquals(filter.getMaxValidityInterval(), 0);
+    }
     
-    @Test public void validUntil() throws ResolverException, IOException {
-        MetadataResolver resolver = getBean(MetadataResolver.class, true, "filter/requiredValidUntil.xml");
-     
-        Assert.assertEquals(resolver.getMetadataFilter().getClass(), RequiredValidUntilFilter.class);
+    @Test public void param() throws IOException {
+        MetadataResolver resolver = getBean(MetadataResolver.class, true, "filter/requiredValidUntilParam.xml");
+
+        final RequiredValidUntilFilter filter = (RequiredValidUntilFilter) resolver.getMetadataFilter();
+        Assert.assertEquals(filter.getMaxValidityInterval(), 2*3600*24*1000);
     }
+
 }