Repository: maven-wagon Updated Branches: refs/heads/master 60b584c3b -> 481b21d88
replaced deprecated StringOutputStream with ByteArrayOutputStream Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/481b21d8 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/481b21d8 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/481b21d8 Branch: refs/heads/master Commit: 481b21d885cca8844a4daa31b2549fafec649f68 Parents: 60b584c Author: Hervé Boutemy <hbout...@apache.org> Authored: Sun Apr 20 09:46:48 2014 +0200 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Sun Apr 20 09:46:48 2014 +0200 ---------------------------------------------------------------------- .../org/apache/maven/wagon/WagonTestCase.java | 1 - .../maven/wagon/http/HttpWagonTestCase.java | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/481b21d8/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java ---------------------------------------------------------------------- diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java index 3ca1f61..4a1a006 100644 --- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java +++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java @@ -42,7 +42,6 @@ import java.security.NoSuchAlgorithmException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.List; /** http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/481b21d8/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java ---------------------------------------------------------------------- diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java index 4535e9f..b7432e3 100644 --- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java +++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java @@ -32,7 +32,6 @@ import org.apache.maven.wagon.repository.Repository; import org.apache.maven.wagon.resource.Resource; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.StringOutputStream; import org.codehaus.plexus.util.StringUtils; import org.mortbay.jetty.Handler; import org.mortbay.jetty.HttpConnection; @@ -53,6 +52,8 @@ import javax.servlet.ServletException; import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -162,7 +163,7 @@ public abstract class HttpWagonTestCase wagon.connect( new Repository( "id", getProtocol() + "://localhost:" + server.getConnectors()[0].getLocalPort() ) ); - wagon.getToStream( "resource", new StringOutputStream() ); + wagon.getToStream( "resource", new ByteArrayOutputStream() ); wagon.disconnect(); @@ -194,7 +195,7 @@ public abstract class HttpWagonTestCase wagon.connect( new Repository( "id", getProtocol() + "://localhost:" + server.getConnectors()[0].getLocalPort() ) ); - wagon.getToStream( "resource", new StringOutputStream() ); + wagon.getToStream( "resource", new ByteArrayOutputStream() ); wagon.disconnect(); @@ -273,7 +274,7 @@ public abstract class HttpWagonTestCase try { - wagon.getToStream( "resource", new StringOutputStream() ); + wagon.getToStream( "resource", new ByteArrayOutputStream() ); fail(); } finally @@ -958,10 +959,9 @@ public abstract class HttpWagonTestCase wagon.connect( testRepository, proxyInfo ); - StringOutputStream out = new StringOutputStream(); try { - wagon.getToStream( "test-proxied-resource", out ); + wagon.getToStream( "test-proxied-resource", new ByteArrayOutputStream() ); assertTrue( handler.headers.containsKey( "Proxy-Connection" ) ); } @@ -1101,7 +1101,7 @@ public abstract class HttpWagonTestCase wagon.connect( testRepository, authInfo ); - StringOutputStream out = new StringOutputStream(); + ByteArrayOutputStream out = new ByteArrayOutputStream(); try { wagon.getToStream( "test-secured-resource", out ); @@ -1111,7 +1111,7 @@ public abstract class HttpWagonTestCase wagon.disconnect(); } - assertEquals( "top secret", out.toString() ); + assertEquals( "top secret", out.toString( "US-ASCII" ) ); TestSecurityHandler securityHandler = (TestSecurityHandler) ( (Context) server.getHandler() ).getHandler(); testPreemptiveAuthenticationGet( securityHandler, supportPreemptiveAuthenticationGet() ); @@ -1706,9 +1706,9 @@ public abstract class HttpWagonTestCase throws IOException, ServletException { headers = new HashMap<String, String>(); - for ( Enumeration e = request.getHeaderNames(); e.hasMoreElements(); ) + for ( Enumeration<String> e = request.getHeaderNames(); e.hasMoreElements(); ) { - String name = (String) e.nextElement(); + String name = e.nextElement(); headers.put( name, request.getHeader( name ) ); }
