Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 95136 invoked from network); 10 Jul 2009 18:04:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Jul 2009 18:04:53 -0000 Received: (qmail 23133 invoked by uid 500); 10 Jul 2009 18:05:03 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 23059 invoked by uid 500); 10 Jul 2009 18:05:02 -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 23050 invoked by uid 99); 10 Jul 2009 18:05:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jul 2009 18:05:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 10 Jul 2009 18:04:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A0D2D23888C5; Fri, 10 Jul 2009 18:04:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r793059 - /cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java Date: Fri, 10 Jul 2009 18:04:31 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090710180431.A0D2D23888C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Jul 10 18:04:31 2009 New Revision: 793059 URL: http://svn.apache.org/viewvc?rev=793059&view=rev Log: [CXF-2336] Add asserts to check the namespace of return to test CXF-2336 Modified: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java Modified: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java?rev=793059&r1=793058&r2=793059&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java (original) +++ cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java Fri Jul 10 18:04:31 2009 @@ -18,6 +18,9 @@ */ package org.apache.cxf.frontend.soap; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + import org.apache.cxf.binding.soap.Soap12; import org.apache.cxf.binding.soap.SoapBindingConfiguration; import org.apache.cxf.endpoint.ServerImpl; @@ -78,17 +81,26 @@ MultipleEndpointObserver meo = (MultipleEndpointObserver) mo; assertEquals(2, meo.getEndpoints().size()); - invoke("http://localhost/Hello", LocalTransportFactory.TRANSPORT_ID, "soap11.xml"); + Node nd = invoke("http://localhost/Hello", LocalTransportFactory.TRANSPORT_ID, "soap11.xml"); + assertEquals("http://schemas.xmlsoap.org/soap/envelope/", getNs(nd)); assertTrue(service1Invoked); assertFalse(service2Invoked); service1Invoked = false; - invoke("http://localhost/Hello", LocalTransportFactory.TRANSPORT_ID, "soap12.xml"); + nd = invoke("http://localhost/Hello", LocalTransportFactory.TRANSPORT_ID, "soap12.xml"); + assertEquals("http://www.w3.org/2003/05/soap-envelope", getNs(nd)); assertFalse(service1Invoked); assertTrue(service2Invoked); } + + private String getNs(Node nd) { + if (nd instanceof Document) { + return getNs(((Document)nd).getDocumentElement()); + } + return nd.getNamespaceURI(); + } }