Author: jsdelfino
Date: Tue Jul 20 04:36:21 2010
New Revision: 965723
URL: http://svn.apache.org/viewvc?rev=965723&view=rev
Log:
Test passing multiple parameters, and use JSON-RPC binding in all test cases.
Modified:
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ClientTest.java
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/EchoTest.java
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/InvokeTestCase.java
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ServerTest.java
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/client_test.py
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/domain-test.composite
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/server_test.py
Modified:
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ClientTest.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ClientTest.java?rev=965723&r1=965722&r2=965723&view=diff
==============================================================================
---
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ClientTest.java
(original)
+++
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ClientTest.java
Tue Jul 20 04:36:21 2010
@@ -31,7 +31,7 @@ public class ClientTest implements EchoT
@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);
}
}
Modified:
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/EchoTest.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/EchoTest.java?rev=965723&r1=965722&r2=965723&view=diff
==============================================================================
---
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/EchoTest.java
(original)
+++
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/EchoTest.java
Tue Jul 20 04:36:21 2010
@@ -29,5 +29,5 @@ import org.oasisopen.sca.annotation.Remo
@Remotable
public interface EchoTest {
- public String echo(String s);
+ public String echo(String s1, String s2);
}
Modified:
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/InvokeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/InvokeTestCase.java?rev=965723&r1=965722&r2=965723&view=diff
==============================================================================
---
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/InvokeTestCase.java
(original)
+++
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/InvokeTestCase.java
Tue Jul 20 04:36:21 2010
@@ -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);
}
}
Modified:
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ServerTest.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ServerTest.java?rev=965723&r1=965722&r2=965723&view=diff
==============================================================================
---
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ServerTest.java
(original)
+++
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/java/org/apache/tuscany/sca/implementation/python/provider/ServerTest.java
Tue Jul 20 04:36:21 2010
@@ -26,7 +26,7 @@ package org.apache.tuscany.sca.implement
*/
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;
}
}
Modified:
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/client_test.py
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/client_test.py?rev=965723&r1=965722&r2=965723&view=diff
==============================================================================
---
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/client_test.py
(original)
+++
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/client_test.py
Tue Jul 20 04:36:21 2010
@@ -17,8 +17,8 @@
# JSON-RPC test case
-def echo(x, ref):
- return ref("echo", x)
+def echo(x, y, ref):
+ return ref("echo", x, y)
# ATOMPub test case
Modified:
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/domain-test.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/domain-test.composite?rev=965723&r1=965722&r2=965723&view=diff
==============================================================================
---
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/domain-test.composite
(original)
+++
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/domain-test.composite
Tue Jul 20 04:36:21 2010
@@ -25,33 +25,40 @@
<component name="python-test">
<t:implementation.python script="server_test.py"/>
<service name="test">
- <t:binding.jsonrpc uri="http://localhost:8085/python"/>
+ <t:binding.jsonrpc uri="http://localhost:8080/python"/>
</service>
</component>
<component name="client-test">
<t:implementation.python script="client_test.py"/>
<service name="client">
- <t:binding.jsonrpc uri="http://localhost:8085/client"/>
+ <t:binding.jsonrpc uri="http://localhost:8080/client"/>
</service>
<reference name="ref" target="python-test">
</reference>
</component>
- <component name="local-java-test">
+ <component name="java-test">
<implementation.java
class="org.apache.tuscany.sca.implementation.python.provider.ServerTest"/>
+ <service name="EchoTest">
+ <t:binding.jsonrpc uri="http://localhost:8080/java"/>
+ </service>
</component>
- <component name="local-client-test">
+ <component name="python-to-java-test">
<t:implementation.python script="client_test.py"/>
- <reference name="ref" target="local-java-test">
- </reference>
+ <service name="client">
+ <t:binding.jsonrpc uri="http://localhost:8080/python-to-java"/>
+ </service>
+ <reference name="ref" target="java-test"/>
</component>
<component name="java-client-test">
<implementation.java
class="org.apache.tuscany.sca.implementation.python.provider.ClientTest"/>
- <reference name="ref" target="local-client-test">
- </reference>
+ <service name="EchoTest">
+ <t:binding.jsonrpc uri="http://localhost:8080/java-client"/>
+ </service>
+ <reference name="ref" target="python-to-java-test"/>
</component>
</composite>
Modified:
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/server_test.py
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/server_test.py?rev=965723&r1=965722&r2=965723&view=diff
==============================================================================
---
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/server_test.py
(original)
+++
tuscany/sandbox/sebastien/java/dynamic/modules/implementation-python-runtime/src/test/resources/server_test.py
Tue Jul 20 04:36:21 2010
@@ -17,8 +17,8 @@
# JSON-RPC test case
-def echo(x):
- return x
+def echo(x, y):
+ return x + " " + y
# ATOMPub test case
