Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A9B07C9EF for ; Tue, 4 Jun 2013 07:22:23 +0000 (UTC) Received: (qmail 81066 invoked by uid 500); 4 Jun 2013 07:22:22 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 80638 invoked by uid 500); 4 Jun 2013 07:22:20 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 80608 invoked by uid 99); 4 Jun 2013 07:22:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 07:22:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 07:22:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F18B42388900; Tue, 4 Jun 2013 07:21:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1489304 - in /cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet: CXFServletTest.java ExternalServicesServletTest.java cxf-servlet.xml Date: Tue, 04 Jun 2013 07:21:54 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130604072154.F18B42388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Tue Jun 4 07:21:54 2013 New Revision: 1489304 URL: http://svn.apache.org/r1489304 Log: [CXF-5047]add a testcase to demonstrate that how multiple endpoints with publishedEndpointUrl property work Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java?rev=1489304&r1=1489303&r2=1489304&view=diff ============================================================================== --- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java (original) +++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java Tue Jun 4 07:21:54 2013 @@ -19,10 +19,14 @@ package org.apache.cxf.systest.servlet; + import java.util.HashSet; import java.util.Set; import javax.jws.WebService; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; +import javax.xml.namespace.QName; import javax.xml.ws.Endpoint; import javax.xml.ws.soap.SOAPBinding; @@ -39,6 +43,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusException; import org.apache.cxf.BusFactory; import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.helpers.XMLUtils; import org.apache.hello_world_soap_http.BaseGreeterImpl; import org.junit.Before; @@ -47,6 +52,9 @@ import org.junit.Test; public class CXFServletTest extends AbstractServletTest { + public static final QName SERVICE_NAME = new QName("http://apache.org/hello_world_soap_http", "SOAPService"); + + @Before public void setUp() throws Exception { @@ -97,7 +105,7 @@ public class CXFServletTest extends Abst WebLink[] links = res.getLinks(); - assertEquals("Wrong number of service links", 4, links.length); + assertEquals("Wrong number of service links", 6, links.length); Set links2 = new HashSet(); for (WebLink l : links) { @@ -118,7 +126,7 @@ public class CXFServletTest extends Abst links2.add(l.getURLString()); } - assertEquals("Wrong number of service links", 4, links.length); + assertEquals("Wrong number of service links", 6, links.length); assertTrue(links2.contains(CONTEXT_URL + "/services/greeter?wsdl")); assertTrue(links2.contains(CONTEXT_URL + "/services/greeter2?wsdl")); assertTrue(links2.contains("http://cxf.apache.org/MyGreeter?wsdl")); @@ -178,10 +186,36 @@ public class CXFServletTest extends Abst assertEquals("text/xml", res.getContentType()); Document doc = DOMUtils.readXml(res.getInputStream()); assertNotNull(doc); + XMLUtils.printDOM(doc); assertValid("//wsdl:operation[@name='greetMe']", doc); assertValid("//wsdlsoap:address[@location='" + CONTEXT_URL + "/services/greeter']", doc); } + + + @Test + public void testGetWSDLWithMultiplePublishedEndpointUrl() throws Exception { + ServletUnitClient client = newClient(); + client.setExceptionsThrownOnErrorStatus(true); + + WebRequest req = new GetMethodQueryWebRequest(CONTEXT_URL + "/services/greeter5?wsdl"); + + WebResponse res = client.getResponse(req); + assertEquals(200, res.getResponseCode()); + assertEquals("text/xml", res.getContentType()); + Document doc = DOMUtils.readXml(res.getInputStream()); + assertNotNull(doc); + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + wsdlReader.setFeature("javax.wsdl.verbose", false); + + XMLUtils.printDOM(doc); + + assertValid("//wsdl:service[@name='SOAPService']/wsdl:port[@name='SoapPort']/wsdlsoap:address[@location='" + + "http://cxf.apache.org/publishedEndpointUrl1']", doc); + assertValid("//wsdl:service[@name='SOAPService']/wsdl:port[@name='SoapPort1']/wsdlsoap:address[@location='" + + "http://cxf.apache.org/publishedEndpointUrl2']", doc); + + } @Test public void testGetWSDLWithIncludes() throws Exception { ServletUnitClient client = newClient(); Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java?rev=1489304&r1=1489303&r2=1489304&view=diff ============================================================================== --- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java (original) +++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java Tue Jun 4 07:21:54 2013 @@ -59,7 +59,7 @@ public class ExternalServicesServletTest //test the '/' context get service list WebResponse res = client.getResponse(CONTEXT_URL + "/"); WebLink[] links = res.getLinks(); - assertEquals("Wrong number of service links", 4, links.length); + assertEquals("Wrong number of service links", 6, links.length); Set links2 = new HashSet(); for (WebLink l : links) { Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml?rev=1489304&r1=1489303&r2=1489304&view=diff ============================================================================== --- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml (original) +++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml Tue Jun 4 07:21:54 2013 @@ -57,5 +57,24 @@ http://cxf.apache.org/jaxws http://cxf.a + + + - \ No newline at end of file +