You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2012/05/15 22:39:01 UTC

svn commit: r1338882 - /synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/eventing/builders/ResponseMessageBuilderTest.java

Author: veithen
Date: Tue May 15 20:39:00 2012
New Revision: 1338882

URL: http://svn.apache.org/viewvc?rev=1338882&view=rev
Log:
Eliminated a couple of instances of the catch-and-fail JUnit anti-pattern.

Modified:
    synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/eventing/builders/ResponseMessageBuilderTest.java

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/eventing/builders/ResponseMessageBuilderTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/eventing/builders/ResponseMessageBuilderTest.java?rev=1338882&r1=1338881&r2=1338882&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/eventing/builders/ResponseMessageBuilderTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/eventing/builders/ResponseMessageBuilderTest.java Tue May 15 20:39:00 2012
@@ -34,7 +34,7 @@ import java.util.Calendar;
 
 public class ResponseMessageBuilderTest extends AbstractTestCase {
 
-    public void testSubscriptionResponse() {
+    public void testSubscriptionResponse() throws Exception {
         String id = UIDGenerator.generateURNString();
         String addressUrl = "http://synapse.test.com/eventing/sunscriptions";
 
@@ -52,21 +52,16 @@ public class ResponseMessageBuilderTest 
                 "</wse:SubscriptionManager>" +
                 "</wse:SubscribeResponse>";
 
-        try {
-            MessageContext msgCtx = TestUtils.getAxis2MessageContext("<empty/>", null).
-                    getAxis2MessageContext();
-            ResponseMessageBuilder builder = new ResponseMessageBuilder(msgCtx);
-            SOAPEnvelope env = builder.genSubscriptionResponse(sub);
-            OMElement resultOm = env.getBody().getFirstElement();
-            OMElement expectedOm = AXIOMUtil.stringToOM(expected);
-            assertTrue(compare(expectedOm, resultOm));
-
-        } catch (Exception e) {
-            fail("Error while constructing the test message context: " + e.getMessage());
-        }
+        MessageContext msgCtx = TestUtils.getAxis2MessageContext("<empty/>", null).
+                getAxis2MessageContext();
+        ResponseMessageBuilder builder = new ResponseMessageBuilder(msgCtx);
+        SOAPEnvelope env = builder.genSubscriptionResponse(sub);
+        OMElement resultOm = env.getBody().getFirstElement();
+        OMElement expectedOm = AXIOMUtil.stringToOM(expected);
+        assertTrue(compare(expectedOm, resultOm));
     }
 
-    public void testUnsubscriptionResponse() {
+    public void testUnsubscriptionResponse() throws Exception {
         String id = UIDGenerator.generateURNString();
         String addressUrl = "http://synapse.test.com/eventing/sunscriptions";
 
@@ -77,21 +72,16 @@ public class ResponseMessageBuilderTest 
         String expected =
                 "<wse:UnsubscribeResponse xmlns:wse=\"http://schemas.xmlsoap.org/ws/2004/08/eventing\"/>";
 
-        try {
-            MessageContext msgCtx = TestUtils.getAxis2MessageContext("<empty/>", null).
-                    getAxis2MessageContext();
-            ResponseMessageBuilder builder = new ResponseMessageBuilder(msgCtx);
-            SOAPEnvelope env = builder.genUnSubscribeResponse(sub);
-            OMElement resultOm = env.getBody().getFirstElement();
-            OMElement expectedOm = AXIOMUtil.stringToOM(expected);
-            assertTrue(compare(expectedOm, resultOm));
-
-        } catch (Exception e) {
-            fail("Error while constructing the test message context: " + e.getMessage());
-        }
+        MessageContext msgCtx = TestUtils.getAxis2MessageContext("<empty/>", null).
+                getAxis2MessageContext();
+        ResponseMessageBuilder builder = new ResponseMessageBuilder(msgCtx);
+        SOAPEnvelope env = builder.genUnSubscribeResponse(sub);
+        OMElement resultOm = env.getBody().getFirstElement();
+        OMElement expectedOm = AXIOMUtil.stringToOM(expected);
+        assertTrue(compare(expectedOm, resultOm));
     }
 
-    public void testRenewResponse() {
+    public void testRenewResponse() throws Exception {
         String id = UIDGenerator.generateURNString();
         String addressUrl = "http://synapse.test.com/eventing/sunscriptions";
         Date date = new Date(System.currentTimeMillis() + 3600000);
@@ -108,21 +98,16 @@ public class ResponseMessageBuilderTest 
                         "<wse:Expires>" + ConverterUtil.convertToString(cal) + "</wse:Expires>" +
                         "</wse:RenewResponse>";
 
-        try {
-            MessageContext msgCtx = TestUtils.getAxis2MessageContext("<empty/>", null).
-                    getAxis2MessageContext();
-            ResponseMessageBuilder builder = new ResponseMessageBuilder(msgCtx);
-            SOAPEnvelope env = builder.genRenewSubscriptionResponse(sub);
-            OMElement resultOm = env.getBody().getFirstElement();
-            OMElement expectedOm = AXIOMUtil.stringToOM(expected);
-            assertTrue(compare(expectedOm, resultOm));
-
-        } catch (Exception e) {
-            fail("Error while constructing the test message context: " + e.getMessage());
-        }
+        MessageContext msgCtx = TestUtils.getAxis2MessageContext("<empty/>", null).
+                getAxis2MessageContext();
+        ResponseMessageBuilder builder = new ResponseMessageBuilder(msgCtx);
+        SOAPEnvelope env = builder.genRenewSubscriptionResponse(sub);
+        OMElement resultOm = env.getBody().getFirstElement();
+        OMElement expectedOm = AXIOMUtil.stringToOM(expected);
+        assertTrue(compare(expectedOm, resultOm));
     }
 
-    public void testGetStatusResponse() {
+    public void testGetStatusResponse() throws Exception {
         String id = UIDGenerator.generateURNString();
         String addressUrl = "http://synapse.test.com/eventing/sunscriptions";
         Date date = new Date(System.currentTimeMillis() + 3600000);
@@ -139,17 +124,12 @@ public class ResponseMessageBuilderTest 
                         "<wse:Expires>" + ConverterUtil.convertToString(cal) + "</wse:Expires>" +
                         "</wse:GetStatusResponse>";
 
-        try {
-            MessageContext msgCtx = TestUtils.getAxis2MessageContext("<empty/>", null).
-                    getAxis2MessageContext();
-            ResponseMessageBuilder builder = new ResponseMessageBuilder(msgCtx);
-            SOAPEnvelope env = builder.genGetStatusResponse(sub);
-            OMElement resultOm = env.getBody().getFirstElement();
-            OMElement expectedOm = AXIOMUtil.stringToOM(expected);
-            assertTrue(compare(expectedOm, resultOm));
-
-        } catch (Exception e) {
-            fail("Error while constructing the test message context: " + e.getMessage());
-        }
+        MessageContext msgCtx = TestUtils.getAxis2MessageContext("<empty/>", null).
+                getAxis2MessageContext();
+        ResponseMessageBuilder builder = new ResponseMessageBuilder(msgCtx);
+        SOAPEnvelope env = builder.genGetStatusResponse(sub);
+        OMElement resultOm = env.getBody().getFirstElement();
+        OMElement expectedOm = AXIOMUtil.stringToOM(expected);
+        assertTrue(compare(expectedOm, resultOm));
     }
 }