Author: antelder
Date: Wed Sep 21 14:42:35 2011
New Revision: 1173684
URL: http://svn.apache.org/viewvc?rev=1173684&view=rev
Log:
Add some more tests for callbacks across distributed nodes using different
combinations of bindings
Added:
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackReference.composite
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackService.composite
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackReference.composite
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackService.composite
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSURICallBackReference.composite
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBSCAWSTestCase.java
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSTestCase.java
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSURITestCase.java
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java?rev=1173684&r1=1173683&r2=1173684&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
Wed Sep 21 14:42:35 2011
@@ -35,6 +35,8 @@ public class CallBackBasicClientImpl imp
// This tests basic callback patterns.
+ callBackCount = 0; // reset static incase theres multiple runs
+
// Test1 is the basic callback where the target calls back prior to
// returning to the client.
test1a();
Added:
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackReference.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackReference.composite?rev=1173684&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackReference.composite
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackReference.composite
Wed Sep 21 14:42:35 2011
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ targetNamespace="http://callback";
+ name="BSCACallBackReferenceTest">
+
+ <component name="CallBackBasicClient">
+ <implementation.java
class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
+ <reference name="aCallBackService"
target="CallBackBasicService" />
+ </component>
+
+</composite>
Added:
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackService.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackService.composite?rev=1173684&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackService.composite
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BSCACallBackService.composite
Wed Sep 21 14:42:35 2011
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ targetNamespace="http://callback";
+ name="BSCACallBackServiceTest">
+
+ <component name="CallBackBasicService">
+ <implementation.java
class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
+ </component>
+
+</composite>
Added:
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackReference.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackReference.composite?rev=1173684&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackReference.composite
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackReference.composite
Wed Sep 21 14:42:35 2011
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ targetNamespace="http://callback";
+ name="BWSCallBackReferenceTest">
+
+ <component name="CallBackBasicClient">
+ <implementation.java
class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
+ <reference name="aCallBackService"
target="CallBackBasicService">
+ <callback>
+ <binding.ws />
+ </callback>
+ </reference>
+ </component>
+
+</composite>
Added:
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackService.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackService.composite?rev=1173684&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackService.composite
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSCallBackService.composite
Wed Sep 21 14:42:35 2011
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ targetNamespace="http://callback";
+ name="BWSCallBackServiceTest">
+
+ <component name="CallBackBasicService">
+ <implementation.java
class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
+ <service name="CallBackBasicService">
+ <binding.ws />
+ </service>
+ </component>
+
+</composite>
Added:
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSURICallBackReference.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSURICallBackReference.composite?rev=1173684&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSURICallBackReference.composite
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/main/resources/BWSURICallBackReference.composite
Wed Sep 21 14:42:35 2011
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ targetNamespace="http://callback";
+ name="BWSURICallBackReferenceTest">
+
+ <component name="CallBackBasicClient">
+ <implementation.java
class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
+ <reference name="aCallBackService"
target="CallBackBasicService">
+ <callback>
+ <binding.ws uri="http://localhost:8087/foo"/>
+ </callback>
+ </reference>
+ </component>
+
+</composite>
Added:
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBSCAWSTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBSCAWSTestCase.java?rev=1173684&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBSCAWSTestCase.java
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBSCAWSTestCase.java
Wed Sep 21 14:42:35 2011
@@ -0,0 +1,60 @@
+/*
+ * 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.test;
+
+import java.net.URI;
+
+import org.apache.tuscany.sca.TuscanyRuntime;
+import org.apache.tuscany.sca.http.jetty.JettyServer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.oasisopen.sca.NoSuchServiceException;
+
+public class CallBackTwoNodesHzBSCAWSTestCase {
+
+ private org.apache.tuscany.sca.Node serviceNode;
+ private org.apache.tuscany.sca.Node clientNode;
+
+ @Before
+ public void setUp() throws Exception {
+
+
System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding",
"http://docs.oasis-open.org/ns/opencsa/sca/200912#binding.ws";);
+
+ JettyServer.portDefault = 8089;
+ serviceNode =
TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"),
"BSCACallBackService.composite", "target/classes");
+
+ JettyServer.portDefault = 8088;
+ clientNode =
TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"),
"BSCACallBackReference.composite", "target/classes");
+ }
+
+ @Test
+ public void testCallBackTwoNodes() throws NoSuchServiceException {
+ CallBackBasicClient aCallBackClient =
clientNode.getService(CallBackBasicClient.class, "CallBackBasicClient");
+ aCallBackClient.run();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ if (clientNode != null) clientNode.stop();
+ if (serviceNode != null) serviceNode.stop();
+ }
+
+}
Added:
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSTestCase.java?rev=1173684&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSTestCase.java
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSTestCase.java
Wed Sep 21 14:42:35 2011
@@ -0,0 +1,58 @@
+/*
+ * 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.test;
+
+import java.net.URI;
+
+import org.apache.tuscany.sca.TuscanyRuntime;
+import org.apache.tuscany.sca.http.jetty.JettyServer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.oasisopen.sca.NoSuchServiceException;
+
+public class CallBackTwoNodesHzBWSTestCase {
+
+ private org.apache.tuscany.sca.Node serviceNode;
+ private org.apache.tuscany.sca.Node clientNode;
+
+ @Before
+ public void setUp() throws Exception {
+
+ JettyServer.portDefault = 8089;
+ serviceNode =
TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"),
"BWSCallBackService.composite", "target/classes");
+
+ JettyServer.portDefault = 8088;
+ clientNode =
TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"),
"BWSCallBackReference.composite", "target/classes");
+ }
+
+ @Test
+ public void testCallBackTwoNodes() throws NoSuchServiceException {
+ CallBackBasicClient aCallBackClient =
clientNode.getService(CallBackBasicClient.class, "CallBackBasicClient");
+ aCallBackClient.run();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ if (clientNode != null) clientNode.stop();
+ if (serviceNode != null) serviceNode.stop();
+ }
+
+}
Added:
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSURITestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSURITestCase.java?rev=1173684&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSURITestCase.java
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesHzBWSURITestCase.java
Wed Sep 21 14:42:35 2011
@@ -0,0 +1,54 @@
+/*
+ * 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.test;
+
+import java.net.URI;
+
+import org.apache.tuscany.sca.TuscanyRuntime;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.oasisopen.sca.NoSuchServiceException;
+
+public class CallBackTwoNodesHzBWSURITestCase {
+
+ private org.apache.tuscany.sca.Node serviceNode;
+ private org.apache.tuscany.sca.Node clientNode;
+
+ @Before
+ public void setUp() throws Exception {
+
+ serviceNode =
TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"),
"BWSCallBackService.composite", "target/classes");
+ clientNode =
TuscanyRuntime.runComposite(URI.create("uri:CallBackTwoNodesHzTestCase"),
"BWSURICallBackReference.composite", "target/classes");
+ }
+
+ @Test
+ public void testCallBackTwoNodes() throws NoSuchServiceException {
+ CallBackBasicClient aCallBackClient =
clientNode.getService(CallBackBasicClient.class, "CallBackBasicClient");
+ aCallBackClient.run();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ if (clientNode != null) clientNode.stop();
+ if (serviceNode != null) serviceNode.stop();
+ }
+
+}
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java?rev=1173684&r1=1173683&r2=1173684&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java
Wed Sep 21 14:42:35 2011
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.test;
-import org.apache.tuscany.sca.node.Contribution;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
