From c63f0f471e8758a0c099f9dd8bc4b815ac538af0 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 26 Jul 2011 12:28:00 +0000
Subject: [PATCH] Tests are run with all three HTTP connectors. No need for
 separate tests.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1151074 13f79535-47bb-0310-9956-ffa450edef68
---
 .../coyote/http11/TestInternalInputBuffer.java     | 33 ++--------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/test/org/apache/coyote/http11/TestInternalInputBuffer.java b/test/org/apache/coyote/http11/TestInternalInputBuffer.java
index 6e61a916a..4d3a59a0f 100644
--- a/test/org/apache/coyote/http11/TestInternalInputBuffer.java
+++ b/test/org/apache/coyote/http11/TestInternalInputBuffer.java
@@ -31,7 +31,6 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
-import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.SimpleHttpClient;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -40,54 +39,28 @@ public class TestInternalInputBuffer extends TomcatBaseTest {
     
     /**
      * Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=48839
-     * with BIO
      */
     @Test
-    public void testBug48839BIO() {
+    public void testBug48839() {
         
         Bug48839Client client = new Bug48839Client();
         client.setPort(getPort());
         
-        // BIO test
-        client.doRequest(false);
+        client.doRequest();
         assertTrue(client.isResponse200());
         assertTrue(client.isResponseBodyOK());
     }
 
     
     /**
-     * Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=48839
-     * with NIO
-     */
-    @Test
-    public void testBug48839NIO() {
-        
-        Bug48839Client client = new Bug48839Client();
-        client.setPort(getPort());
-        
-        // NIO test
-        client.doRequest(true);
-        assertTrue(client.isResponse200());
-        assertTrue(client.isResponseBodyOK());
-    }
-
-    /**
      * Bug 48839 test client.
      */
     private class Bug48839Client extends SimpleHttpClient {
                 
-        private Exception doRequest(boolean useNio) {
+        private Exception doRequest() {
         
             Tomcat tomcat = getTomcatInstance();
             
-            if (useNio) {
-                Connector connector = 
-                    new Connector("org.apache.coyote.http11.Http11NioProtocol");
-                connector.setPort(getPort());
-                tomcat.getService().addConnector(connector);
-                tomcat.setConnector(connector);
-            }
-            
             Context root = tomcat.addContext("", TEMP_DIR);
             Tomcat.addServlet(root, "Bug48839", new Bug48839Servlet());
             root.addServletMapping("/test", "Bug48839");
-- 
2.11.0