[jbossws-commits] JBossWS SVN: r16851 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2012-10-11 05:05:09 -0400 (Thu, 11 Oct 2012)
New Revision: 16851

Modified:
   stack/cxf/branches/jbossws-cxf-4.0.x/
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyWSDLTestCase.java
Log:
Backporting http proxy test fix

Blocked revisions 16716,16822 via svnmerge

.......
  r16716 | alessio.soldano at jboss.com | 2012-09-12 18:06:05 +0200 (Wed, 12 Sep 2012) | 2 lines
  
  Moving http proxy testcase to forked VM execution as playing with client system properties does not fit multithread execution...
.......
  r16822 | alessio.soldano at jboss.com | 2012-10-08 11:09:49 +0200 (Mon, 08 Oct 2012) | 2 lines
  
  Fixing HTTPProxyTestCaseForked and moving to cxf 2.6.3-SNAPSHOT
.......



Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
   - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,15665,15688,15769,15884,15898-15899,15933,15952,15963,15966,15979,16048-16049,16076,16084,16088-16090,16094,16097,16101-16102,16108-16110,16122-16123,16127,16158,16161,16164,16184,16197,16199,16203,16226,16235-16240,16242,16251,16253-16255,16257-16258,16277,16284,16297-16298,16307,16311,16313,16316-16320,16322,16336-16337,16343-16345,16348,16373,16388,16396,16401,16405-16406,16410-16411,16415-16417,16419-16420,16422,16426-16427,16471,16479-16480,16486,16488-16489,16493,16500,16509,16513,16515,16549-16550,16552-16553,16565,16596,16624-16625,16627,16629,16648,16669,16671,16673,16675,16679-16680,16683-16687,16690,16693-16695,16699-16701,16704,16706-16709,16712-16715,16718,16731,16758-16759,16770,16773,16780,16801,16804,16814,16821,16825
   + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,15665,15688,15769,15884,15898-15899,15933,15952,15963,15966,15979,16048-16049,16076,16084,16088-16090,16094,16097,16101-16102,16108-16110,16122-16123,16127,16158,16161,16164,16184,16197,16199,16203,16226,16235-16240,16242,16251,16253-16255,16257-16258,16277,16284,16297-16298,16307,16311,16313,16316-16320,16322,16336-16337,16343-16345,16348,16373,16388,16396,16401,16405-16406,16410-16411,16415-16417,16419-16420,16422,16426-16427,16471,16479-16480,16486,16488-16489,16493,16500,16509,16513,16515,16549-16550,16552-16553,16565,16596,16624-16625,16627,16629,16648,16669,16671,16673,16675,16679-16680,16683-16687,16690,16693-16695,16699-16701,16704,16706-16709,16712-16716,16718,16731,16758-16759,16770,16773,16780,16801,16804,16814,16821-16822,16825

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyWSDLTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyWSDLTestCase.java	2012-10-11 08:54:21 UTC (rev 16850)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyWSDLTestCase.java	2012-10-11 09:05:09 UTC (rev 16851)
@@ -58,8 +58,8 @@
       {
          Authenticator.setDefault(new ProxyAuthenticator(PROXY_USER, PROXY_PWD));
          String endpointAddress = "http://unreachable-testWSDLHttpProxy" + ENDPOINT_PATH;
-         StringBuffer sb = readContent(new URL(endpointAddress + "?wsdl"));
-         assertTrue(sb.toString().contains("wsdl:definitions name=\"HelloWorldService\""));
+         String c = readContent(new URL(endpointAddress + "?wsdl")).toString();
+         assertTrue(c.contains("wsdl:definitions") && c.contains(" name=\"HelloWorldService\""));
       }
       finally
       {