You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/10/04 12:20:00 UTC
svn commit: r1004188 - in /tuscany/sca-java-2.x/trunk/itest/jms:
exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/
exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/
format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jm...
Author: antelder
Date: Mon Oct 4 10:20:00 2010
New Revision: 1004188
URL: http://svn.apache.org/viewvc?rev=1004188&view=rev
Log:
Update jms itests to match latest format for returning unchecked exceptions
Modified:
tuscany/sca-java-2.x/trunk/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
tuscany/sca-java-2.x/trunk/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
tuscany/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
Modified: tuscany/sca-java-2.x/trunk/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java?rev=1004188&r1=1004187&r2=1004188&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java Mon Oct 4 10:20:00 2010
@@ -104,8 +104,7 @@ public class ExceptionsTestCase {
// FIXME: what should the response message be for unchecked exceptions with wireFormat.textXML???
Object o = ((ObjectMessage)m).getObject();
assertTrue(o instanceof RuntimeException);
- assertTrue("org.oasisopen.sca.ServiceRuntimeException".equals(o.getClass().getName()));
- assertEquals("bla", ((RuntimeException)o).getMessage());
+ assertTrue(((RuntimeException)o).getMessage().startsWith("Message = bla"));
}
@Test
@@ -150,8 +149,7 @@ public class ExceptionsTestCase {
Message m = receiveJMSResponse();
Object o = ((ObjectMessage)m).getObject();
assertTrue(o instanceof RuntimeException);
- assertTrue("org.oasisopen.sca.ServiceRuntimeException".equals(o.getClass().getName()));
- assertEquals("bla", ((RuntimeException)o).getMessage());
+ assertTrue(((RuntimeException)o).getMessage().startsWith("Message = bla"));
}
@After
Modified: tuscany/sca-java-2.x/trunk/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java?rev=1004188&r1=1004187&r2=1004188&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java Mon Oct 4 10:20:00 2010
@@ -19,6 +19,7 @@
package org.apache.tuscany.sca.binding.jms;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.apache.tuscany.sca.node.Node;
@@ -97,7 +98,7 @@ public class ExceptionsTestCase {
service.throwUnChecked();
fail();
} catch (Exception e) {
- assertEquals("bla", e.getCause().getMessage());
+ assertTrue(e.getCause().getMessage().startsWith("Message = bla"));
}
}
Modified: tuscany/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java?rev=1004188&r1=1004187&r2=1004188&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java Mon Oct 4 10:20:00 2010
@@ -103,7 +103,7 @@ public class HelloWorldReferenceImpl imp
try {
helloWorldServiceDontWrapSingle.throwUnChecked(person);
} catch (Exception e) {
- returnString += " " + e.getCause().getMessage();
+ returnString += " " + (e.getCause().getMessage().startsWith("Message = bla") ? "bla" : e.getCause().getMessage());
}
return returnString;