[jboss-svn-commits] JBL Code SVN: r29484 - in labs/jbossesb/workspace/dbevenius/saml_support/product: rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 28 06:22:06 EDT 2009
Author: beve
Date: 2009-09-28 06:22:05 -0400 (Mon, 28 Sep 2009)
New Revision: 29484
Modified:
labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/login/SamlCredentialUnitTest.java
labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlVisitorUnitTest.java
labs/jbossesb/workspace/dbevenius/saml_support/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/SOAPSamlHandlerUnitTest.java
Log:
modified unit test to use XMLHelper instead of XMLUnit.
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/login/SamlCredentialUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/login/SamlCredentialUnitTest.java 2009-09-28 09:19:01 UTC (rev 29483)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/login/SamlCredentialUnitTest.java 2009-09-28 10:22:05 UTC (rev 29484)
@@ -20,21 +20,14 @@
*/
package org.jboss.soa.esb.services.security.auth.login;
-import java.io.IOException;
-
+import static org.junit.Assert.assertTrue;
import junit.framework.JUnit4TestAdapter;
-import org.custommonkey.xmlunit.XMLAssert;
-import org.custommonkey.xmlunit.XMLUnit;
import org.jboss.internal.soa.esb.util.StreamUtils;
-import org.jboss.soa.esb.services.security.SecurityServiceException;
+import org.jboss.internal.soa.esb.util.XMLHelper;
import org.jboss.util.xml.DOMUtils;
-import org.junit.BeforeClass;
import org.junit.Test;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/**
* Unit test for {@link SamlCredential}.
@@ -44,24 +37,19 @@
*/
public class SamlCredentialUnitTest
{
- @BeforeClass
- public static void setup()
- {
- XMLUnit.setIgnoreWhitespace( true );
- }
-
@Test
- public void stringConstructor() throws IOException, SecurityServiceException, SAXException
+ public void stringConstructor() throws Exception
{
final SamlCredential samlPrincipal = new SamlCredential(StreamUtils.readStreamString(getClass().getResourceAsStream("assertion.xml"), "UTF-8"));
- final Document expected = XMLUnit.buildControlDocument(new InputSource(getClass().getResourceAsStream("assertion-expected.xml")));
- final Document actual = XMLUnit.buildTestDocument(samlPrincipal.getAssertion());
- XMLAssert.assertXMLEqual(expected, actual);
+ final String expected = StreamUtils.readStreamString(getClass().getResourceAsStream("assertion-expected.xml"), "UTF-8");
+ final String actual = samlPrincipal.getAssertion();
+
+ assertTrue(XMLHelper.compareXMLContent(expected, actual));
}
@Test
- public void elementConstructor() throws IOException, SecurityServiceException, SAXException
+ public void elementConstructor() throws Exception
{
final Element assertionElement = DOMUtils.parse(getClass().getResourceAsStream("assertion.xml"));
final String expectedAssertion = SamlCredential.assertionToString(assertionElement);
@@ -69,7 +57,7 @@
final SamlCredential samlPrincipal = new SamlCredential(assertionElement);
final String actualAssertion = samlPrincipal.getAssertion();
- XMLAssert.assertXMLEqual(expectedAssertion, actualAssertion);
+ assertTrue(XMLHelper.compareXMLContent(expectedAssertion, actualAssertion));
}
@Test (expected = IllegalArgumentException.class)
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlVisitorUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlVisitorUnitTest.java 2009-09-28 09:19:01 UTC (rev 29483)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/SamlVisitorUnitTest.java 2009-09-28 10:22:05 UTC (rev 29484)
@@ -20,15 +20,14 @@
*/
package org.jboss.soa.esb.services.security.auth.ws;
+import static org.junit.Assert.assertTrue;
import junit.framework.JUnit4TestAdapter;
-import org.custommonkey.xmlunit.XMLAssert;
-import org.custommonkey.xmlunit.XMLUnit;
import org.jboss.internal.soa.esb.util.StreamUtils;
+import org.jboss.internal.soa.esb.util.XMLHelper;
import org.jboss.soa.esb.services.security.auth.login.SamlContext;
import org.jboss.soa.esb.services.security.auth.login.SamlCredential;
import org.junit.After;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.milyn.FilterSettings;
import org.milyn.Smooks;
@@ -63,8 +62,8 @@
final String expected = "<Envelope><Header>" + SECURITY_START + "<dummyAssertion/></t:Security></Header></Envelope>";
final String actual = result.toString();
-
- XMLAssert.assertXMLEqual("Expected the assertion to have been added to the Security header", expected, actual);
+
+ assertTrue(XMLHelper.compareXMLContent(expected, actual));
}
/**
@@ -84,7 +83,7 @@
final String actual = result.toString();
- XMLAssert.assertXMLEqual("Expected the SOAP Message to be unchanged", expected, actual);
+ assertTrue(XMLHelper.compareXMLContent(expected, actual));
}
@Test
@@ -103,7 +102,7 @@
final String expected = "<Envelope>" + HEADER_START + SECURITY_START + "<dummyAssertion/></t:Security></h:Header></Envelope>";
final String actual = result.toString();
- XMLAssert.assertXMLEqual("Expected a Security Header to have been created an the assertion inserted into it", expected, actual);
+ assertTrue(XMLHelper.compareXMLContent(expected, actual));
}
@Test
@@ -122,7 +121,7 @@
final String expected = StreamUtils.readStreamString(getClass().getResourceAsStream("saml-inject-expected.xml"), "UTF-8");
final String actual = result.toString();
- XMLAssert.assertXMLEqual("Expected the assertion to have been added to the Security header", expected, actual);
+ assertTrue(XMLHelper.compareXMLContent(expected, actual));
}
@Test
@@ -141,7 +140,7 @@
final String expected = StreamUtils.readStreamString(getClass().getResourceAsStream("saml-inject-expected.xml"), "UTF-8");
final String actual = result.toString();
- XMLAssert.assertXMLEqual("Expected a Security Header to have been created an the assertion inserted into it", expected, actual);
+ assertTrue(XMLHelper.compareXMLContent(expected, actual));
}
private Smooks createSmooks(final String selector)
@@ -157,12 +156,6 @@
return smooks;
}
- @BeforeClass
- public static void before()
- {
- XMLUnit.setIgnoreWhitespace(true);
- }
-
@After
public void teardown()
{
Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/SOAPSamlHandlerUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/SOAPSamlHandlerUnitTest.java 2009-09-28 09:19:01 UTC (rev 29483)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/SOAPSamlHandlerUnitTest.java 2009-09-28 10:22:05 UTC (rev 29484)
@@ -24,29 +24,23 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.io.IOException;
import java.util.Iterator;
import javax.xml.namespace.QName;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.soap.SOAPMessageContext;
import junit.framework.JUnit4TestAdapter;
-import org.custommonkey.xmlunit.XMLAssert;
-import org.custommonkey.xmlunit.XMLUnit;
import org.jboss.internal.soa.esb.util.StreamUtils;
+import org.jboss.internal.soa.esb.util.XMLHelper;
import org.jboss.soa.esb.services.security.auth.login.SamlContext;
import org.jboss.soa.esb.services.security.auth.login.SamlCredential;
-import org.junit.BeforeClass;
import org.junit.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
/**
* Unit test for {@link SOAPSamlHandler}.
@@ -58,14 +52,8 @@
{
private QName assertionQName = new QName("urn:oasis:names:tc:SAML:2.0:assertion", "Assertion");
- @BeforeClass
- public static void setup()
- {
- XMLUnit.setIgnoreWhitespace(true);
- }
-
@Test
- public void handleMessage() throws SOAPException, SAXException, IOException
+ public void handleMessage() throws Exception
{
final SOAPSamlHandler handler = new SOAPSamlHandler();
final SOAPMessageContext messageContext = mock(SOAPMessageContext.class);
@@ -90,9 +78,9 @@
while (assertions.hasNext())
{
final SOAPElement assertionElement = assertions.next();
- final Document expected = XMLUnit.buildControlDocument(samlPrincipal.getAssertion());
- final Document actual = XMLUnit.buildTestDocument(SamlCredential.assertionToString(assertionElement));
- XMLAssert.assertXMLEqual(expected, actual);
+ final String expected = samlPrincipal.getAssertion();
+ final String actual = SamlCredential.assertionToString(assertionElement);
+ assertTrue(XMLHelper.compareXMLContent(expected, actual));
}
}
}
More information about the jboss-svn-commits
mailing list