Author: darran.lofthouse(a)jboss.com Date: 2007-01-05 10:31:56 -0500 (Fri, 05 Jan 2007) New Revision: 1819 Added: branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/ branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/AbstractType.java branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/Person.java branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook.wsdl branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook_PortType.java branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/TelephoneNumber.java branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml Log: JBWS-1441 - Test Case Added: branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2007-01-05 14:42:43 UTC (rev 1818) +++ branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2007-01-05 15:31:56 UTC (rev 1819) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.tools.jbws1441; + +import java.io.File; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 5 Jan 2007 + */ +public class JBWS1441TestCase extends JBossWSTest +{ + + private static final String resourceDir = "resources/tools/jbws1441"; + private static final String toolsDir = "tools/jbws1441"; + + public void testGenerate() throws Exception + { + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + + compareSource("AbstractType.java"); + compareSource("Person.java"); + compareSource("PhoneBook_PortType.java"); + compareSource("TelephoneNumber.java"); + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String fileName) throws Exception + { + File expected = new File(resourceDir + "/" + fileName); + File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1441/" + fileName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } +} Property changes on: branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/AbstractType.java =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/AbstractType.java 2007-01-05 14:42:43 UTC (rev 1818) +++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/AbstractType.java 2007-01-05 15:31:56 UTC (rev 1819) @@ -0,0 +1,13 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1441; + + +public class AbstractType { + + public AbstractType() { + } +} Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/AbstractType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/Person.java =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/Person.java 2007-01-05 14:42:43 UTC (rev 1818) +++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/Person.java 2007-01-05 15:31:56 UTC (rev 1819) @@ -0,0 +1,36 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1441; + + +public class Person extends org.jboss.test.ws.jbws1441.AbstractType { + protected java.lang.String firstName; + protected java.lang.String surname; + + public Person() { + } + + public Person(java.lang.String firstName, java.lang.String surname) { + this.firstName = firstName; + this.surname = surname; + } + + public java.lang.String getFirstName() { + return firstName; + } + + public void setFirstName(java.lang.String firstName) { + this.firstName = firstName; + } + + public java.lang.String getSurname() { + return surname; + } + + public void setSurname(java.lang.String surname) { + this.surname = surname; + } +} Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/Person.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook.wsdl 2007-01-05 14:42:43 UTC (rev 1818) +++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook.wsdl 2007-01-05 15:31:56 UTC (rev 1819) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1441' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1441/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1441' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1441/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1441/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='AbstractType'> + <sequence/> + </complexType> + + <complexType name='Person'> + <complexContent> + <extension base='tns:AbstractType'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </extension> + </complexContent> + </complexType> + + <complexType name='TelephoneNumber'> + <complexContent> + <extension base='tns:AbstractType'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </extension> + </complexContent> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook_PortType.java 2007-01-05 14:42:43 UTC (rev 1818) +++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook_PortType.java 2007-01-05 15:31:56 UTC (rev 1819) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1441; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public org.jboss.test.ws.jbws1441.TelephoneNumber lookup(org.jboss.test.ws.jbws1441.Person parameters) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/TelephoneNumber.java 2007-01-05 14:42:43 UTC (rev 1818) +++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/TelephoneNumber.java 2007-01-05 15:31:56 UTC (rev 1819) @@ -0,0 +1,36 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1441; + + +public class TelephoneNumber extends org.jboss.test.ws.jbws1441.AbstractType { + protected java.lang.String areaCode; + protected java.lang.String number; + + public TelephoneNumber() { + } + + public TelephoneNumber(java.lang.String areaCode, java.lang.String number) { + this.areaCode = areaCode; + this.number = number; + } + + public java.lang.String getAreaCode() { + return areaCode; + } + + public void setAreaCode(java.lang.String areaCode) { + this.areaCode = areaCode; + } + + public java.lang.String getNumber() { + return number; + } + + public void setNumber(java.lang.String number) { + this.number = number; + } +} Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/TelephoneNumber.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml 2007-01-05 14:42:43 UTC (rev 1818) +++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml 2007-01-05 15:31:56 UTC (rev 1819) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1441</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1441</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1441.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1441.Person</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1441.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceN... + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1441.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1441.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1441.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml 2007-01-05 14:42:43 UTC (rev 1818) +++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml 2007-01-05 15:31:56 UTC (rev 1819) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1441/PhoneBook.wsdl" parameter-style="wrapped"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF