Author: slaws
Date: Wed Jun 9 09:58:52 2010
New Revision: 952934
URL: http://svn.apache.org/viewvc?rev=952934&view=rev
Log:
Add more ws callback test cases
Modified:
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java?rev=952934&r1=952933&r2=952934&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
Wed Jun 9 09:58:52 2010
@@ -27,6 +27,7 @@ public class CallBackBasicClientImpl imp
@Reference
protected CallBackBasicService aCallBackService;
+
private static String returnMessage = null;
private static int callBackCount = 0;
private static Object monitor = new Object();
@@ -34,6 +35,7 @@ public class CallBackBasicClientImpl imp
public void run() {
// This tests basic callback patterns.
+ callBackCount = 0;
// Test1 is the basic callback where the target calls back prior to
// returning to the client.
Modified:
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite?rev=952934&r1=952933&r2=952934&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
(original)
+++
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
Wed Jun 9 09:58:52 2010
@@ -20,24 +20,56 @@
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
targetNamespace="http://callback";
name="CallBackBasicTest">
+
+ <!-- 1 - target specified forward binding implied callback binding-->
+ <component name="CallBackBasicClient1">
+ <implementation.java
class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
+ <reference name="aCallBackService" target="CallBackBasicService1"/>
+ </component>
+
+ <component name="CallBackBasicService1">
+ <implementation.java
class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
+ <service name="CallBackBasicService">
+ <binding.ws uri="http://localhost:8085/CallBackTargetService"/>
+ </service>
+ </component>
- <component name="CallBackBasicClient">
+ <!-- 2 - target specified forward binding and fully specified callback
binding -->
+ <component name="CallBackBasicClient2">
<implementation.java
class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
- <reference name="aCallBackService"
target="CallBackBasicService">
+ <reference name="aCallBackService"
target="CallBackBasicService2">
<callback>
- <binding.ws uri="http://localhost:8084/aCallBackService"/>
+ <binding.ws
uri="http://localhost:8084/CallBackClientService"/>
</callback>
</reference>
</component>
- <component name="CallBackBasicService">
+ <component name="CallBackBasicService2">
<implementation.java
class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
<service name="CallBackBasicService">
- <binding.ws uri="http://localhost:8085/CallBackBasicService"/>
+ <binding.ws uri="http://localhost:8085/CallBackTargetService"/>
<callback>
- <binding.ws uri="http://localhost:8084/aCallBackService"/>
+ <binding.ws uri="http://localhost:8084/CallBackClientService"/>
</callback>
</service>
</component>
-
+
+ <!-- 3 - fully specified forward binding implied callback binding-->
+ <component name="CallBackBasicClient3">
+ <implementation.java
class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
+ <reference name="aCallBackService">
+ <binding.ws uri="http://localhost:8085/CallBackTargetService"/>
+ </reference>
+ </component>
+
+ <component name="CallBackBasicService3">
+ <implementation.java
class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
+ <service name="CallBackBasicService">
+ <binding.ws uri="http://localhost:8085/CallBackTargetService"/>
+ </service>
+ </component>
+
+ <!-- 4 - part specified callback binding -->
+ <!-- TODO -->
+
</composite>
Modified:
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java?rev=952934&r1=952933&r2=952934&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
Wed Jun 9 09:58:52 2010
@@ -24,32 +24,43 @@ import org.apache.tuscany.sca.node.Contr
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
public class CallBackBasicTestCase {
private static Node node;
- private CallBackBasicClient aCallBackClient;
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ String location =
ContributionLocationHelper.getContributionLocation("CallBackBasicTest.composite");
+ node =
NodeFactory.newInstance().createNode("CallBackBasicTest.composite", new
Contribution("c1", location));
+ node.start();
+ }
@Test
- public void testCallBackBasic() {
+ public void testCallBackBasic1() {
+ CallBackBasicClient aCallBackClient =
node.getService(CallBackBasicClient.class, "CallBackBasicClient1");
aCallBackClient.run();
}
-
- @Before
- public void setUp() throws Exception {
- if (node == null) {
- String location =
ContributionLocationHelper.getContributionLocation("CallBackBasicTest.composite");
- node =
NodeFactory.newInstance().createNode("CallBackBasicTest.composite", new
Contribution("c1", location));
- node.start();
- }
-
- aCallBackClient = node.getService(CallBackBasicClient.class,
"CallBackBasicClient");
+
+ @Test
+ public void testCallBackBasic2() {
+ CallBackBasicClient aCallBackClient =
node.getService(CallBackBasicClient.class, "CallBackBasicClient2");
+ aCallBackClient.run();
}
-
- @After
- public void tearDown() throws Exception {
+
+ @Test
+ public void testCallBackBasic3() {
+ CallBackBasicClient aCallBackClient =
node.getService(CallBackBasicClient.class, "CallBackBasicClient3");
+ aCallBackClient.run();
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
node.stop();
}
