dims 02/03/11 05:24:40
Modified: java/test/wsdl/nested Nested.wsdl Nested2BindingImpl.java
Nested2ServiceTestCase.java
Log:
Slightly modified testcase. (2 outputs)
Revision Changes Path
1.2 +2 -18 xml-axis/java/test/wsdl/nested/Nested.wsdl
Index: Nested.wsdl
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/nested/Nested.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Nested.wsdl 6 Mar 2002 20:39:40 -0000 1.1
+++ Nested.wsdl 11 Mar 2002 13:24:40 -0000 1.2
@@ -13,7 +13,8 @@
<wsdl:part name="PI_SALESORG" element="tns:PI_SALESORG"/>
</wsdl:message>
<wsdl:message name="NestedSvc2Output">
- <wsdl:part name="composite" type="tns:Out"/>
+ <wsdl:part name="PE_ADDRESS" element="tns:PE_ADDRESS"/>
+ <wsdl:part name="RETURN" element="tns:RETURN"/>
</wsdl:message>
<wsdl:portType name="Nested2PortType">
<wsdl:operation name="NestedSvc2">
@@ -39,28 +40,11 @@
</wsdl:service>
<wsdl:types>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns="urn:Nested">
- <xsd:complexType name="In">
- <xsd:sequence>
- <xsd:element ref="CUSTOMERNO" minOccurs="1" maxOccurs="1"/>
- <xsd:element ref="PI_DISTR_CHAN" minOccurs="0"
maxOccurs="1"/>
- <xsd:element ref="PI_DIVISION" minOccurs="0"
maxOccurs="1"/>
- <xsd:element ref="PI_PASS_BUFFER" minOccurs="0"
maxOccurs="1"/>
- <xsd:element ref="PI_SALESORG" minOccurs="1"
maxOccurs="1"/>
- <xsd:any processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
<xsd:element name="CUSTOMERNO" type="xsd:string"/>
<xsd:element name="PI_DISTR_CHAN" type="xsd:string"/>
<xsd:element name="PI_DIVISION" type="xsd:string"/>
<xsd:element name="PI_PASS_BUFFER" type="xsd:string"/>
<xsd:element name="PI_SALESORG" type="xsd:string"/>
- <xsd:complexType name="Out">
- <xsd:sequence>
- <xsd:element ref="PE_ADDRESS" minOccurs="1" maxOccurs="1"/>
- <xsd:element ref="RETURN" minOccurs="1" maxOccurs="1"/>
- <xsd:any processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
<xsd:element name="PE_ADDRESS">
<xsd:complexType>
<xsd:sequence>
1.2 +5 -7 xml-axis/java/test/wsdl/nested/Nested2BindingImpl.java
Index: Nested2BindingImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/nested/Nested2BindingImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Nested2BindingImpl.java 6 Mar 2002 20:39:40 -0000 1.1
+++ Nested2BindingImpl.java 11 Mar 2002 13:24:40 -0000 1.2
@@ -8,8 +8,8 @@
package test.wsdl.nested;
public class Nested2BindingImpl implements test.wsdl.nested.Nested2PortType {
- public test.wsdl.nested.Out nestedSvc2(java.lang.String cUSTOMERNO,
java.lang.String pIDISTRCHAN, java.lang.String pIDIVISION, java.lang.String
pIPASSBUFFER, java.lang.String pISALESORG) throws java.rmi.RemoteException {
- test.wsdl.nested.PEADDRESS address = new test.wsdl.nested.PEADDRESS();
+ public void nestedSvc2(java.lang.String cUSTOMERNO, java.lang.String
pIDISTRCHAN, java.lang.String pIDIVISION, java.lang.String pIPASSBUFFER,
java.lang.String pISALESORG, PEADDRESSHolder pEADDRESS, RETURNHolder rETURN) throws
java.rmi.RemoteException {
+ PEADDRESS address = new PEADDRESS();
address.setFORMOFAD("Company");
address.setFIRSTNAME("");
address.setNAME("Becker Berlin");
@@ -34,7 +34,7 @@
address.setCOUNTRYISO("DE");
address.setONLYCHANGECOMADDRESS("X");
- test.wsdl.nested.RETURN ret = new test.wsdl.nested.RETURN();
+ RETURN ret = new RETURN();
ret.setTYPE("");
ret.setCODE("");
ret.setMESSAGE("");
@@ -45,10 +45,8 @@
ret.setMESSAGEV3("");
ret.setMESSAGEV4("");
- test.wsdl.nested.Out out = new test.wsdl.nested.Out();
- out.setPEADDRESS(address);
- out.setRETURN(ret);
- return out;
+ pEADDRESS.value = address;
+ rETURN.value = ret;
}
}
1.2 +11 -4 xml-axis/java/test/wsdl/nested/Nested2ServiceTestCase.java
Index: Nested2ServiceTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/nested/Nested2ServiceTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Nested2ServiceTestCase.java 6 Mar 2002 20:39:40 -0000 1.1
+++ Nested2ServiceTestCase.java 11 Mar 2002 13:24:40 -0000 1.2
@@ -22,10 +22,17 @@
assertTrue("binding is null", binding != null);
try {
- test.wsdl.nested.Out value = null;
- value = binding.nestedSvc2(new java.lang.String("0000001000"), new
java.lang.String("01"), new java.lang.String("00"), new java.lang.String(""), new
java.lang.String("1000"));
- test.wsdl.nested.PEADDRESS address = value.getPEADDRESS();
- test.wsdl.nested.RETURN ret = value.getRETURN();
+ PEADDRESSHolder pEADDRESS = new PEADDRESSHolder();
+ RETURNHolder rETURN = new RETURNHolder();
+ binding.nestedSvc2(new java.lang.String("0000001000"),
+ new java.lang.String("01"),
+ new java.lang.String("00"),
+ new java.lang.String(""),
+ new java.lang.String("1000"),
+ pEADDRESS,
+ rETURN);
+ PEADDRESS address = pEADDRESS.value;
+ RETURN ret = rETURN.value;
System.out.println("NAME:" + address.getNAME());
assertTrue("NAME is wrong", address.getNAME().equals("Becker Berlin"));
System.out.println("LOGMSGNO:" + ret.getLOGMSGNO());
