svn commit: r993301 - in /cxf/branches/2.2.x-fixes: ./ systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java

[sergeyb]

Author: sergeyb
Date: Tue Sep  7 09:51:31 2010
New Revision: 993301

URL: http://svn.apache.org/viewvc?rev=993301&view=rev
Log:
Merged revisions 992464,992681 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r992464 | sergeyb | 2010-09-03 21:50:41 +0100 (Fri, 03 Sep 2010) | 1 line
  
  Trying to fix Locator test, temporarily adding printlns
........
  r992681 | sergeyb | 2010-09-04 22:13:29 +0100 (Sat, 04 Sep 2010) | 1 line
  
  Removing printlns in the Locator test
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep  7 09:51:31 2010
@@ -1 +1 @@
-/cxf/trunk:989123,989434,990386,990593,991324,991416,991797,991893,991923,991925-991927,992000
+/cxf/trunk:989123,989434,990386,990593,991324,991416,991797,991893,991923,991925-991927,992000,992464,992681

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java?rev=993301&r1=993300&r2=993301&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
 Tue Sep  7 09:51:31 2010
@@ -115,7 +115,8 @@ public class LocatorClientServerTest ext
         
         W3CEndpointReference epr = port.lookupEndpoint(new 
QName("http://service/1";, "Number"));
         String eprString = epr.toString();
-        assertTrue(eprString.contains("Metadata 
wsdli:wsdlLocation=\"http://service/1 wsdlLoc\""));
+        assertTrue(eprString.contains("Metadata"));
+        assertTrue(eprString.contains("wsdli:wsdlLocation=\"http://service/1 
wsdlLoc\""));
     }
     
     @Test
@@ -129,7 +130,8 @@ public class LocatorClientServerTest ext
         
         W3CEndpointReference epr = port.lookupEndpoint(new 
QName("http://service/2";, "Number"));
         String eprString = epr.toString();
-        assertTrue(eprString.contains("Metadata 
wsdli:wsdlLocation=\"wsdlLoc\""));
+        assertTrue(eprString.contains("Metadata"));
+        assertTrue(eprString.contains("wsdli:wsdlLocation=\"wsdlLoc\""));
     }
 
     @Test