[sca-assembly] Various issues in assembly test cases

[Simon Laws <simon_laws@uk.ibm.com>]

Apologies that this is a long post but
I thought it better to collect these together for your consideration rather
than spamming the list with many separate mails. I found these when going
through the tests using Tuscany, hence the Tuscany JIRA numbers which I'm
using to track the issues. I've posted diffs as an aid to highlighting
the issues I'm referring to but I'm not expecting these diffs to be applied
as is.

ThanksAESE

Simon


ASM_5007
========

https://issues.apache.org/jira/browse/TUSCANY-3329


fix to TestComposite3

Index: TestComposite3.composite
===================================================================
--- TestComposite3.composite  
     (revision 372)
+++ TestComposite3.composite  
     (working copy)
@@ -25,11 +25,11 @@
         <property
name="serviceName" source="$serviceName"/>
     </component>
     
-    <reference name="Reference1"
promote="TestComponent1/Reference">
+    <reference name="Reference1"
promote="TestComponent1/reference1">
         <interface.java
interface="org.oasisopen.sca.test.Service1"/>
     </reference>
     
-    <reference name="Reference1"
promote="TestComponent1/Reference">
+    <reference name="Reference1"
promote="TestComponent1/reference1">
         <interface.java
interface="org.oasisopen.sca.test.Service1"/>
     </reference>


ASM_5023
========

Just a reminder...

https://issues.apache.org/jira/browse/TUSCANY-3330
-> http://www.osoa.org/jira/browse/ASSEMBLY-186 

ASM_5026
========

https://issues.apache.org/jira/browse/TUSCANY-3225

Index: Test_ASM_5026.composite
===================================================================
--- Test_ASM_5026.composite    
   (revision 372)
+++ Test_ASM_5026.composite    
   (working copy)
@@ -35,8 +35,8 @@
           
  with the correct XSD global element type -->
         <property
name="complexType" element="test:globalElement1">
           
 <test:globalElement1>
-          
         <firstData>complex1</firstData>
-          
         <secondData>complex2</secondData>
+          
         <test:firstData>complex1</test:firstData>
+          
         <test:secondData>complex2</test:secondData>
           
 </test:globalElement1>
         </property>
     </component>


Index: TestComposite13.composite
===================================================================
--- TestComposite13.composite  
     (revision 372)
+++ TestComposite13.composite  
     (working copy)
@@ -30,8 +30,8 @@
           
     <interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
         </service>
         <property
name="serviceName" source="$serviceName"/>
-        <property
name="serviceData1" source="$complexType/firstData"/>
-        <property
name="serviceData2" source="$complexType/secondData"/>
+        <property
name="serviceData1" source="$complexType/test:firstData"/>
+        <property
name="serviceData2" source="$complexType/test:secondData"/>
     </component>
 
 </composite>


ASM-5034
========

https://issues.apache.org/jira/browse/TUSCANY-3328


test defines multiple bindings with
no names

Index: Test_ASM_5034.composite
===================================================================
--- Test_ASM_5034.composite    
   (revision 372)
+++ Test_ASM_5034.composite    
   (working copy)
@@ -33,8 +33,8 @@
         <property
name="serviceName">service1</property>
         <reference
name="Reference1">
           
     <interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
-          
     <binding.sca uri="TestComponent2/Service1"/>
-          
     <binding.ws uri="http://localhost:8080/TestComponent2"/>
+          
     <binding.sca name="binding1" uri="TestComponent2/Service1"/>
+          
     <binding.ws name="binding2" uri="http://localhost:8080/TestComponent2/Service1/binding4"/>
         </reference>
     </component>

@@ -43,8 +43,8 @@
         
       <implementation.composite name="test:TestComposite1"/>
         <service
name="Service1">
           
     <interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
-          
     <binding.sca/>
-        
           <binding.ws/>
+          
     <binding.sca name="binding3"/>
+        
           <binding.ws name="binding4"/>
         </service>
         <property
name="serviceName">service2</property>
     </component>


ASM-6033
========

https://issues.apache.org/jira/browse/TUSCANY-3332

Index: TestComposite41.composite
===================================================================
--- TestComposite41.composite  
     (revision 372)
+++ TestComposite41.composite  
     (working copy)
@@ -27,12 +27,12 @@
           
     <interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
         </service>
         <property
name="serviceName" source="$serviceName"/>
-        <reference
name="reference1" multiplicity="1..1">
+        <reference
name="Reference1" multiplicity="1..1">
           
     <interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
         </reference>
     </component>
     
-    <reference name="Reference1"
promote="TestComponent1/reference1" multiplicity="0..n">
+    <reference name="Reference1"
promote="TestComponent1/Reference1" multiplicity="0..n">
         <interface.wsdl
interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
     </reference>


ASM-8001
========

https://issues.apache.org/jira/browse/TUSCANY-3334

Test case should not refer to the language
specific contribution, should be as follows

config.contributionNames    
   = new String[] { "ASM_8001", "General"
+ _Lang };

Where is TestComposite51 as referenced
from Test_ASM_8001.composite?

<implementation.composite name="test:TestComposite51"/>

ASM-8004
========

https://issues.apache.org/jira/browse/TUSCANY-3323

test case should refer to the test case's
language specific contribution, should be as follows

config.contributionNames    
   = new String[] { config.testName + _Lang, "General",
"General" + _Lang };


https://issues.apache.org/jira/browse/TUSCANY-3190

General_Java

Index: sca-contribution.xml
===================================================================
--- sca-contribution.xml    
   (revision 369)
+++ sca-contribution.xml    
   (working copy)
@@ -11,6 +11,6 @@
         <export
namespace="http://docs.oasis-open.org/ns/opencsa/scatests/200903"/>
        <!-- Contributions namespace 1 -->
        
        <export
namespace="http://docs.oasis-open.org/ns/opencsa/scatests/2009032"/>
        <!-- Contributions namespace 2 -->
        
        <export
namespace="http://test.sca.oasisopen.org/"/>    
    <!-- WSDL namespace -->
-        <export.java
package="test"/>          
               
      <!-- Java package -->
+        <export.java
package="org.oasisopen.sca.test"/>        
<!-- Java package -->
</contribution>


ASM-8005
========

https://issues.apache.org/jira/browse/TUSCANY-3335

ASM_8005_TestCase.java

config.contributionNames    
   = new String[] { config.testName + _Lang, "General",
"General" + _Lang };

ASM_8005_Java

Index: sca-contribution.xml
===================================================================
--- sca-contribution.xml    
   (revision 372)
+++ sca-contribution.xml    
   (working copy)
@@ -3,7 +3,7 @@
 <contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903">
 
         <import
namespace="http://docs.oasis-open.org/ns/opencsa/scatests/200903"/>
-        <import.java
package="test"/>
+        <import.java
package="org.oasisopen.sca.test"/>
         <import
namespace="http://test.sca.oasisopen.org/"/>    
               
    <!-- WSDL namespace -->      
         
         
 </contribution>


ASM-8011
========

https://issues.apache.org/jira/browse/TUSCANY-3336

TestComposite62.composite has two implementation
elements in a component

    <component name="TestComposite62TestComponent1">
         
      <implementation.java class="test.service1Callback5Impl"/>
         
      <implementation.composite name="test:TestComposite54"/>

Which one is the right one



ASM-12003
=========

https://issues.apache.org/jira/browse/TUSCANY-3338

Possible confusion over Service1b, for
example 

Index: Service1b.wsdl
===================================================================
--- Service1b.wsdl      
 (revision 372)
+++ Service1b.wsdl      
 (working copy)
@@ -24,7 +24,7 @@
     <wsdl:part name="operation1"
element="tns:operation1">
     </wsdl:part>
   </wsdl:message>
-  <wsdl:portType name="Service1">
+  <wsdl:portType name="Service1b">
     <wsdl:operation
name="operation1">
       <wsdl:input
message="tns:operation1">
     </wsdl:input>

Index: Test_ASM_12003.composite
===================================================================
--- Test_ASM_12003.composite  
     (revision 372)
+++ Test_ASM_12003.composite  
     (working copy)
@@ -22,7 +22,7 @@
         
               <binding.ws/>
         
       </service>
         <reference
name="reference1" target="TestComponent1/Service1"
>
-          
     <interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
+          
     <interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1b)"/>
         </reference>
         <property
name="testName">ASM_12003</property>
     </component>
@@ -30,7 +30,7 @@
     <component name="TestComponent1">
         
       <implementation.composite name="test:TestComposite1"/>
         <service
name="Service1">
-          
     <interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
+          
     <interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1b)"/>
         </service>
         <property
name="serviceName">service1</property>
     </component>


ASM-12004
=========

https://issues.apache.org/jira/browse/TUSCANY-3340

Where is the test composite?

config.contributionNames    
   = new String[] { "ASM_12004/ASM_12004.zip",
"General", "General" + _Lang };



AS-12010
========

https://issues.apache.org/jira/browse/TUSCANY-3342

Contribution 2

Index: sca-contribution.xml
===================================================================
--- sca-contribution.xml    
   (revision 372)
+++ sca-contribution.xml    
   (working copy)
@@ -11,7 +11,7 @@
         xmlns:test="http://docs.oasis-open.org/ns/opencsa/scatests/200903">
 
         <import
namespace="http://docs.oasis-open.org/ns/opencsa/scatests/2009032"
location="Contribution1"/>
-        <import.java
package="test"/>
+        <import.java
package="org.oasisopen.sca.test"/>
 
         <export
namespace="http://docs.oasis-open.org/ns/opencsa/scatests/2009032"/>

Index: TestComposite5.composite
===================================================================
--- TestComposite5.composite  
     (revision 372)
+++ TestComposite5.composite  
     (working copy)
@@ -15,15 +15,15 @@
           
name="TestComposite5">
           

         <service
name="Service1" promote="TestComponent1/Service1">
-        
       <interface.java interface="test.Service1"/>
+        
       <interface.java interface="org.oasisopen.sca.test.Service1"/>
         </service>
 
     <property name="serviceName"
type="string"/>
  
     <component name="TestComponent1">
-        
       <implementation.java class="test.service1Impl"/>
+        
       <implementation.java class="org.oasisopen.sca.test.service1Impl"/>
         <service
name="Service1">
-          
     <interface.java interface="test.Service1"/>
+          
     <interface.java interface="org.oasisopen.sca.test.Service1"/>
         </service>
         <property
name="serviceName">servicex</property>
     </component>

Index: TestComposite67.composite
===================================================================
--- TestComposite67.composite  
     (revision 372)
+++ TestComposite67.composite  
     (working copy)
@@ -16,7 +16,7 @@
           
name="TestComposite67">
           

         <service
name="Service1" promote="TestComposite67TestComponent1/Service1">
-        
       <interface.java interface="test.Service1"/>
+        
       <interface.java interface="org.oasisopen.sca.test.Service1"/>
         </service>
 
     <property name="serviceName"
type="string"/>
@@ -24,7 +24,7 @@
     <component name="TestComposite67TestComponent1">
         
       <implementation.composite name="test2:TestComposite5"/>
         <service
name="Service1">
-          
     <interface.java interface="test.Service1"/>
+          
     <interface.java interface="org.oasisopen.sca.test.Service1"/>
         </service>
         <property
name="serviceName" source="$serviceName"/>
     </component>

---

Unless stated otherwise above:
IBM United Kingdom Limited - Registered in England and Wales with number 741598.
Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU