Author: asoldano Date: 2013-08-20 11:18:34 -0400 (Tue, 20 Aug 2013) New Revision: 17880 Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCaseForked.java Removed: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: * [JBWS-3687] JBWS1178TestCase -> JBWS1178TestCaseForked * slight optimization in maven-surefire-plugin execution configuration Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-08-20 15:09:50 UTC (rev 17879) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-08-20 15:18:34 UTC (rev 17880) @@ -378,13 +378,8 @@ <forkMode>pertest</forkMode> <skip>false</skip> <includes> - <include>**/jaxws/cxf/httpproxy/*TestCaseForked.java</include> - <include>**/jaxws/cxf/spring/*TestCaseForked.java</include> - <include>**/jaxws/samples/schemavalidation/*TestCaseForked.java</include> - <include>**/jbws2150/**/*TestCaseForked.java</include> - <include>**/jms*/**/*TestCaseForked.java</include> - <include>**/smoke/tools/**/*TestForked.java</include> - <include>**/smoke/tools/**/*TestCaseForked.java</include> + <include>**/*TestCaseForked.java</include> + <include>**/*TestForked.java</include> </includes> <systemProperties> <property> Deleted: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2013-08-20 15:09:50 UTC (rev 17879) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2013-08-20 15:18:34 UTC (rev 17880) @@ -1,106 +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.jbws1178; - -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.URL; -import java.util.Map; - -import javax.management.Attribute; -import javax.management.ObjectName; -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.extensions.TestSetup; -import junit.framework.Test; - -import org.jboss.ws.common.ObjectNameFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1178] Multiple virtual host and soap:address problem - * [JBWS-864] soap:address in wsdl ignores <url-pattern> - * - * @author Thomas.Diesler(a)jboss.com - * @since 05-Oct-2006 - */ -public class JBWS1178TestCase extends JBossWSTest -{ - - public static Test suite() - { - TestSetup testSetup = new JBossWSTestSetup(JBWS1178TestCase.class, "jaxws-jbws1178.war") - { - private final ObjectName objectName = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); - private String webServiceHost; - - public void setUp() throws Exception - { - // Setting the WebServiceHost to an empty string, causes the request host to be used. - // This must be done before deploy time. - webServiceHost = (String)getServer().getAttribute(objectName, "WebServiceHost"); - getServer().setAttribute(objectName, new Attribute("WebServiceHost", "")); - super.setUp(); - } - - public void tearDown() throws Exception - { - super.tearDown(); - getServer().setAttribute(objectName, new Attribute("WebServiceHost", webServiceHost)); - } - }; - return testSetup; - } - - - public void testHostAddress() throws Exception - { - InetAddress inetAddr = InetAddress.getByName(getServerHost()); - String hostAddress = inetAddr instanceof Inet6Address ? "[" + inetAddr.getHostAddress() + "]" : inetAddr.getHostAddress(); - URL wsdlURL = new URL("http://" + hostAddress + ":8080/jaxws-jbws1178/testpattern?wsdl"); - - QName serviceName = new QName("http://org.jboss.ws/jbws1178", "EndpointService"); - Service service = Service.create(wsdlURL, serviceName); - Endpoint port = service.getPort(Endpoint.class); - Map<String, Object> reqCtx = ((BindingProvider)port).getRequestContext(); - URL epURL = new URL((String)reqCtx.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)); - - assertEquals(wsdlURL.getHost(), epURL.getHost()); - } - - public void testHostName() throws Exception - { - InetAddress inetAddr = InetAddress.getByName(getServerHost()); - URL wsdlURL = new URL("http://" + inetAddr.getHostName() + ":8080/jaxws-jbws1178/testpattern?wsdl"); - - QName serviceName = new QName("http://org.jboss.ws/jbws1178", "EndpointService"); - Service service = Service.create(wsdlURL, serviceName); - Endpoint port = service.getPort(Endpoint.class); - Map<String, Object> reqCtx = ((BindingProvider)port).getRequestContext(); - URL epURL = new URL((String)reqCtx.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)); - - assertEquals(wsdlURL.getHost(), epURL.getHost()); - } -} Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCaseForked.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCaseForked.java 2013-08-20 15:18:34 UTC (rev 17880) @@ -0,0 +1,106 @@ +/* + * 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.jbws1178; + +import java.net.Inet6Address; +import java.net.InetAddress; +import java.net.URL; +import java.util.Map; + +import javax.management.Attribute; +import javax.management.ObjectName; +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.extensions.TestSetup; +import junit.framework.Test; + +import org.jboss.ws.common.ObjectNameFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1178] Multiple virtual host and soap:address problem + * [JBWS-864] soap:address in wsdl ignores <url-pattern> + * + * @author Thomas.Diesler(a)jboss.com + * @since 05-Oct-2006 + */ +public class JBWS1178TestCaseForked extends JBossWSTest +{ + + public static Test suite() + { + TestSetup testSetup = new JBossWSTestSetup(JBWS1178TestCaseForked.class, "jaxws-jbws1178.war") + { + private final ObjectName objectName = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); + private String webServiceHost; + + public void setUp() throws Exception + { + // Setting the WebServiceHost to an empty string, causes the request host to be used. + // This must be done before deploy time. + webServiceHost = (String)getServer().getAttribute(objectName, "WebServiceHost"); + getServer().setAttribute(objectName, new Attribute("WebServiceHost", "")); + super.setUp(); + } + + public void tearDown() throws Exception + { + super.tearDown(); + getServer().setAttribute(objectName, new Attribute("WebServiceHost", webServiceHost)); + } + }; + return testSetup; + } + + + public void testHostAddress() throws Exception + { + InetAddress inetAddr = InetAddress.getByName(getServerHost()); + String hostAddress = inetAddr instanceof Inet6Address ? "[" + inetAddr.getHostAddress() + "]" : inetAddr.getHostAddress(); + URL wsdlURL = new URL("http://" + hostAddress + ":8080/jaxws-jbws1178/testpattern?wsdl"); + + QName serviceName = new QName("http://org.jboss.ws/jbws1178", "EndpointService"); + Service service = Service.create(wsdlURL, serviceName); + Endpoint port = service.getPort(Endpoint.class); + Map<String, Object> reqCtx = ((BindingProvider)port).getRequestContext(); + URL epURL = new URL((String)reqCtx.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)); + + assertEquals(wsdlURL.getHost(), epURL.getHost()); + } + + public void testHostName() throws Exception + { + InetAddress inetAddr = InetAddress.getByName(getServerHost()); + URL wsdlURL = new URL("http://" + inetAddr.getHostName() + ":8080/jaxws-jbws1178/testpattern?wsdl"); + + QName serviceName = new QName("http://org.jboss.ws/jbws1178", "EndpointService"); + Service service = Service.create(wsdlURL, serviceName); + Endpoint port = service.getPort(Endpoint.class); + Map<String, Object> reqCtx = ((BindingProvider)port).getRequestContext(); + URL epURL = new URL((String)reqCtx.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)); + + assertEquals(wsdlURL.getHost(), epURL.getHost()); + } +}