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/03/11 23:20:26 UTC
svn commit: r922038 - in
/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast: ./
src/main/java/org/apache/tuscany/sca/itest/bindingsca/
src/test/java/org/apache/tuscany/sca/itest/bindingsca/
Author: antelder
Date: Thu Mar 11 22:20:25 2010
New Revision: 922038
URL: http://svn.apache.org/viewvc?rev=922038&view=rev
Log:
Merge test updates from TUSCANY-3489 (Checked exceptions are not copied across classloaders) to hazelcast test
Added:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
- copied unchanged from r921689, tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/ (props changed)
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
Propchange: tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar 11 22:20:25 2010
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-equinox/itest/nodes/binding-sca-hazelcast:694816-709480
+/tuscany/branches/sca-java-1.3/itest/nodes/binding-sca-hazelcast:671193,680620-680628
+/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes:921689
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java?rev=922038&r1=922037&r2=922038&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java Thu Mar 11 22:20:25 2010
@@ -34,7 +34,12 @@ public class ClientImpl implements Clien
protected Remote remote;
public String getName(String id) {
- Customer customer = remote.getCustomer(id);
+ Customer customer = null;
+ try {
+ customer = remote.getCustomer(id);
+ } catch (CustomerNotFoundException e) {
+ return null;
+ }
customer.dump("Client.getName()");
return local.getName(customer);
}
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java?rev=922038&r1=922037&r2=922038&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java Thu Mar 11 22:20:25 2010
@@ -30,7 +30,7 @@ public interface Remote {
String getId(Customer customer);
- Customer getCustomer(String id);
+ Customer getCustomer(String id) throws CustomerNotFoundException;
Customer createCustomer(String id, String name);
}
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java?rev=922038&r1=922037&r2=922038&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java Thu Mar 11 22:20:25 2010
@@ -45,8 +45,13 @@ public class RemoteServiceImpl implement
return customer.getId();
}
- public Customer getCustomer(String id) {
+ public Customer getCustomer(String id) throws CustomerNotFoundException {
Customer customer = customers.get(id);
+ if (customer == null) {
+ CustomerNotFoundException ex = new CustomerNotFoundException("Customer not found");
+ ex.setCustomerId(id);
+ throw ex;
+ }
customer.dump("Remote.getCustomer()");
return customer;
}
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java?rev=922038&r1=922037&r2=922038&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java Thu Mar 11 22:20:25 2010
@@ -37,7 +37,12 @@ public class SCAClientImpl implements Cl
}
public String getName(String id) {
- Customer customer = remote.getCustomer(id);
+ Customer customer = null;
+ try {
+ customer = remote.getCustomer(id);
+ } catch (CustomerNotFoundException e) {
+ return null;
+ }
customer.dump("Client.getName()");
return local.getName(customer);
}
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java?rev=922038&r1=922037&r2=922038&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java Thu Mar 11 22:20:25 2010
@@ -134,6 +134,11 @@ public class BindingSCATestCase {
String id = client.create("Ray");
Assert.assertEquals("Ray", client.getName(id));
}
+
+ static void runClientNotFound(Client client) {
+ String id = "not-there";
+ Assert.assertNull(client.getName(id));
+ }
static String createCustomer(Node node) {
Client client = node.getService(Client.class, "ClientComponent/Client");
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java?rev=922038&r1=922037&r2=922038&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java Thu Mar 11 22:20:25 2010
@@ -36,7 +36,7 @@ public class ClientSharedLocalTestCase {
public static void setUpBeforeClass() throws Exception {
runner =
new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName(),
- Customer.class.getName());
+ Customer.class.getName(), CustomerNotFoundException.class.getName());
runner.beforeClass();
client = new SCAClientImpl(BindingSCATestCase.DOMAIN_URI);
Thread.sleep(1000);
@@ -46,6 +46,12 @@ public class ClientSharedLocalTestCase {
public void testClient() throws Exception {
BindingSCATestCase.runClient(client);
}
+
+ @Test
+ public void testClientNotFound() throws Exception {
+ BindingSCATestCase.runClientNotFound(client);
+ }
+
@AfterClass
public static void tearDownAfterClass() throws Exception {