Author: jlukas(a)redhat.com Date: 2010-07-23 04:39:55 -0400 (Fri, 23 Jul 2010) New Revision: 23694 Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortType.wsdl trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortTypeO.wsdl trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/jbide6694.wsdl Removed: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694.wsdl Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java Log: improved a test for jbide6694 Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortType.wsdl =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortType.wsdl (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortType.wsdl 2010-07-23 08:39:55 UTC (rev 23694) @@ -0,0 +1,8 @@ +<definitions name="ConverterPortType" targetNamespace="http://ns.test.jboss.org/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://test.jboss.org/ns" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ns.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <import location="ConverterPortTypeO.wsdl" namespace="http://test.jboss.org/ns"/> + <service name="ConverterPortType"> + <port binding="ns1:ConverterPortTypeBinding" name="ConverterPortTypeImplPort"> + <soap:address location="http://localhost:8080/ws/ConverterPortType"/> + </port> + </service> +</definitions> \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortTypeO.wsdl =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortTypeO.wsdl (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/ConverterPortTypeO.wsdl 2010-07-23 08:39:55 UTC (rev 23694) @@ -0,0 +1,52 @@ +<definitions name="ConverterPortType" targetNamespace="http://test.jboss.org/ns" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://test.jboss.org/ns" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ns.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <types> + <xs:schema elementFormDefault="qualified" targetNamespace="http://test.jboss.org/ns" version="1.0" xmlns:tns="http://test.jboss.org/ns" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:element name="ChangeUnit"> + <xs:complexType> + <xs:sequence> + <xs:element name="value" type="xs:double"/> + <xs:element name="fromUnit" type="tns:Units"/> + <xs:element name="toUnit" type="tns:Units"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="ChangeUnitResponse"> + <xs:complexType> + <xs:sequence> + <xs:element name="ChangeUnitResult" type="xs:double"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:simpleType name="Units"> + <xs:restriction base="xs:string"> + <xs:enumeration value="kilometer"/> + <xs:enumeration value="meter"/> + </xs:restriction> + </xs:simpleType> + </xs:schema> + </types> + <message name="ConverterPortType_convertResponse"> + <part element="ns1:ChangeUnitResponse" name="parameters"/> + </message> + <message name="ConverterPortType_convert"> + <part element="ns1:ChangeUnit" name="parameters"/> + </message> + <portType name="ConverterPortType"> + <operation name="convert" parameterOrder="parameters"> + <input message="ns1:ConverterPortType_convert"/> + <output message="ns1:ConverterPortType_convertResponse"/> + </operation> + </portType> + <binding name="ConverterPortTypeBinding" type="ns1:ConverterPortType"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="convert"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> +</definitions> \ No newline at end of file Copied: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/jbide6694.wsdl (from rev 23692, trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694.wsdl) =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/jbide6694.wsdl (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694/jbide6694.wsdl 2010-07-23 08:39:55 UTC (rev 23694) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test.jboss.org/ns" xmlns:s="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test.jboss.org/ns" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + <wsdl:types> + <s:schema elementFormDefault="qualified" targetNamespace="http://test.jboss.org/ns"> + <s:element name="ChangeUnit"> + <s:complexType> + <s:sequence> + <s:element minOccurs="1" maxOccurs="1" name="value" type="s:double" /> + <s:element minOccurs="1" maxOccurs="1" name="fromUnit" type="tns:Units" /> + <s:element minOccurs="1" maxOccurs="1" name="toUnit" type="tns:Units" /> + </s:sequence> + </s:complexType> + </s:element> + <s:simpleType name="Units"> + <s:restriction base="s:string"> + <s:enumeration value="kilometer" /> + <s:enumeration value="meter" /> + </s:restriction> + </s:simpleType> + <s:element name="ChangeUnitResponse"> + <s:complexType> + <s:sequence> + <s:element minOccurs="1" maxOccurs="1" name="ChangeUnitResult" type="s:double" /> + </s:sequence> + </s:complexType> + </s:element> + <s:element name="double" type="s:double" /> + </s:schema> + </wsdl:types> + <wsdl:message name="ChangeUnitIn"> + <wsdl:part name="parameters" element="tns:ChangeUnit" /> + </wsdl:message> + <wsdl:message name="ChangeUnitOut"> + <wsdl:part name="parameters" element="tns:ChangeUnitResponse" /> + </wsdl:message> + <wsdl:portType name="ConverterPortType"> + <wsdl:operation name="convert"> + <wsdl:input message="tns:ChangeUnitIn" /> + <wsdl:output message="tns:ChangeUnitOut" /> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="ConverterBinding" type="tns:ConverterPortType"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="convert"> + <soap:operation soapAction="" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="Converter"> + <wsdl:port name="ConverterPort" binding="tns:ConverterBinding"> + <soap:address location="" /> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Deleted: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694.wsdl =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694.wsdl 2010-07-23 08:15:04 UTC (rev 23693) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6694.wsdl 2010-07-23 08:39:55 UTC (rev 23694) @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test.jboss.org/ns" xmlns:s="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test.jboss.org/ns" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <s:schema elementFormDefault="qualified" targetNamespace="http://test.jboss.org/ns"> - <s:element name="ChangeUnit"> - <s:complexType> - <s:sequence> - <s:element minOccurs="1" maxOccurs="1" name="value" type="s:double" /> - <s:element minOccurs="1" maxOccurs="1" name="fromUnit" type="tns:Units" /> - <s:element minOccurs="1" maxOccurs="1" name="toUnit" type="tns:Units" /> - </s:sequence> - </s:complexType> - </s:element> - <s:simpleType name="Units"> - <s:restriction base="s:string"> - <s:enumeration value="kilometer" /> - <s:enumeration value="meter" /> - </s:restriction> - </s:simpleType> - <s:element name="ChangeUnitResponse"> - <s:complexType> - <s:sequence> - <s:element minOccurs="1" maxOccurs="1" name="ChangeUnitResult" type="s:double" /> - </s:sequence> - </s:complexType> - </s:element> - <s:element name="double" type="s:double" /> - </s:schema> - </wsdl:types> - <wsdl:message name="ChangeUnitIn"> - <wsdl:part name="parameters" element="tns:ChangeUnit" /> - </wsdl:message> - <wsdl:message name="ChangeUnitOut"> - <wsdl:part name="parameters" element="tns:ChangeUnitResponse" /> - </wsdl:message> - <wsdl:portType name="ConverterPortType"> - <wsdl:operation name="convert"> - <wsdl:input message="tns:ChangeUnitIn" /> - <wsdl:output message="tns:ChangeUnitOut" /> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="ConverterBinding" type="tns:ConverterPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> - <wsdl:operation name="convert"> - <soap:operation soapAction="" style="document" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="Converter"> - <wsdl:port name="ConverterPort" binding="tns:ConverterBinding"> - <soap:address location="" /> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> \ No newline at end of file Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2010-07-23 08:15:04 UTC (rev 23693) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2010-07-23 08:39:55 UTC (rev 23694) @@ -99,11 +99,17 @@ @Test public void testJBIDE6694() { - String s1 = getSampleMessage("/jbide6694.wsdl", "Converter", "ConverterPort", "ConverterBinding", "convert"); + String s1 = getSampleMessage("/jbide6694/ConverterPortType.wsdl", "ConverterPortType", "ConverterPortTypeImplPort", "ConverterPortTypeBinding", "convert"); Assert.assertTrue(s1.contains("<ChangeUnit xmlns = \"http://test.jboss.org/ns\">")); Assert.assertTrue(s1.contains("<value>?</value>")); Assert.assertTrue(s1.contains("<fromUnit>?</fromUnit>")); Assert.assertTrue(s1.contains("<toUnit>?</toUnit>")); + + String s2 = getSampleMessage("/jbide6694/jbide6694.wsdl", "Converter", "ConverterPort", "ConverterBinding", "convert"); + Assert.assertTrue(s2.contains("<ChangeUnit xmlns = \"http://test.jboss.org/ns\">")); + Assert.assertTrue(s2.contains("<value>?</value>")); + Assert.assertTrue(s2.contains("<fromUnit>?</fromUnit>")); + Assert.assertTrue(s2.contains("<toUnit>?</toUnit>")); } private String getSampleMessage(String res, String service, String port, String binding, String operation) {