diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache')
4 files changed, 20 insertions, 16 deletions
diff --git a/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ClientTest.java b/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ClientTest.java index 301dfee78a..251364933e 100644 --- a/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ClientTest.java +++ b/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ClientTest.java @@ -31,7 +31,7 @@ public class ClientTest implements EchoTest { @Reference public EchoTest ref; - public String echo(final String s) { - return ref.echo(s); + public String echo(final String s1, final String s2) { + return ref.echo(s1, s2); } } diff --git a/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/EchoTest.java b/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/EchoTest.java index 88719a0ddc..366a94a346 100644 --- a/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/EchoTest.java +++ b/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/EchoTest.java @@ -29,5 +29,5 @@ import org.oasisopen.sca.annotation.Remotable; @Remotable public interface EchoTest { - public String echo(String s); + public String echo(String s1, String s2); } diff --git a/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/InvokeTestCase.java b/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/InvokeTestCase.java index 2d8388b6d4..b32c931453 100644 --- a/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/InvokeTestCase.java +++ b/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/InvokeTestCase.java @@ -48,6 +48,7 @@ public class InvokeTestCase { node.start(); } catch (Exception e) { e.printStackTrace(); + throw e; } } @@ -58,32 +59,35 @@ public class InvokeTestCase { @Test public void testService() throws Exception { - final Session s = TransportRegistry.i().createSession("http://localhost:8085/python"); + final Session s = TransportRegistry.i().createSession("http://localhost:8080/python"); final Client c = new Client(s); final Object px = c.openProxy("", EchoTest.class); - final Object r = c.invoke(px, EchoTest.class.getMethod("echo", String.class), new Object[]{"Hey"}); + final Object r = c.invoke(px, EchoTest.class.getMethod("echo", String.class, String.class), new Object[]{"Hey", "There"}); c.closeProxy(px); s.close(); - assertEquals("Hey", r); + assertEquals("Hey There", r); } @Test public void testReference() throws Exception { - final Session s = TransportRegistry.i().createSession("http://localhost:8085/client"); + final Session s = TransportRegistry.i().createSession("http://localhost:8080/client"); final Client c = new Client(s); final Object px = c.openProxy("", EchoTest.class); - final Object r = c.invoke(px, EchoTest.class.getMethod("echo", String.class), new Object[]{"Hey"}); + final Object r = c.invoke(px, EchoTest.class.getMethod("echo", String.class, String.class), new Object[]{"Hey", "There"}); c.closeProxy(px); s.close(); - assertEquals("Hey", r); + assertEquals("Hey There", r); } - //@Test Disabled for now as Java / JSON databinding transform doesn't seem - // to produce the right JSON + @Test public void testLocal() throws Exception { - final EchoTest s = node.getService(EchoTest.class, "java-client-test"); - final String r = s.echo("Hey"); - assertEquals("Hey", r); + final Session s = TransportRegistry.i().createSession("http://localhost:8080/java-client"); + final Client c = new Client(s); + final Object px = c.openProxy("", EchoTest.class); + final Object r = c.invoke(px, EchoTest.class.getMethod("echo", String.class, String.class), new Object[]{"Hey", "There"}); + c.closeProxy(px); + s.close(); + assertEquals("Hey There", r); } } diff --git a/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ServerTest.java b/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ServerTest.java index 36e4f18f64..422be15dd6 100644 --- a/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ServerTest.java +++ b/sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ServerTest.java @@ -26,7 +26,7 @@ package org.apache.tuscany.sca.implementation.python.provider; */ public class ServerTest implements EchoTest { - public String echo(final String s) { - return s; + public String echo(final String s1, final String s2) { + return s1 + " " + s2; } } |