[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Jan 14 15:21:15 2014
New Revision: 5198

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5198&view=rev
Log:
IDP-310 Fix failing parsing test

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/SourceValue.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/SourceValue.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/SourceValue.java?rev=5198&r1=5197&r2=5198&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/SourceValue.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/SourceValue.java Tue Jan 14 15:21:15 2014
@@ -96,7 +96,7 @@
      * @return the value string.
      */
     @Nullable public String getValue() {
-        Constraint.isTrue(isPartialMatch(), "getValue is only meaningful for a partialMatch");
+        Constraint.isTrue(isPartialMatch(), "getValue is only meaningful for a partialMatch, use getPattern()");
         return value;
     }
 
@@ -106,7 +106,7 @@
      * @return Returns the pattern.
      */
     @Nonnull public Pattern getPattern() {
-        Constraint.isFalse(isPartialMatch(), "getPattern is only meaningful for a non partial Match");
+        Constraint.isFalse(isPartialMatch(), "getPattern is only meaningful for a non partial Match, use getValue()");
         return pattern;
     }
 

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java?rev=5198&r1=5197&r2=5198&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java Tue Jan 14 15:21:15 2014
@@ -43,7 +43,7 @@
         ValueMap value = getValueMap("valueMap.xml");
         Assert.assertEquals(value.getReturnValue(), "return");
         Assert.assertEquals(value.getSourceValues().size(), 1);
-        Assert.assertEquals(value.getSourceValues().iterator().next().getValue(), "source");
+        Assert.assertEquals(value.getSourceValues().iterator().next().getPattern().pattern(), "source");
     }
     
     @Test public void noSourceValues() {