Author: asoldano
Date: 2015-04-03 16:44:14 -0400 (Fri, 03 Apr 2015)
New Revision: 19621
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3805/JBWS3805TestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml
Log:
Fixing two test issues with port offsets
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3805/JBWS3805TestCase.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3805/JBWS3805TestCase.java 2015-04-03
20:28:44 UTC (rev 19620)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3805/JBWS3805TestCase.java 2015-04-03
20:44:14 UTC (rev 19621)
@@ -77,7 +77,7 @@
{
if (line.contains("address location"))
{
- assertTrue("Unexpected uri scheme",
line.contains("https://foo:8443/jaxws-cxf-JBWS3805/HelloService"));
+ assertTrue("Unexpected uri scheme",
line.contains("https://foo:" + (baseURL.getPort() + 8443 - 8080) +
"/jaxws-cxf-JBWS3805/HelloService"));
return;
}
}
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml 2015-04-03
20:28:44 UTC (rev 19620)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml 2015-04-03
20:44:14 UTC (rev 19621)
@@ -2,7 +2,7 @@
<webservices
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsdl="http://Hello.org"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd"
version="1.2">
<webservice-description>
<webservice-description-name>JBWS3792WSService</webservice-description-name>
-
<wsdl-file>http://@jboss.bind.address@:8080/jbws3792-external-wsdl/jbws3792.wsdl</wsdl-file>
+
<wsdl-file>http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jbws3792-external-wsdl/jbws3792.wsdl</wsdl-file>
<port-component>
<service-impl-bean>
<servlet-link>org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSImpl</servlet-link>