From 490374326cf57b0161d053aea3a9f0cedd7d2228 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Sun, 29 Aug 2010 02:46:21 +0000 Subject: Minor change. Code format and cleanup. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@990478 13f79535-47bb-0310-9956-ffa450edef68 --- .../implementation/python/provider/ClientTest.java | 13 +++++----- .../implementation/python/provider/EchoTest.java | 3 +-- .../python/provider/InvokeTestCase.java | 28 +++++++++++----------- .../implementation/python/provider/ServerTest.java | 7 +++--- 4 files changed, 24 insertions(+), 27 deletions(-) (limited to 'sca-java-2.x/trunk/modules/implementation-python-runtime/src/test/java/org/apache') 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 251364933e..f69ce3284e 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 @@ -20,18 +20,17 @@ package org.apache.tuscany.sca.implementation.python.provider; import org.oasisopen.sca.annotation.Reference; - /** * Test Java component. * * @version $Rev$ $Date$ */ public class ClientTest implements EchoTest { - - @Reference - public EchoTest ref; - public String echo(final String s1, final String s2) { - return ref.echo(s1, s2); - } + @Reference + public EchoTest ref; + + 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 366a94a346..557bc968da 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 @@ -20,7 +20,6 @@ package org.apache.tuscany.sca.implementation.python.provider; import org.oasisopen.sca.annotation.Remotable; - /** * Test client interface. * @@ -29,5 +28,5 @@ import org.oasisopen.sca.annotation.Remotable; @Remotable public interface EchoTest { - public String echo(String s1, String s2); + 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 b32c931453..0d4b00d49a 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 @@ -38,23 +38,23 @@ import org.junit.Test; * @version $Rev$ $Date$ */ public class InvokeTestCase { - static Node node; - + static Node node; + @BeforeClass public static void setUp() throws Exception { - try { - final String loc = getContributionLocation("domain-test.composite"); - node = NodeFactory.newInstance().createNode("domain-test.composite", new Contribution("c", loc)); - node.start(); - } catch (Exception e) { - e.printStackTrace(); - throw e; - } + try { + final String loc = getContributionLocation("domain-test.composite"); + node = NodeFactory.newInstance().createNode("domain-test.composite", new Contribution("c", loc)); + node.start(); + } catch(Exception e) { + e.printStackTrace(); + throw e; + } } @AfterClass public static void tearDown() throws Exception { - node.stop(); + node.stop(); } @Test @@ -62,7 +62,7 @@ public class InvokeTestCase { 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, String.class), new Object[]{"Hey", "There"}); + 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); @@ -73,7 +73,7 @@ public class InvokeTestCase { 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, String.class), new Object[]{"Hey", "There"}); + 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); @@ -84,7 +84,7 @@ public class InvokeTestCase { 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"}); + 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 422be15dd6..b0f3b5868f 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 @@ -18,7 +18,6 @@ */ package org.apache.tuscany.sca.implementation.python.provider; - /** * Test Java component. * @@ -26,7 +25,7 @@ package org.apache.tuscany.sca.implementation.python.provider; */ public class ServerTest implements EchoTest { - public String echo(final String s1, final String s2) { - return s1 + " " + s2; - } + public String echo(final String s1, final String s2) { + return s1 + " " + s2; + } } -- cgit v1.2.3