Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 37173 invoked from network); 2 Jul 2010 18:32:02 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Jul 2010 18:32:02 -0000 Received: (qmail 23246 invoked by uid 500); 2 Jul 2010 18:32:01 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 23131 invoked by uid 500); 2 Jul 2010 18:32:00 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 23122 invoked by uid 99); 2 Jul 2010 18:32:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jul 2010 18:32:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jul 2010 18:31:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CC39923889B2; Fri, 2 Jul 2010 18:30:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r960083 - /tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java Date: Fri, 02 Jul 2010 18:30:34 -0000 To: dev@tomcat.apache.org From: pero@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100702183034.CC39923889B2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pero Date: Fri Jul 2 18:30:34 2010 New Revision: 960083 URL: http://svn.apache.org/viewvc?rev=960083&view=rev Log: Test NIO AsyncListener timeout. Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java?rev=960083&r1=960082&r2=960083&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java Fri Jul 2 18:30:34 2010 @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRes import org.apache.catalina.Context; import org.apache.catalina.Wrapper; +import org.apache.catalina.connector.Connector; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; @@ -44,8 +45,38 @@ public class TestAsyncListener extends T public void testTimeout() throws Exception { // Setup Tomcat instance + Tomcat tomcat = getTomcatInstance(); + + TimeoutServlet timeout = createTimeoutTestApp(tomcat); + tomcat.start(); + checkTimeoutRequest(timeout); + } + + public void testNIOTimeout() throws Exception { + // Setup Tomcat instance with NIO Connector Tomcat tomcat = getTomcatInstance(); + Connector nioConnector = new Connector("org.apache.coyote.http11.Http11NioProtocol"); + nioConnector.setPort(getNextPort()); + tomcat.getService().addConnector(nioConnector); + TimeoutServlet timeout = createTimeoutTestApp(tomcat); + + tomcat.start(); + checkTimeoutRequest(timeout); + } + + private void checkTimeoutRequest(TimeoutServlet timeout) + throws IOException, InterruptedException { + ByteChunk res = getUrl("http://localhost:" + getPort() + "/async"); + Thread.sleep(4000); + assertEquals(1,timeout.getAsyncTimeout()); + //assertEquals(1,timeout.getAsyncStart()); + assertEquals(1,timeout.getAsyncComplete()); + //assertEquals("hello start: " + timeout.getStart() + "\n", res.toString()); + assertNull(res.toString()); + } + + private TimeoutServlet createTimeoutTestApp(Tomcat tomcat) { // Must have a real docBase - just use temp File docBase = new File(System.getProperty("java.io.tmpdir")); @@ -62,15 +93,7 @@ public class TestAsyncListener extends T Wrapper wrapper = Tomcat.addServlet(ctx, "time", timeout); wrapper.setAsyncSupported(true); ctx.addServletMapping("/async", "time"); - - tomcat.start(); - ByteChunk res = getUrl("http://localhost:" + getPort() + "/async"); - Thread.sleep(4000); - assertEquals(1,timeout.getAsyncTimeout()); - //assertEquals(1,timeout.getAsyncStart()); - assertEquals(1,timeout.getAsyncComplete()); - //assertEquals("hello start: " + timeout.getStart() + "\n", res.toString()); - assertNull(res.toString()); + return timeout; } private static class TimeoutServlet extends HttpServlet { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org