Add some more tests, exceptions don't work yet

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@924871 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 136 insertions, 3 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java
new file mode 100644
index 0000000000..f7ca89e7bb
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java
@@ -0,0 +1,29 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package org.apache.tuscany.sca.binding.hazelcast;

+

+public class BadStringException extends Exception {

+    private static final long serialVersionUID = 1L;

+

+    public BadStringException(String msg) {

+        super(msg);

+    }

+

+}

diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java
new file mode 100644
index 0000000000..79e695d38a
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java
@@ -0,0 +1,33 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package org.apache.tuscany.sca.binding.hazelcast;

+

+public class ComplexType {

+    

+    private String s;

+    

+    public void setString(String s) {

+        this.s = s;

+    }

+

+    public String getString() {

+        return s;

+    }

+}

diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java
index 0f55ce0085..5b20c99a00 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java
@@ -21,6 +21,7 @@ package org.apache.tuscany.sca.binding.hazelcast;
 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.fail;

 

 import java.net.URI;

 

@@ -29,6 +30,7 @@ import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

+import org.oasisopen.sca.ServiceRuntimeException;

 

 public class HazelcastBindingTestCase {

 

@@ -45,12 +47,53 @@ public class HazelcastBindingTestCase {
     }

 

     @Test

-    public void testNode() throws Exception {

+    public void testEchoString() throws Exception {

         TestService service = clientNode.getService(TestService.class, "TestServiceClient");

         assertNotNull(service);

         assertEquals("Petra", service.echoString("Petra"));

     }

 

+    @Test

+    public void testOnewayString() throws Exception {

+        TestService service = clientNode.getService(TestService.class, "TestServiceClient");

+        assertNotNull(service);

+        service.onewayString("Petra");

+    }

+

+    @Test

+    public void testEchoComplexType() throws Exception {

+        TestService service = clientNode.getService(TestService.class, "TestServiceClient");

+        assertNotNull(service);

+        ComplexType ct = new ComplexType();

+        ct.setString("beate");

+        assertEquals("beate", service.echoComplexType(ct).getString());

+    }

+

+    @Test

+    public void testDeclaredException() throws Exception {

+        TestService service = clientNode.getService(TestService.class, "TestServiceClient");

+        assertNotNull(service);

+        try {

+            service.testExceptions("Sue");

+            fail();

+        } catch (BadStringException e) {

+            assertEquals("Sue", e.getMessage());

+        }

+    }

+

+    @Test

+    public void testRuntimeException() throws Exception {

+        TestService service = clientNode.getService(TestService.class, "TestServiceClient");

+        assertNotNull(service);

+        try {

+            service.testExceptions("runtime");

+            fail();

+        } catch (ServiceRuntimeException e) {

+            // TODO test what the exception should be

+//            assertEquals("runtime", e.getMessage());

+        }

+    }

+

     @AfterClass

     public static void tearDownAfterClass() throws Exception {

         if (clientNode != null) {

diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java
index 6015351a26..e2462daa76 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java
@@ -23,7 +23,8 @@ import org.oasisopen.sca.annotation.Remotable;
 

 @Remotable

 public interface TestService {

-

     String echoString(String s);

-    

+    void onewayString(String s);

+    ComplexType echoComplexType(ComplexType ct);

+    String testExceptions(String s) throws BadStringException;

 }

diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java
index 6f8598f4b7..18cd2555b3 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java
@@ -30,4 +30,16 @@ public class TestServiceClient implements TestService {
         return service.echoString(s);

     }

 

+    public void onewayString(String s) {

+        service.onewayString(s);

+    }

+

+    public ComplexType echoComplexType(ComplexType ct) {

+        return service.echoComplexType(ct);

+    }

+

+    public String testExceptions(String s) throws BadStringException {

+        return service.testExceptions(s);

+    }

+

 }

diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java
index fef60dfca5..3042d25ada 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java
@@ -25,4 +25,19 @@ public class TestServiceImpl implements TestService {
         return s;

     }

 

+    public void onewayString(String s) {

+        System.out.println("onewayString " + s);

+    }

+

+    public ComplexType echoComplexType(ComplexType ct) {

+        return ct;

+    }

+

+    public String testExceptions(String s) throws BadStringException {

+        if (s.equals("runtime")) {

+            throw new RuntimeException();

+        }

+        throw new BadStringException(s);

+    }

+

 }