Author: alessio.soldano(a)jboss.com Date: 2012-08-30 12:28:22 -0400 (Thu, 30 Aug 2012) New Revision: 16687 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/Helper.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl 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/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/java/org/jboss/test/ws/jaxws/samples/schemavalidation/ValidatingHelloImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3529] Adding testcase on using client and endpoint default configurations' properties, e.g. to control default schema validation 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 13:07:13 UTC (rev 16686) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-08-30 16:28:22 UTC (rev 16687) @@ -78,6 +78,19 @@ <attribute name="Dependencies" value="org.apache.cxf"/> </manifest> </war> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-schemavalidation-client.war" needxmlfile='false'> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/wsf/test/ClientHelper.class"/> + <include name="org/jboss/wsf/test/TestServlet.class"/> + <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/Hello.class"/> + <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/Helper.class"/> + <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/types/*.class"/> + </classes> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation" prefix="WEB-INF/classes"> + <include name="client.wsdl" /> + <include name="validatingClient.wsdl" /> + </zipfileset> + </war> <!-- jaxws-samples-wsa --> <war Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2012-08-30 16:28:22 UTC (rev 16687) @@ -0,0 +1,135 @@ +/* + * 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 java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +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; +import org.jboss.wsf.test.JBossWSTestHelper; + +/** + * A testcase for verifying default schema validation configured + * through standard client/endpoint configuration (AS 7 DMR) + * + * @author alessio.soldano(a)jboss.com + */ +public class DefaultSchemaValidationTestCaseForked extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSCXFTestSetup(DefaultSchemaValidationTestCaseForked.class, "jaxws-samples-schemavalidation-client.war"); + } + + /** + * Verifies the default client configuration can be used to always set schema validation from AS model + * + * @throws Exception + */ + public void testDefaultClientValidation() throws Exception { + if (!isTargetJBoss71()) { + try { + JBossWSTestHelper.deploy("jaxws-samples-schemavalidation.war"); + assertEquals("1", runInContainer("testDefaultClientValidation")); + } finally { + JBossWSTestHelper.undeploy("jaxws-samples-schemavalidation.war"); + } + } + } + + /** + * Verifies the default endpoint configuration can be used to always set schema validation from AS model + * + * @throws Exception + */ + public void testDefaultServerValidation() throws Exception { + final QName serviceName = new QName("http://jboss.org/schemavalidation";, "HelloService"); + final QName portName = new QName("http://jboss.org/schemavalidation";, "HelloPort"); + URL wsdlURL = getResourceURL("jaxws/samples/schemavalidation/client.wsdl"); + Service service = Service.create(wsdlURL, serviceName); + Hello proxy = (Hello) service.getPort(portName, Hello.class); + ((BindingProvider) proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, + "http://" + getServerHost() + ":8080/jaxws-samples-schemavalidation/hello"); + HelloResponse hr; + try { + JBossWSTestHelper.deploy("jaxws-samples-schemavalidation.war"); + hr = proxy.helloRequest("JBoss"); + assertNotNull(hr); + assertEquals(2, hr.getReturn()); + hr = proxy.helloRequest("number"); + assertNotNull(hr); + assertEquals(2, hr.getReturn()); + } finally { + JBossWSTestHelper.undeploy("jaxws-samples-schemavalidation.war"); + } + + // -- modify default conf to enable default endpoint schema validation + try + { + runInContainer("enableDefaultEndpointSchemaValidation"); + try { + JBossWSTestHelper.deploy("jaxws-samples-schemavalidation.war"); + hr = proxy.helloRequest("JBoss"); + assertNotNull(hr); + assertEquals(2, hr.getReturn()); + try { + proxy.helloRequest("number"); + fail(); + } catch (Exception e) { + assertTrue(e.getMessage().contains("is not facet-valid with respect to enumeration")); + } + } finally { + JBossWSTestHelper.undeploy("jaxws-samples-schemavalidation.war"); + } + } + finally + { + // -- restore default conf -- + runInContainer("disableDefaultEndpointSchemaValidation"); + // -- + } + + + } + + // ------------------------- + + private String runInContainer(String test) throws Exception + { + URL url = new URL("http://" + getServerHost() + + ":8080/jaxws-samples-schemavalidation-client?path=/jaxws-samples-schemavalidation/hello&method=" + test + + "&helper=" + Helper.class.getName()); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + return br.readLine(); + } + + +} \ No newline at end of file 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 13:07:13 UTC (rev 16686) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/HelloImpl.java 2012-08-30 16:28:22 UTC (rev 16687) @@ -33,6 +33,7 @@ public HelloResponse helloRequest(String input) { + System.out.println("Hello: " + input); HelloResponse response = new HelloResponse(); response.setReturn(2); return response; Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/Helper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/Helper.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/Helper.java 2012-08-30 16:28:22 UTC (rev 16687) @@ -0,0 +1,169 @@ +/* + * 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 java.net.URL; +import java.util.List; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import org.jboss.test.ws.jaxws.samples.schemavalidation.types.HelloResponse; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.classloading.ClassLoaderProvider; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.metadata.config.AbstractCommonConfig; +import org.jboss.wsf.spi.metadata.config.ClientConfig; +import org.jboss.wsf.spi.metadata.config.EndpointConfig; +import org.jboss.wsf.test.ClientHelper; + +/** + * + * @author alessio.soldano(a)jboss.com + */ +public class Helper implements ClientHelper +{ + private String address; + + public boolean testDefaultClientValidation() throws Exception + { + // first verify schema validation is not enabled yet: a wsdl with schema restrictions is used on client side, + // but schema validation is not enabled; the invoked endpoint does not have schema validation on + final QName serviceName = new QName("http://jboss.org/schemavalidation";, "HelloService"); + final QName portName = new QName("http://jboss.org/schemavalidation";, "HelloPort"); + final URL wsdlURL = Thread.currentThread().getContextClassLoader().getResource("validatingClient.wsdl"); + Service service = Service.create(wsdlURL, serviceName); + Hello proxy = (Hello) service.getPort(portName, Hello.class); + ((BindingProvider) proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address); + HelloResponse hr = proxy.helloRequest("JBoss"); + if (hr == null || hr.getReturn() != 2) + { + return false; + } + hr = proxy.helloRequest("number"); + if (hr == null || hr.getReturn() != 2) + { + return false; + } + + // then modify default conf to enable default client schema validation + try + { + modifyDefaultClientConfiguration(getAndVerifyDefaultConfiguration(true)); + + service = Service.create(wsdlURL, serviceName); + proxy = (Hello) service.getPort(portName, Hello.class); + ((BindingProvider) proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address); + hr = proxy.helloRequest("JBoss"); + if (hr == null || hr.getReturn() != 2) + { + return false; + } + try + { + proxy.helloRequest("number"); + return false; + } + catch (Exception e) + { + return e.getMessage().contains("is not facet-valid with respect to enumeration"); + } + } + finally + { + // -- restore default conf -- + cleanupConfig(true); + // -- + } + } + + public boolean enableDefaultEndpointSchemaValidation() throws Exception { + modifyDefaultClientConfiguration(getAndVerifyDefaultConfiguration(false)); + return true; + } + + public boolean disableDefaultEndpointSchemaValidation() throws Exception { + cleanupConfig(false); + return true; + } + + @Override + public void setTargetEndpoint(String address) + { + this.address = address; + } + + protected static AbstractCommonConfig getAndVerifyDefaultConfiguration(boolean client) throws Exception { + ServerConfig sc = getServerConfig(); + AbstractCommonConfig defaultConfig = null; + final List<? extends AbstractCommonConfig> cfgs = client ? sc.getClientConfigs() : sc.getEndpointConfigs(); + final String DEFCFG = client ? ClientConfig.STANDARD_CLIENT_CONFIG : EndpointConfig.STANDARD_ENDPOINT_CONFIG; + for (AbstractCommonConfig c : cfgs) { + if (DEFCFG.equals(c.getConfigName())) { + defaultConfig = c; + } + } + if (defaultConfig == null) { + throw new Exception("Missing AS config '" + DEFCFG + "'!"); + } + Map<String, String> props = defaultConfig.getProperties(); + if (props != null && !props.isEmpty()) { + throw new Exception("'" + DEFCFG + "' is not empty!"); + } + return defaultConfig; + } + + protected static void modifyDefaultClientConfiguration(AbstractCommonConfig defaultConfig) { + defaultConfig.setProperty("schema-validation-enabled", "true"); + } + + protected static void cleanupConfig(boolean client) throws Exception { + ServerConfig sc = getServerConfig(); + AbstractCommonConfig defaultConfig = null; + final List<? extends AbstractCommonConfig> cfgs = client ? sc.getClientConfigs() : sc.getEndpointConfigs(); + final String DEFCFG = client ? ClientConfig.STANDARD_CLIENT_CONFIG : EndpointConfig.STANDARD_ENDPOINT_CONFIG; + for (AbstractCommonConfig c : cfgs) { + if (DEFCFG.equals(c.getConfigName())) { + defaultConfig = c; + } + } + if (defaultConfig == null) { + throw new Exception("Missing AS config '" + DEFCFG + "'!"); + } + Map<String, String> props = defaultConfig.getProperties(); + if (props == null || props.isEmpty()) { + throw new Exception("'" + DEFCFG + "' is already empty!"); + } + props.clear(); + } + + private static ServerConfig getServerConfig() + { + final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(); + SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider(); + return spiProvider.getSPI(ServerConfigFactory.class, cl).getServerConfig(); + } +} 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 13:07:13 UTC (rev 16686) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java 2012-08-30 16:28:22 UTC (rev 16687) @@ -34,6 +34,8 @@ import org.jboss.wsf.test.JBossWSTest; /** + * A testcase acting as sample for using client and server schema validation of messages + * * @author ema(a)redhat.com * @author alessio.soldano(a)jboss.com */ @@ -59,7 +61,7 @@ assertEquals(1, hr.getReturn()); try { proxy.helloRequest("number"); - fail("validation error is expeced"); + fail("validation error is expected"); } catch (Exception e) { assertTrue("not respect to enumration error is expected", e.getMessage().contains("is not facet-valid with respect to enumeration")); } @@ -83,7 +85,7 @@ public void testClientSideSchemaValidation() throws Exception { QName serviceName = new QName("http://jboss.org/schemavalidation";, "HelloService"); - URL wsdlURL = getResourceURL("jaxws/samples/schemavalidation/client.wsdl"); + URL wsdlURL = getResourceURL("jaxws/samples/schemavalidation/validatingClient.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); @@ -93,7 +95,7 @@ assertEquals(2, hr.getReturn()); try { proxy.helloRequest("number"); - fail("validation error is expeced"); + fail("validation error is expected"); } catch (Exception e) { assertTrue("not respect to enumration error is expected", e.getMessage().contains("is not facet-valid with respect to enumeration")); } Modified: 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 2012-08-30 13:07:13 UTC (rev 16686) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/ValidatingHelloImpl.java 2012-08-30 16:28:22 UTC (rev 16687) @@ -36,6 +36,7 @@ public HelloResponse helloRequest(String input) { + System.out.println("ValidatingHello: " + input); HelloResponse response = new HelloResponse(); response.setReturn(1); return response; Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl 2012-08-30 13:07:13 UTC (rev 16686) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl 2012-08-30 16:28:22 UTC (rev 16687) @@ -20,14 +20,7 @@ </complexType> <element name="helloResponse" type="x1:helloResponse"/> - <element name="helloRequest"> - <simpleType> - <restriction base="xsd:string"> - <enumeration value="JBoss"/> - <enumeration value="CXF"/> - </restriction> - </simpleType> - </element> + <element name="helloRequest" type="xsd:string"/> </xsd:schema> </types> <message name="helloRequest"> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl 2012-08-30 16:28:22 UTC (rev 16687) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + name="helloworld" + targetNamespace="http://jboss.org/schemavalidation" + xmlns:tns="http://jboss.org/schemavalidation" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:x1="http://jboss.org/schemavalidation/types"> + <types> + <xsd:schema + xmlns="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://jboss.org/schemavalidation/types" + elementFormDefault="qualified"> + + <complexType name="helloResponse"> + <sequence> + <element name="return" type="xsd:int" /> + </sequence> + </complexType> + <element name="helloResponse" type="x1:helloResponse"/> + + <element name="helloRequest"> + <simpleType> + <restriction base="xsd:string"> + <enumeration value="JBoss"/> + <enumeration value="CXF"/> + </restriction> + </simpleType> + </element> + </xsd:schema> + </types> + <message name="helloRequest"> + <part name="parameters" element="x1:helloRequest" /> + </message> + <message name="helloResponse"> + <part name="result" element="x1:helloResponse" /> + </message> + <portType name="hello"> + <operation name="helloRequest"> + <input message="tns:helloRequest" /> + <output message="tns:helloResponse" /> + </operation> + </portType> + <binding name="HelloBinding" type="tns:hello"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" /> + <operation name="helloRequest"> + <soap:operation soapAction="" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> + </binding> + <service name="HelloService"> + <port name="HelloPort" binding="tns:HelloBinding"> + <soap:address location="http://localhost:8080/schemavalidation/hello" /> + </port> + </service> +</definitions> \ No newline at end of file Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-08-30 13:07:13 UTC (rev 16686) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-08-30 16:28:22 UTC (rev 16687) @@ -367,6 +367,7 @@ <include>**/smoke/tools/**/*TestCaseForked.java</include> <include>**/jbws2150/**/*TestCaseForked.java</include> <include>**/jms*/**/*TestCaseForked.java</include> + <include>**/jaxws/samples/schemavalidation/*TestCaseForked.java</include> </includes> <systemProperties> <property>