Author: alessio.soldano(a)jboss.com Date: 2012-08-30 08:24:00 -0400 (Thu, 30 Aug 2012) New Revision: 16685 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/ValidatingHelloImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/HelloResponse.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/ObjectFactory.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/package-info.java Removed: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/HelloResponse.java Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/Hello.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/HelloImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl Log: [JBWS-3500] Enhaching test Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-08-30 09:50:40 UTC (rev 16684) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-08-30 12:24:00 UTC (rev 16685) @@ -68,6 +68,8 @@ webxml="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/Hello*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/ValidatingHello*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/types/*.class"/> </classes> <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/WEB-INF/wsdl" Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/Hello.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/Hello.java 2012-08-30 09:50:40 UTC (rev 16684) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/Hello.java 2012-08-30 12:24:00 UTC (rev 16685) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -26,10 +26,14 @@ import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; +import javax.xml.bind.annotation.XmlSeeAlso; + +import org.jboss.test.ws.jaxws.samples.schemavalidation.types.HelloResponse; /** * @author ema(a)redhat.com */ @WebService(targetNamespace = "http://jboss.org/schemavalidation", name = "hello") +(a)XmlSeeAlso({org.jboss.test.ws.jaxws.samples.schemavalidation.types.ObjectFactory.class}) @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) public interface Hello { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/HelloImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/HelloImpl.java 2012-08-30 09:50:40 UTC (rev 16684) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/HelloImpl.java 2012-08-30 12:24:00 UTC (rev 16685) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxws.samples.schemavalidation; -import org.apache.cxf.annotations.SchemaValidation; +import org.jboss.test.ws.jaxws.samples.schemavalidation.types.HelloResponse; /** * @author ema(a)redhat.com */ @@ -29,15 +29,14 @@ portName = "HelloPort", targetNamespace = "http://jboss.org/schemavalidation", wsdlLocation = "WEB-INF/wsdl/hello.wsdl", endpointInterface = "org.jboss.test.ws.jaxws.samples.schemavalidation.Hello") - -@SchemaValidation public class HelloImpl implements Hello { - public HelloResponse helloRequest(java.lang.String input) { - HelloResponse response = new HelloResponse(); - response.setReturn(1); - return response; - - } + public HelloResponse helloRequest(String input) + { + HelloResponse response = new HelloResponse(); + response.setReturn(2); + return response; + } + } Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/HelloResponse.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/HelloResponse.java 2012-08-30 09:50:40 UTC (rev 16684) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/HelloResponse.java 2012-08-30 12:24:00 UTC (rev 16685) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.jaxws.samples.schemavalidation; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for helloResponse complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="helloResponse"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "helloResponse", propOrder = { - "_return" -}) -public class HelloResponse { - - @XmlElement(name = "return") - protected int _return; - - /** - * Gets the value of the return property. - * - */ - public int getReturn() { - return _return; - } - - /** - * Sets the value of the return property. - * - */ - public void setReturn(int value) { - this._return = value; - } - -} Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java 2012-08-30 09:50:40 UTC (rev 16684) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java 2012-08-30 12:24:00 UTC (rev 16685) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -29,14 +29,18 @@ import junit.framework.Test; +import org.jboss.test.ws.jaxws.samples.schemavalidation.types.HelloResponse; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; + /** * @author ema(a)redhat.com + * @author alessio.soldano(a)jboss.com */ public class SchemaValidationTestCase extends JBossWSTest { - private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-schemavalidation/HelloService"; + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-schemavalidation/hello"; + private final String validatingServiceURL = "http://" + getServerHost() + ":8080/jaxws-samples-schemavalidation/validatingHello"; public static Test suite() { @@ -48,14 +52,31 @@ QName serviceName = new QName("http://jboss.org/schemavalidation";, "HelloService"); URL wsdlURL = getResourceURL("jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl"); Service service = Service.create(wsdlURL, serviceName); - Hello proxy = (Hello)service.getPort(Hello.class); - ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL); + Hello proxy = (Hello)service.getPort(new QName("http://jboss.org/schemavalidation";, "ValidatingHelloPort"), Hello.class); + ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, validatingServiceURL); + HelloResponse hr = proxy.helloRequest("JBoss"); //valid value (see xsd restriction in the wsdl) + assertNotNull(hr); + assertEquals(1, hr.getReturn()); try { proxy.helloRequest("number"); fail("validation error is expeced"); } catch (Exception e) { assertTrue("not respect to enumration error is expected", e.getMessage().contains("is not facet-valid with respect to enumeration")); - } } + + public void testNoSchemaValidation() throws Exception + { + QName serviceName = new QName("http://jboss.org/schemavalidation";, "HelloService"); + URL wsdlURL = getResourceURL("jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl"); + Service service = Service.create(wsdlURL, serviceName); + Hello proxy = (Hello)service.getPort(new QName("http://jboss.org/schemavalidation";, "HelloPort"), Hello.class); + ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL); + HelloResponse hr = proxy.helloRequest("JBoss"); + assertNotNull(hr); + assertEquals(2, hr.getReturn()); + hr = proxy.helloRequest("number"); //validation is not enabled... + assertNotNull(hr); + assertEquals(2, hr.getReturn()); + } } \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/ValidatingHelloImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/ValidatingHelloImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/ValidatingHelloImpl.java 2012-08-30 12:24:00 UTC (rev 16685) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jaxws.samples.schemavalidation; + +import org.apache.cxf.annotations.SchemaValidation; +import org.jboss.test.ws.jaxws.samples.schemavalidation.types.HelloResponse; +/** + * @author ema(a)redhat.com + */ +(a)javax.jws.WebService(serviceName = "HelloService", + portName = "ValidatingHelloPort", targetNamespace = "http://jboss.org/schemavalidation", + wsdlLocation = "WEB-INF/wsdl/hello.wsdl", + endpointInterface = "org.jboss.test.ws.jaxws.samples.schemavalidation.Hello") + +@SchemaValidation +public class ValidatingHelloImpl implements Hello { + + public HelloResponse helloRequest(String input) + { + HelloResponse response = new HelloResponse(); + response.setReturn(1); + return response; + + } + +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/HelloResponse.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/HelloResponse.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/HelloResponse.java 2012-08-30 12:24:00 UTC (rev 16685) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jaxws.samples.schemavalidation.types; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for helloResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="helloResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "helloResponse", propOrder = { + "_return" +}) +public class HelloResponse { + + @XmlElement(name = "return") + protected int _return; + + /** + * Gets the value of the return property. + * + */ + public int getReturn() { + return _return; + } + + /** + * Sets the value of the return property. + * + */ + public void setReturn(int value) { + this._return = value; + } + +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/ObjectFactory.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/ObjectFactory.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/ObjectFactory.java 2012-08-30 12:24:00 UTC (rev 16685) @@ -0,0 +1,62 @@ +package org.jboss.test.ws.jaxws.samples.schemavalidation.types; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.schemavalidation.types package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _HelloRequest_QNAME = new QName("http://jboss.org/schemavalidation/types";, "helloRequest"); + private final static QName _HelloResponse_QNAME = new QName("http://jboss.org/schemavalidation/types";, "helloResponse"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.schemavalidation.types + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link HelloResponse } + * + */ + public HelloResponse createHelloResponse() { + return new HelloResponse(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://jboss.org/schemavalidation/types", name = "helloRequest") + public JAXBElement<String> createHelloRequest(String value) { + return new JAXBElement<String>(_HelloRequest_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HelloResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://jboss.org/schemavalidation/types", name = "helloResponse") + public JAXBElement<HelloResponse> createHelloResponse(HelloResponse value) { + return new JAXBElement<HelloResponse>(_HelloResponse_QNAME, HelloResponse.class, null, value); + } + +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/package-info.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/package-info.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/types/package-info.java 2012-08-30 12:24:00 UTC (rev 16685) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://jboss.org/schemavalidation/types", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.jboss.test.ws.jaxws.samples.schemavalidation.types; \ No newline at end of file Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/web.xml 2012-08-30 09:50:40 UTC (rev 16684) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/web.xml 2012-08-30 12:24:00 UTC (rev 16685) @@ -10,6 +10,14 @@ </servlet> <servlet-mapping> <servlet-name>HelloService</servlet-name> - <url-pattern>/*</url-pattern> + <url-pattern>/hello</url-pattern> </servlet-mapping> + <servlet> + <servlet-name>ValidatingHelloService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.schemavalidation.ValidatingHelloImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>ValidatingHelloService</servlet-name> + <url-pattern>/validatingHello</url-pattern> + </servlet-mapping> </web-app> \ No newline at end of file Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl 2012-08-30 09:50:40 UTC (rev 16684) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl 2012-08-30 12:24:00 UTC (rev 16685) @@ -56,7 +56,10 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/schemavalidation" /> + <soap:address location="http://localhost:8080/schemavalidation/hello" /> </port> + <port name="ValidatingHelloPort" binding="tns:HelloBinding"> + <soap:address location="http://localhost:8080/schemavalidation/validatingHello" /> + </port> </service> </definitions> \ No newline at end of file