Extend test case for binding with no explicit URL

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@916697 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 24 insertions, 7 deletions

diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
index 47128b8db3..15f82a1773 100644
--- a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
@@ -25,15 +25,29 @@
     <component name="HelloWorldClient">
         <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorldClient"/>
         <reference name="helloWorldWS" requires="confidentiality">
-            <binding.ws uri="https://localhost:8443/HelloWorld" />
+            <binding.ws uri="https://localhost:8443/HelloWorldService/HelloWorld" />
         </reference>
     </component>
     
     <component name="HelloWorldService">
 		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorldService"/>
 	    <service name="HelloWorld" requires="confidentiality">
-	        <binding.ws uri="https://localhost:8443/HelloWorld" />
+	        <binding.ws uri="https://localhost:8443/HelloWorldService/HelloWorld" />
 	    </service>		
     </component>
     
+    <component name="HelloWorldClient2">
+        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorldClient"/>
+        <reference name="helloWorldWS" requires="confidentiality">
+            <binding.ws uri="https://localhost:8443/HelloWorldService2/HelloWorld" />
+        </reference>
+    </component>    
+    
+    <component name="HelloWorldService2">
+        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorldService"/>
+        <service name="HelloWorld" requires="confidentiality">
+            <binding.ws/>
+        </service>      
+    </component>    
+    
 </composite>
diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java b/sca-java-2.x/trunk/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java
index 9ebd7cbe05..f117c5d4ec 100644
--- a/sca-java-2.x/trunk/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java
+++ b/sca-java-2.x/trunk/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java
@@ -30,18 +30,21 @@ public class HTTPSTestCase extends TestCase {
 
     private Node node;
     private HelloWorld helloWorld;
-
-    public void testCalculator() throws Exception {
-        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
-    }
-
+    private HelloWorld helloWorld2;
+    
     @Override
     protected void setUp() throws Exception {
         node = NodeFactory.newInstance().createNode(new Contribution("test", "target/classes"));
         node.start();
         helloWorld = node.getService(HelloWorld.class, "HelloWorldClient");
+        helloWorld2 = node.getService(HelloWorld.class, "HelloWorldClient2");
     }
     
+    public void testCalculator() throws Exception {
+        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
+        assertEquals("Hello petra", helloWorld2.getGreetings("petra"));
+    }    
+    
     @Override
     protected void tearDown() throws Exception {
         node.stop();