[jbossws-commits] JBossWS SVN: r18445 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms and 21 other directories.

Author: asoldano Date: 2014-02-28 08:34:19 -0500 (Fri, 28 Feb 2014) New Revision: 18445 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java Log: [JBWS-3769] Fix shared-tests and cxf-spring-tests Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,12 +21,11 @@ */ package org.jboss.test.ws.jaxws.cxf.in_container_client; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -55,7 +54,6 @@ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-in_container_client-client?path=/jaxws-cxf-in_container_client/HelloWorldService&method=" + test + "&helper=" + Helper.class.getName()); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - return br.readLine(); + return IOUtils.readAndCloseStream(url.openStream()); } } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCaseForked.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCaseForked.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,12 +21,11 @@ */ package org.jboss.test.ws.jaxws.cxf.jms; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -46,8 +45,7 @@ public void testServerSide() throws Exception { URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-api"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - assertEquals("true", br.readLine()); + assertEquals("true", IOUtils.readAndCloseStream(url.openStream())); } } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,8 +21,6 @@ */ package org.jboss.test.ws.jaxws.cxf.jms; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import java.util.Properties; @@ -47,6 +45,7 @@ import org.apache.cxf.transport.jms.JMSConduit; import org.apache.cxf.transport.jms.JNDIConfiguration; import org.jboss.ws.common.DOMUtils; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; @@ -70,8 +69,7 @@ public void testJMSEndpointServerSide() throws Exception { URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-only-deployment-test-servlet"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - assertEquals("true", br.readLine()); + assertEquals("true", IOUtils.readAndCloseStream(url.openStream())); } public void testJMSEndpointClientSide() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,8 +21,6 @@ */ package org.jboss.test.ws.jaxws.cxf.jms_http; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import java.util.Properties; @@ -36,6 +34,7 @@ import org.apache.cxf.transport.jms.JMSConduit; import org.apache.cxf.transport.jms.JNDIConfiguration; import org.jboss.test.ws.jaxws.cxf.jms.HelloWorld; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; @@ -59,8 +58,7 @@ { final String suffix = isTargetJBoss7() ? "-as7" : ""; URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment-test-servlet" + suffix); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - assertEquals("true", br.readLine()); + assertEquals("true", IOUtils.readAndCloseStream(url.openStream())); } public void testJMSEndpointClientSide() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,8 +21,6 @@ */ package org.jboss.test.ws.jaxws.cxf.webserviceref; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import javax.xml.namespace.QName; @@ -30,6 +28,7 @@ import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -67,9 +66,7 @@ try { URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String retStr = br.readLine(); - assertEquals("HelloWorld", retStr); + assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream())); } finally { Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,12 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.wsse; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -58,7 +57,6 @@ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-client?path=/jaxws-samples-wsse-username&method=" + test + "&helper=" + UsernameHelper.class.getName()); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - return br.readLine(); + return IOUtils.readAndCloseStream(url.openStream()); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,12 +21,11 @@ */ package org.jboss.test.ws.jaxrpc.samples.serviceref; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -48,8 +47,6 @@ public void testServletClient() throws Exception { URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String retStr = br.readLine(); - assertEquals("HelloWorld", retStr); + assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream())); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,12 +21,11 @@ */ package org.jboss.test.ws.jaxws.clientConfig; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -129,7 +128,6 @@ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-clientConfig-inContainer-client?path=/jaxws-clientConfig/EndpointImpl&method=" + test + "&helper=" + Helper.class.getName()); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - return br.readLine(); + return IOUtils.readAndCloseStream(url.openStream()); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,12 +21,11 @@ */ package org.jboss.test.ws.jaxws.clientConfig; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -84,7 +83,6 @@ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-clientConfig-inContainer-client?path=/jaxws-clientConfig/EndpointImpl&method=" + test + "&helper=" + Helper.class.getName()); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - return br.readLine(); + return IOUtils.readAndCloseStream(url.openStream()); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,8 +21,6 @@ */ package org.jboss.test.ws.jaxws.endpoint; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import javax.wsdl.Definition; @@ -34,6 +32,7 @@ import junit.extensions.TestSetup; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -73,8 +72,7 @@ public void testServletAccess() throws Exception { URL url = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint-servlet?param=hello-world"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - assertEquals("hello-world", br.readLine()); + assertEquals("hello-world", IOUtils.readAndCloseStream(url.openStream())); } public void testWSAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,12 +21,11 @@ */ package org.jboss.test.ws.jaxws.enventry; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -46,9 +45,6 @@ public void testEndpoint() throws Exception { URL url = new URL("http://" + getServerHost() + ":8080/jaxws-enventry-servlet"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String line = br.readLine(); - - assertEquals("web:8", line); + assertEquals("web:8", IOUtils.readAndCloseStream(url.openStream())); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -29,6 +29,7 @@ import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -69,5 +70,6 @@ URL jsp = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1357/hello.jsp"); HttpURLConnection conn = (HttpURLConnection) jsp.openConnection(); assertEquals(conn.getResponseCode(), 200); + IOUtils.readAndCloseStream(conn.getInputStream()); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,13 +21,11 @@ */ package org.jboss.test.ws.jaxws.jbws2307; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -45,8 +43,6 @@ public void testMTOM() throws Exception { - HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client/jbws2307?mtom=true").openConnection(); - BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); - assertEquals("true", isr.readLine()); + assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client/jbws2307?mtom=true").openStream())); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,13 +21,11 @@ */ package org.jboss.test.ws.jaxws.jbws2527; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -59,9 +57,7 @@ deploy("jaxws-jbws2527-service.war"); deploy("jaxws-jbws2527-client.war"); - HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/jaxws-jbws2527-client/jbws2527").openConnection(); - BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); - assertEquals("true", isr.readLine()); + assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-jbws2527-client/jbws2527").openStream())); } finally { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,8 +21,6 @@ */ package org.jboss.test.ws.jaxws.jbws2701; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import javax.xml.namespace.QName; @@ -30,6 +28,7 @@ import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -51,15 +50,7 @@ public void testWSDL() throws Exception { URL url = new URL(endpointAddress + "?wsdl"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String line = br.readLine(); - StringBuilder sb = new StringBuilder(); - while (line != null) - { - sb.append(line); - line = br.readLine(); - } - assertTrue(sb.toString().contains("classA")); + assertTrue(IOUtils.readAndCloseStream(url.openStream()).contains("classA")); } public void testEndpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,12 +21,9 @@ */ package org.jboss.test.ws.jaxws.jbws3140; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.net.HttpURLConnection; import java.net.URL; - +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; @@ -39,8 +36,7 @@ try { JBossWSTestHelper.deploy("jbws3140-responses-server.war"); JBossWSTestHelper.deploy("jbws3140-client.war"); - HttpURLConnection connection = (HttpURLConnection) new URL(servletClientURL + "?mtom=small").openConnection(); - String result = readConnection(connection).toString(); + String result = IOUtils.readAndCloseStream(new URL(servletClientURL + "?mtom=small").openStream()); assertTrue("SOAPFaultException is expected but received: " + result, result.indexOf("SOAPFaultException") > -1); String expectedDetail = "A header representing a Message Addressing Property is not valid"; assertTrue("Expected message wasn't found in response: " + result, result.indexOf(expectedDetail) > -1); @@ -55,8 +51,7 @@ try { JBossWSTestHelper.deploy("jbws3140-server.war"); JBossWSTestHelper.deploy("jbws3140-client.war"); - HttpURLConnection connection = (HttpURLConnection) new URL(servletClientURL + "?mtom=small").openConnection(); - String result = readConnection(connection).toString(); + String result = IOUtils.readAndCloseStream(new URL(servletClientURL + "?mtom=small").openStream()); String expected ="--ClientMTOMEnabled--ServerMTOMEnabled--ServerAddressingEnabled--ClientAddressingEnabled"; assertTrue("Expected string wasn't found in response: " + result, result.indexOf(expected) > -1); } finally { @@ -64,22 +59,4 @@ JBossWSTestHelper.undeploy("jbws3140-client.war"); } } - - private ByteArrayOutputStream readConnection(HttpURLConnection connection) - { - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - byte[] buffer = new byte[1024]; - int count = 0; - try - { - while( (count = connection.getInputStream().read(buffer, 0, 1024)) > -1) { - bout.write(buffer, 0, count); - } - } - catch (IOException e) - { - } - return bout; - } - } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,8 +21,6 @@ */ package org.jboss.test.ws.jaxws.jbws3223; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import javax.wsdl.Definition; @@ -32,6 +30,7 @@ import junit.extensions.TestSetup; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -65,8 +64,7 @@ public void testServletAccess() throws Exception { URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3223-servlet?param=hello-world&clCheck=true"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - assertEquals("hello-world", br.readLine()); + assertEquals("hello-world", IOUtils.readAndCloseStream(url.openStream())); } private void readWSDL(URL wsdlURL) throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,12 +21,11 @@ */ package org.jboss.test.ws.jaxws.jbws3477; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -80,8 +79,6 @@ } private static void runServerTest(URL url) throws Exception { - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String retStr = br.readLine(); - assertEquals("OK", retStr); + assertEquals("OK", IOUtils.readAndCloseStream(url.openStream())); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,9 +21,6 @@ */ package org.jboss.test.ws.jaxws.jbws860; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; import java.net.URL; import javax.wsdl.Definition; @@ -32,6 +29,7 @@ import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -58,8 +56,6 @@ public void testServletAccess() throws Exception { - HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/test/TestServlet").openConnection(); - BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); - assertEquals("Hello", isr.readLine()); + assertEquals("Hello", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/test/TestServlet").openStream())); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,10 +21,8 @@ */ package org.jboss.test.ws.jaxws.samples.eardeployment; -import java.io.BufferedReader; import java.io.File; import java.io.IOException; -import java.io.InputStreamReader; import java.net.URL; import javax.xml.namespace.QName; @@ -33,6 +31,7 @@ import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -106,8 +105,7 @@ if (wsdlFileDir == null) { URL url = new URL("http://" + getServerHost() + ":8080/earjse/support"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - wsdlFileDir = new File(br.readLine(), "wsdl"); + wsdlFileDir = new File(IOUtils.readAndCloseStream(url.openStream()), "wsdl"); } return wsdlFileDir; } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,12 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.exception; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -72,8 +71,7 @@ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-exception-client?path=/jaxws-samples-exception-jse/ExceptionEndpointService&method=" + test + "&helper=" + ExceptionHelper.class.getName()); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - return br.readLine(); + return IOUtils.readAndCloseStream(url.openStream()); } private String runTestInContainerSOAP12(String test) throws Exception @@ -81,7 +79,6 @@ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-exception-client?path=/jaxws-samples-exception-jse/SOAP12ExceptionEndpointService&method=" + test + "&helper=" + SOAP12ExceptionHelper.class.getName()); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - return br.readLine(); + return IOUtils.readAndCloseStream(url.openStream()); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -31,6 +31,7 @@ import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; @@ -56,7 +57,7 @@ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); InputStream inputStream = wsdlURL.openStream(); assertNotNull(inputStream); - inputStream.close(); + IOUtils.readAndCloseStream(inputStream); } public void testDynamicProxy() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -31,6 +31,7 @@ import junit.framework.Test; import org.jboss.test.ws.jaxws.samples.serviceref.EJBRemote; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -55,7 +56,7 @@ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); InputStream inputStream = wsdlURL.openStream(); assertNotNull(inputStream); - inputStream.close(); + IOUtils.readAndCloseStream(inputStream); } public void testDynamicProxy() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,17 +21,18 @@ */ package org.jboss.test.ws.jaxws.samples.serviceref; -import junit.framework.Test; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; +import java.io.InputStream; +import java.net.URL; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.InputStream; -import java.net.URL; +import junit.framework.Test; + +import org.jboss.ws.common.IOUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + /** * Test the JAXWS <service-ref> * @@ -54,7 +55,7 @@ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); InputStream inputStream = wsdlURL.openStream(); assertNotNull(inputStream); - inputStream.close(); + IOUtils.readAndCloseStream(inputStream); } public void testDynamicProxy() throws Exception @@ -72,9 +73,7 @@ public void testServletClient() throws Exception { URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String retStr = br.readLine(); - assertEquals("HelloWorld", retStr); + assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream())); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,8 +21,6 @@ */ package org.jboss.test.ws.jaxws.samples.webserviceref; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import javax.xml.namespace.QName; @@ -30,6 +28,7 @@ import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -66,9 +65,7 @@ try { URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String retStr = br.readLine(); - assertEquals("HelloWorld", retStr); + assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream())); } finally { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,12 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.webservicerefsec; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -51,9 +50,7 @@ try { URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String retStr = br.readLine(); - assertEquals("HelloWorld", retStr); + assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream())); } finally { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2014-02-28 11:46:40 UTC (rev 18444) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2014-02-28 13:34:19 UTC (rev 18445) @@ -21,12 +21,11 @@ */ package org.jboss.test.ws.publish; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.net.URL; import junit.framework.Test; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -46,7 +45,6 @@ public void testEndpointPublish() throws Exception { URL url = new URL("http://" + getServerHost() + ":8080/endpoint-publish"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - assertEquals("1", br.readLine()); + assertEquals("1", IOUtils.readAndCloseStream(url.openStream())); } }