[java-idp-testbed COMMIT] in /trunk/src/test/java/idp: saml1/SAML1UnsolicitedFlowTest.java saml2/SAML2RedirectSSOFlow...

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Jan 31 15:49:48 2014
New Revision: 139

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=139&view=rev
Log:
Fix ordering of arguments to assertEquals().

Modified:
    trunk/src/test/java/idp/saml1/SAML1UnsolicitedFlowTest.java
    trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java

Modified: trunk/src/test/java/idp/saml1/SAML1UnsolicitedFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml1/SAML1UnsolicitedFlowTest.java?rev=139&r1=138&r2=139&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml1/SAML1UnsolicitedFlowTest.java (original)
+++ trunk/src/test/java/idp/saml1/SAML1UnsolicitedFlowTest.java Fri Jan 31 15:49:48 2014
@@ -56,7 +56,7 @@
         request.addParameter("providerId", "https://sp.example.org");
 
         FlowExecutionResult result = flowExecutor.launchExecution(FLOW_ID, null, externalContext);
-        Assert.assertEquals(result.getFlowId(), FLOW_ID);
+        Assert.assertEquals(FLOW_ID, result.getFlowId());
 
         FlowExecutionOutcome outcome = result.getOutcome();
         log.debug("flow outcome {}", outcome);
@@ -73,40 +73,40 @@
 
         Response response = (Response) prc.getOutboundMessageContext().getMessage();
         Assert.assertEquals(response.getVersion(), SAMLVersion.VERSION_11);
-        Assert.assertEquals(StatusCode.SUCCESS, response.getStatus().getStatusCode().getValue());
+        Assert.assertEquals(response.getStatus().getStatusCode().getValue(), StatusCode.SUCCESS);
 
         Assert.assertNotNull(response.getAssertions());
         Assert.assertFalse(response.getAssertions().isEmpty());
-        Assert.assertEquals(1, response.getAssertions().size());
+        Assert.assertEquals(response.getAssertions().size(), 1);
         Assert.assertNotNull(response.getAssertions().get(0));
 
         Assertion assertion = response.getAssertions().get(0);
-        Assert.assertEquals(SAMLVersion.VERSION_11.getMajorVersion(), assertion.getMajorVersion());
-        Assert.assertEquals(SAMLVersion.VERSION_11.getMinorVersion(), assertion.getMinorVersion());
-        Assert.assertEquals("https://idp.example.org", assertion.getIssuer());
+        Assert.assertEquals(assertion.getMajorVersion(), SAMLVersion.VERSION_11.getMajorVersion());
+        Assert.assertEquals(assertion.getMinorVersion(), SAMLVersion.VERSION_11.getMinorVersion());
+        Assert.assertEquals(assertion.getIssuer(), "https://idp.example.org");
 
         // TODO assertion conditions ?
 
         Assert.assertNotNull(assertion.getAuthenticationStatements());
         Assert.assertFalse(assertion.getAuthenticationStatements().isEmpty());
-        Assert.assertEquals(1, assertion.getAuthenticationStatements().size());
+        Assert.assertEquals(assertion.getAuthenticationStatements().size(), 1);
         Assert.assertNotNull(assertion.getAuthenticationStatements().get(0));
 
         AuthenticationStatement authnStatement = assertion.getAuthenticationStatements().get(0);
         // TODO authn method ?
-        Assert.assertEquals(AuthenticationStatement.UNSPECIFIED_AUTHN_METHOD, authnStatement.getAuthenticationMethod());
+        Assert.assertEquals(authnStatement.getAuthenticationMethod(), AuthenticationStatement.UNSPECIFIED_AUTHN_METHOD);
         // TODO subject locality, etc
 
         Assert.assertNotNull(assertion.getAttributeStatements());
         Assert.assertFalse(assertion.getAttributeStatements().isEmpty());
-        Assert.assertEquals(1, assertion.getAttributeStatements().size());
+        Assert.assertEquals(assertion.getAttributeStatements().size(), 1);
         Assert.assertNotNull(assertion.getAttributeStatements().get(0));
 
         AttributeStatement attributeStatement = assertion.getAttributeStatements().get(0);
 
         Assert.assertNotNull(attributeStatement.getAttributes());
         Assert.assertFalse(attributeStatement.getAttributes().isEmpty());
-        Assert.assertEquals(2, attributeStatement.getAttributes().size());
+        Assert.assertEquals(attributeStatement.getAttributes().size(), 2);
 
         // TODO attribute ordering ?
         Attribute eduPersonAffiliation = attributeStatement.getAttributes().get(0);
@@ -114,17 +114,17 @@
         Assert.assertEquals(eduPersonAffiliation.getAttributeNamespace(),
                 "urn:mace:shibboleth:1.0:attributeNamespace:uri");
         // Assert.assertEquals("eduPersonAffiliation", eduPersonAffiliation.);
-        Assert.assertEquals(1, eduPersonAffiliation.getAttributeValues().size());
+        Assert.assertEquals(eduPersonAffiliation.getAttributeValues().size(), 1);
         Assert.assertTrue(eduPersonAffiliation.getAttributeValues().get(0) instanceof XSString);
-        Assert.assertEquals("member", ((XSString) eduPersonAffiliation.getAttributeValues().get(0)).getValue());
+        Assert.assertEquals(((XSString) eduPersonAffiliation.getAttributeValues().get(0)).getValue(), "member");
 
         Attribute mail = attributeStatement.getAttributes().get(1);

[... 79 lines stripped ...]