Extend TUSCANY-2324 to ensure that interface contracts are copied down alongside bindings in the multiplicity > 1 case.

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

3 files changed, 4 insertions, 5 deletions

diff --git a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite
index 23799f8487..cc2ea5b0e2 100644
--- a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite
@@ -30,6 +30,7 @@
     </reference>
     <reference name="reference1a" promote="ComponentB/reference2a">
         <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+        <binding.ws uri="http://foo.com/bar"/>
     </reference>    
 
     <component name="ComponentB">
@@ -43,7 +44,7 @@
         <reference name="reference2">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
         </reference>
-        <reference name="reference2a" target="ComponentF">
+        <reference name="reference2a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
         </reference>        
     </component>
diff --git a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite
index 59ed4d02f4..54eee7d657 100644
--- a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite
@@ -42,11 +42,9 @@
         </service>
         <service name="Service3a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws uri="http://foo.com/bar" />
         </service>
         <reference name="reference3" target="ComponentD/Service3a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws/>
         </reference>
         <reference name="reference3a" target="ComponentE">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
diff --git a/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
index e19ed92b42..f3ffd44cdb 100644
--- a/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
+++ b/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
@@ -50,7 +50,7 @@ public class BuilderTestCase extends TestCase {
     protected void tearDown() throws Exception {

     }

 

-    

+

     // Scenario 1: <binding.ws> on outer composite service CompositeA/Service1

     public void testScenario1() throws Exception {

         System.out.println("====>Running testScenario1");

@@ -779,7 +779,7 @@ public class BuilderTestCase extends TestCase {
                 componentRef = reference;

                 assertTrue(reference.getBindings().size() == 2);

                 assertTrue(reference.getBindings().get(0) instanceof SCABinding);

-                assertTrue(reference.getBindings().get(1) instanceof SCABinding);

+                assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding);

             }

         }

         assertTrue(componentRef != null);