[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject: KeyAuth...

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Apr  3 21:51:50 2012
New Revision: 4159

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4159&view=rev
Log:
Do a bunch of unit test clean up, in prep for TestNG conversion

Modified:
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/KeyAuthorityTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/ScopeTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/ScopedValueTest.java

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/KeyAuthorityTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/KeyAuthorityTest.java?rev=4159&r1=4158&r2=4159&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/KeyAuthorityTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/KeyAuthorityTest.java Tue Apr  3 21:51:50 2012
@@ -60,7 +60,7 @@
     public void testSingleElementMarshall() {
         KeyAuthority keyAuthority = (KeyAuthority) buildXMLObject(KeyAuthority.DEFAULT_ELEMENT_NAME);
 
-        assertEquals(expectedDOM, keyAuthority);
+        assertXMLEquals(expectedDOM, keyAuthority);
     }
 
     /** {@inheritDoc} */
@@ -70,7 +70,7 @@
         keyAuthority.setVerifyDepth(expectedVerifyDepth);
         keyAuthority.getUnknownAttributes().put(unknownAttribName, unknownAttribValue);
 
-        assertEquals(expectedOptionalAttributesDOM, keyAuthority);
+        assertXMLEquals(expectedOptionalAttributesDOM, keyAuthority);
     }
 
     /** {@inheritDoc} */
@@ -81,7 +81,7 @@
             keyAuthority.getKeyInfos().add((KeyInfo) buildXMLObject(KeyInfo.DEFAULT_ELEMENT_NAME));
         }
 
-        assertEquals(expectedChildElementsDOM, keyAuthority);
+        assertXMLEquals(expectedChildElementsDOM, keyAuthority);
     }
 
     @Test

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/ScopeTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/ScopeTest.java?rev=4159&r1=4158&r2=4159&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/ScopeTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/ScopeTest.java Tue Apr  3 21:51:50 2012
@@ -51,7 +51,7 @@
 
         scope.setValue(expectedContent);
 
-        assertEquals(expectedDOM, scope);
+        assertXMLEquals(expectedDOM, scope);
     }
 
     /** {@inheritDoc} */
@@ -61,7 +61,7 @@
         scope.setValue(expectedContent);
         scope.setRegexp(expectedRegexp);
 
-        assertEquals(expectedOptionalAttributesDOM, scope);
+        assertXMLEquals(expectedOptionalAttributesDOM, scope);
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/ScopedValueTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/ScopedValueTest.java?rev=4159&r1=4158&r2=4159&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/ScopedValueTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/xmlobject/ScopedValueTest.java Tue Apr  3 21:51:50 2012
@@ -68,7 +68,7 @@
 
         sv.setValue(expectedValue + scopeDelimiter + expectedScope);
 
-        assertEquals(expectedDOM, sv);
+        assertXMLEquals(expectedDOM, sv);
     }
 
     /** {@inheritDoc} */
@@ -79,7 +79,7 @@
         sv.setScopeAttributeName(scopeAttribute);
         sv.setScope(expectedScope);
 
-        assertEquals(expectedOptionalAttributesDOM, sv);
+        assertXMLEquals(expectedOptionalAttributesDOM, sv);
     }
 
     /** {@inheritDoc} */