svn commit: r1543091 - /cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java

[sergeyb]

Author: sergeyb
Date: Mon Nov 18 17:33:38 2013
New Revision: 1543091

URL: http://svn.apache.org/r1543091
Log:
[CXF-5153] Disabling servlet address updates by default on the trunk only

Modified:
    
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java

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=1543091&r1=1543090&r2=1543091&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
 Mon Nov 18 17:33:38 2013
@@ -30,6 +30,7 @@ import javax.xml.ws.Endpoint;
 import javax.xml.ws.soap.SOAPBinding;
 
 import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
 
 import com.meterware.httpunit.GetMethodWebRequest;
 import com.meterware.httpunit.PostMethodWebRequest;
@@ -253,7 +254,16 @@ public class CXFServletTest extends Abst
         
         addNamespace("http", "http://schemas.xmlsoap.org/wsdl/http/";);
         assertValid("//wsdl:operation[@name='greetMe']", doc);
-        assertValid("//http:address[@location='" + CONTEXT_URL + 
"/services/greeter2']", doc);
+        NodeList addresses = assertValid("//http:address/@locatiossn", doc);
+        boolean found = true;
+        for (int i = 0; i < addresses.getLength(); i++) {
+            String address = addresses.item(i).getLocalName();
+            if (address.startsWith("http://localhost";) && 
address.endsWith("/services/greeter2")) {
+                found = true;
+                break;
+            }
+        }
+        assertTrue(found);
     }
 
     @Test