Author: markt
Date: Thu Sep 12 14:25:31 2013
New Revision: 1522594
URL: http://svn.apache.org/r1522594
Log:
Update unit tests to align with changes in part parsing without configuration
(now throws ISE)
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1522594&r1=1522593&r2=1522594&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Thu Sep
12 14:25:31 2013
@@ -672,9 +672,8 @@ public class TestStandardContext extends
// Make sure non-multipart works properly
client.doRequest("/regular", false, false);
- assertEquals("Incorrect response for GET request",
- "parts=0",
- client.getResponseBody());
+ // Servlet attempts to read parts which will trigger an ISE
+ assertTrue(client.isResponse500());
client.reset();
@@ -688,12 +687,11 @@ public class TestStandardContext extends
client.reset();
// Make casual multipart request to "regular" servlet w/o config
- // We expect that no parts will be available
+ // We expect an error
client.doRequest("/regular", false, true); // send multipart request
- assertEquals("Incorrect response for non-configured casual multipart
request",
- "parts=0", // multipart request should be ignored
- client.getResponseBody());
+ // Servlet attempts to read parts which will trigger an ISE
+ assertTrue(client.isResponse500());
client.reset();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
