Author: markt
Date: Tue Mar 26 22:26:37 2013
New Revision: 1461349

URL: http://svn.apache.org/r1461349
Log:
Speed up test, reduce errors reported in logs
Modified:
    tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java

Modified: tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java?rev=1461349&r1=1461348&r2=1461349&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java Tue 
Mar 26 22:26:37 2013
@@ -19,6 +19,7 @@ package org.apache.catalina.connector;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.charset.MalformedInputException;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -71,8 +72,8 @@ public class TestInputBuffer extends Tom
                 null);
 
         if (expected == null) {
-            Assert.assertEquals(description,
-                    HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
+            Assert.assertEquals(description, HttpServletResponse.SC_OK, rc);
+            Assert.assertEquals(description, "FAILED", bc.toString());
         } else if (expected.length() == 0) {
             Assert.assertNull(description, bc.toString());
         } else {
@@ -103,13 +104,18 @@ public class TestInputBuffer extends Tom
             resp.setContentType("text/plain");
             Writer w = resp.getWriter();
 
-            // Copy one character at a time
-            int c = r.read();
-            while (c != -1) {
-                w.write(c);
-                c = r.read();
+            try {
+                // Copy one character at a time
+                int c = r.read();
+                while (c != -1) {
+                    w.write(c);
+                    c = r.read();
+                }
+                w.close();
+            } catch (MalformedInputException mie) {
+                resp.resetBuffer();
+                w.write("FAILED");
             }
-            w.close();
         }
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to