[jbossws-commits] JBossWS SVN: r18677 - stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150.

Author: rsearls Date: 2014-05-19 12:10:09 -0400 (Mon, 19 May 2014) New Revision: 18677 Modified: stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java Log: [JBWS-3750] minor update to test Modified: stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java =================================================================== --- stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-05-19 16:09:03 UTC (rev 18676) +++ stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-05-19 16:10:09 UTC (rev 18677) @@ -537,7 +537,7 @@ public void testRewriteContext() throws Exception { setModifySOAPAddress(true); - final String addContext = "xx"; + final String addContext = "xx/jaxws-jbws2150"; setWebServicePath(addContext); deploy("jaxws-jbws2150.war"); try @@ -554,19 +554,19 @@ Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("http://" + serverHost + ":8080/" + addContext + "/jaxws-jbws2150/ValidURL", address); + assertEquals("http://" + serverHost + ":8080/" + addContext + "/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("http://" + serverHost + ":8080/" + addContext + "/jaxws-jbws2150/InvalidURL", address); + assertEquals("http://" + serverHost + ":8080/" + addContext + "/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("https://" + serverHost + ":8443/" + addContext + "/jaxws-jbws2150/ValidSecureURL", address); + assertEquals("https://" + serverHost + ":8443/" + addContext + "/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("https://" + serverHost + ":8443/" + addContext + "/jaxws-jbws2150/InvalidSecureURL", address); + assertEquals("https://" + serverHost + ":8443/" + addContext + "/InvalidSecureURL", address); //check wsdl import (which is bound to the endpoint currently serving the wsdl) - assertTrue(getWsdlImportAddress(definition).contains(addContext + "/jaxws-jbws2150")); + assertTrue(getWsdlImportAddress(definition).contains(addContext)); } } finally @@ -584,8 +584,8 @@ public void testAutoRewriteContext() throws Exception { setModifySOAPAddress(true); - final String addContext = "xx"; - setWebServicePath(addContext); + final String addContext = "jaxws-jbws2150"; + setWebServicePath("xx/" + addContext); setWebServiceHost(ServerConfig.UNDEFINED_HOSTNAME); deploy("jaxws-jbws2150.war"); try @@ -597,24 +597,25 @@ wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl"); wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl"); + // the addresses should not be rewritten because of the webServiceHost setting. for (final String wsdlLocation : wsdlLocations) { Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("http://" + serverHost + ":8080/" + addContext + "/jaxws-jbws2150/ValidURL", address); + assertEquals("http://" + serverHost + ":8080/" + addContext + "/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("http://" + serverHost + ":8080/" + addContext + "/jaxws-jbws2150/InvalidURL", address); + assertEquals("http://" + serverHost + ":8080/" + addContext + "/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("https://" + serverHost + ":8443/" + addContext + "/jaxws-jbws2150/ValidSecureURL", address); + assertEquals("http://" + serverHost + ":8080/" + addContext + "/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("https://" + serverHost + ":8443/" + addContext + "/jaxws-jbws2150/InvalidSecureURL", address); + assertEquals("http://" + serverHost + ":8080/" + addContext + "/InvalidSecureURL", address); //check wsdl import (which is bound to the endpoint currently serving the wsdl) - assertTrue(getWsdlImportAddress(definition).contains(addContext + "/jaxws-jbws2150")); + assertTrue(getWsdlImportAddress(definition).contains(addContext)); } } finally