Author: veithen Date: Sun Mar 11 11:56:48 2012 New Revision: 1299347 URL: http://svn.apache.org/viewvc?rev=1299347&view=rev Log: Eliminated one instance of the catch-and-fail JUnit anti-pattern.
Modified: axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java Modified: axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java?rev=1299347&r1=1299346&r2=1299347&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java (original) +++ axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java Sun Mar 11 11:56:48 2012 @@ -169,36 +169,30 @@ public class SOAPBodyTest extends Assert } } - //TODO : fix @Validated @Test - public void testExtractContentAsDocument() { - try { - MessageFactory fact = MessageFactory.newInstance(); - SOAPMessage message = fact.createMessage(); - SOAPBody soapBody = message.getSOAPBody(); + public void testExtractContentAsDocument() throws Exception { + MessageFactory fact = MessageFactory.newInstance(); + SOAPMessage message = fact.createMessage(); + SOAPBody soapBody = message.getSOAPBody(); - QName qname1 = new QName("http://wombat.ztrade.com", - "GetLastTradePrice", "ztrade"); - SOAPElement child1 = soapBody.addChildElement(qname1); - Document document = soapBody.extractContentAsDocument(); - - assertNotNull(document); - assertTrue(document instanceof Document); - Element element = document.getDocumentElement(); - String elementName = element.getTagName(); - - //Retreive the children of the SOAPBody (should be none) - Iterator childElements = soapBody.getChildElements(); - int childCount = 0; - while (childElements.hasNext()) { - Object object = childElements.next(); - childCount++; - } - assertEquals(childCount, 0); - } - catch (Exception e) { - fail("Unexpected Exception : " + e); + QName qname1 = new QName("http://wombat.ztrade.com", + "GetLastTradePrice", "ztrade"); + SOAPElement child1 = soapBody.addChildElement(qname1); + Document document = soapBody.extractContentAsDocument(); + + assertNotNull(document); + assertTrue(document instanceof Document); + Element element = document.getDocumentElement(); + String elementName = element.getTagName(); + + //Retreive the children of the SOAPBody (should be none) + Iterator childElements = soapBody.getChildElements(); + int childCount = 0; + while (childElements.hasNext()) { + Object object = childElements.next(); + childCount++; } + assertEquals(childCount, 0); } /*