diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-06 12:06:59 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-06 12:06:59 +0000 |
commit | 683db461f2666c7cfe50e1347ba4d992fc9319b9 (patch) | |
tree | 45163d5a5238980014fe8a124c042e5fbe1b0b36 /sca-java-1.x/trunk/itest | |
parent | be7cd357835ea29b1aa40795d8c73287f857cb27 (diff) |
TUSCANY-3698: Apply patch from Padraig Myers to update jms binding exception handling to return more info with unchecked exceptions. And associated itest updates
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1005001 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
3 files changed, 5 insertions, 5 deletions
diff --git a/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java index bb853673e8..c1bb35636f 100644 --- a/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java +++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java @@ -103,7 +103,7 @@ public class HelloWorldReferenceImpl implements HelloWorldReference { try { helloWorldServiceDontWrapSingle.throwUnChecked(person); } catch (Exception e) { - returnString += " " + e.getCause().getMessage(); + returnString += " " + (e.getCause().getMessage().startsWith("Message = java.lang.RuntimeException: bla") ? "java.lang.RuntimeException: bla" : e.getCause().getMessage()); } return returnString; diff --git a/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java index 1dec4a6f92..ba84ac08f4 100644 --- a/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java +++ b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java @@ -104,7 +104,7 @@ public class ExceptionsTestCase { Object o = ((ObjectMessage)m).getObject();
assertTrue(o instanceof RuntimeException);
assertTrue("java.lang.RuntimeException".equals(o.getClass().getName()));
- assertEquals("java.lang.RuntimeException: bla", ((RuntimeException)o).getMessage());
+ assertTrue(((RuntimeException)o).getMessage().startsWith("Message = java.lang.RuntimeException: bla"));
}
@Test
@@ -150,7 +150,7 @@ public class ExceptionsTestCase { Object o = ((ObjectMessage)m).getObject();
assertTrue(o instanceof RuntimeException);
assertTrue("java.lang.RuntimeException".equals(o.getClass().getName()));
- assertEquals("java.lang.RuntimeException: bla", ((RuntimeException)o).getMessage());
+ assertTrue(((RuntimeException)o).getMessage().startsWith("Message = java.lang.RuntimeException: bla"));
}
@After
diff --git a/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java index bd326b36d2..05001d2ad2 100644 --- a/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java +++ b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import org.apache.tuscany.sca.host.embedded.SCADomain; @@ -96,7 +96,7 @@ public class ExceptionsTestCase { service.throwUnChecked(); fail(); } catch (Exception e) { - assertEquals("java.lang.RuntimeException: bla", e.getCause().getMessage()); + assertTrue(e.getCause().getMessage().startsWith("Message = java.lang.RuntimeException: bla")); } } |