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

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Sep 26 20:54:37 2014
New Revision: 6594

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6594&view=rev
Log:
OSJ-18: Harmonize names of status codes in org.opensaml.saml.saml1.core.StatusCode and org.opensaml.saml.saml2.core.StatusCode

Modified:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
    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/SAML2AttributeQueryFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java?rev=6594&r1=6593&r2=6594&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java Fri Sep 26 20:54:37 2014
@@ -99,7 +99,7 @@
 
         final FlowExecutionResult result = flowExecutor.launchExecution(FLOW_ID, null, externalContext);
 
-        validator.statusCode = StatusCode.REQUESTER_URI;
+        validator.statusCode = StatusCode.REQUESTER;
 
         validateResult(result, FLOW_ID, validator);
     }

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=6594&r1=6593&r2=6594&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 Fri Sep 26 20:54:37 2014
@@ -76,10 +76,10 @@
     @Nonnull public NameID nameID;
 
     /** Expected status code. */
-    @Nonnull protected String statusCode = StatusCode.SUCCESS_URI;
+    @Nonnull protected String statusCode = StatusCode.SUCCESS;
 
     /** Expected nested status code when an error occurs. */
-    @Nonnull protected String statusCodeNested = StatusCode.REQUEST_DENIED_URI;
+    @Nonnull protected String statusCodeNested = StatusCode.REQUEST_DENIED;
 
     /** Expected status message when an error occurs. */
     @Nonnull protected String statusMessage = "An error occurred.";
@@ -137,7 +137,7 @@
         assertStatus(response.getStatus());
 
         // short circuit validation upon error
-        if (statusCode != StatusCode.SUCCESS_URI) {
+        if (statusCode != StatusCode.SUCCESS) {
             return;
         }
 
@@ -302,7 +302,7 @@
         Assert.assertNotNull(status);
         Assert.assertNotNull(status.getStatusCode());
         Assert.assertEquals(status.getStatusCode().getValue(), statusCode);
-        if (statusCode != StatusCode.SUCCESS_URI) {
+        if (statusCode != StatusCode.SUCCESS) {
             Assert.assertEquals(status.getStatusMessage().getMessage(), statusMessage);
             Assert.assertEquals(status.getStatusCode().getStatusCode().getValue(), statusCodeNested);
         }