[java-identity-provider COMMIT] /trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseVa...

[noreply at shibboleth.net]

Author: tzeller
Date: Sat Jul  9 18:04:20 2016
New Revision: 8290

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8290&view=rev
Log:
Revert r8289 which breaks the test "API"

Do not rename a public field, just add the new one.

Modified:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java?rev=8290&r1=8289&r2=8290&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java	(original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java	Sat Jul  9 18:04:20 2016
@@ -84,7 +84,7 @@
     @Nonnull public String subjectConfirmationMethod = SubjectConfirmation.METHOD_BEARER;
     
     /** Expected subject confirmation data address range for IPv4 addresses. Defaults to "127.0.0.1/32". */
-    @Nonnull public IPRange subjectConfirmationDataAddressRangeV4 = IPRange.parseCIDRBlock("127.0.0.1/32");
+    @Nonnull public IPRange subjectConfirmationDataAddressRange = IPRange.parseCIDRBlock("127.0.0.1/32");
     
     /** Expected subject confirmation data address range for IPv6 addresses. Defaults to "::1/128". */
     @Nonnull public IPRange subjectConfirmationDataAddressRangeV6 = IPRange.parseCIDRBlock("::1/128");
@@ -434,7 +434,7 @@
     public void assertSubjectConfirmationData(@Nullable final SubjectConfirmationData subjectConfirmationData) {
         final InetAddress address = InetAddresses.forString(subjectConfirmationData.getAddress());
         if (address instanceof Inet4Address) {
-            Assert.assertTrue(subjectConfirmationDataAddressRangeV4.contains(address));
+            Assert.assertTrue(subjectConfirmationDataAddressRange.contains(address));
         } else if(address instanceof Inet6Address) {
             Assert.assertTrue(subjectConfirmationDataAddressRangeV6.contains(address));
         } else {