From: markt Date: Sat, 31 Oct 2009 11:01:48 +0000 (+0000) Subject: Refactoring to allow easier re-use. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=840f8475706389ab6e500e7005c9e5914ad174e7;p=tomcat7.0 Refactoring to allow easier re-use. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@831530 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/test/org/apache/catalina/startup/TestTomcat.java b/test/org/apache/catalina/startup/TestTomcat.java index 98b4c01b1..898413740 100644 --- a/test/org/apache/catalina/startup/TestTomcat.java +++ b/test/org/apache/catalina/startup/TestTomcat.java @@ -16,14 +16,9 @@ */ package org.apache.catalina.startup; -import java.io.BufferedInputStream; import java.io.File; import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; import java.net.URL; -import java.util.List; -import java.util.Map; import javax.naming.Context; import javax.naming.InitialContext; @@ -216,35 +211,4 @@ public class TestTomcat extends TestTomcatBase { assertEquals(HttpServletResponse.SC_OK, rc); } - /** - * Wrapper for getting the response. - */ - public static ByteChunk getUrl(String path) throws IOException { - ByteChunk out = new ByteChunk(); - getUrl(path, out, null); - return out; - } - - public static int getUrl(String path, - ByteChunk out, - Map> resHead) throws IOException { - URL url = new URL(path); - HttpURLConnection connection = - (HttpURLConnection) url.openConnection(); - connection.setReadTimeout(100000); - connection.connect(); - int rc = connection.getResponseCode(); - if (resHead != null) { - Map> head = connection.getHeaderFields(); - resHead.putAll(head); - } - InputStream is = connection.getInputStream(); - BufferedInputStream bis = new BufferedInputStream(is); - byte[] buf = new byte[2048]; - int rd = 0; - while((rd = bis.read(buf)) > 0) { - out.append(buf, 0, rd); - } - return rc; - } } diff --git a/test/org/apache/catalina/startup/TestTomcatBase.java b/test/org/apache/catalina/startup/TestTomcatBase.java index 360c69fc9..3c6984675 100644 --- a/test/org/apache/catalina/startup/TestTomcatBase.java +++ b/test/org/apache/catalina/startup/TestTomcatBase.java @@ -16,15 +16,23 @@ */ package org.apache.catalina.startup; +import java.io.BufferedInputStream; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.io.PrintWriter; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.List; +import java.util.Map; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.tomcat.util.buf.ByteChunk; + import junit.framework.TestCase; /** @@ -83,4 +91,37 @@ public abstract class TestTomcatBase extends TestCase { out.print("

Hello World

"); } } + + + /** + * Wrapper for getting the response. + */ + public static ByteChunk getUrl(String path) throws IOException { + ByteChunk out = new ByteChunk(); + getUrl(path, out, null); + return out; + } + + public static int getUrl(String path, + ByteChunk out, + Map> resHead) throws IOException { + URL url = new URL(path); + HttpURLConnection connection = + (HttpURLConnection) url.openConnection(); + connection.setReadTimeout(100000); + connection.connect(); + int rc = connection.getResponseCode(); + if (resHead != null) { + Map> head = connection.getHeaderFields(); + resHead.putAll(head); + } + InputStream is = connection.getInputStream(); + BufferedInputStream bis = new BufferedInputStream(is); + byte[] buf = new byte[2048]; + int rd = 0; + while((rd = bis.read(buf)) > 0) { + out.append(buf, 0, rd); + } + return rc; + } }