Author: remm
Date: Thu Mar 20 15:51:58 2014
New Revision: 1579672
URL: http://svn.apache.org/r1579672
Log:
Handle possible status line i18n in tests.
Modified:
tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
Modified: tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1579672&r1=1579671&r2=1579672&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Thu Mar
20 15:51:58 2014
@@ -340,7 +340,7 @@ public class TestCometProcessor extends
// Failure at any later stage and the response headers (including
// the 200 response code will already have been sent to the client
if (SimpleCometServlet.FAIL_ON_BEGIN.equals(initParam)) {
- assertEquals("HTTP/1.1 500 Internal Server Error",
response[0]);
+ assertEquals("500", getStatusCode(response[0]));
alv.validateAccessLog(1, 500, 0, 1000);
} else {
assertEquals("HTTP/1.1 200 OK", response[0]);
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1579672&r1=1579671&r2=1579672&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Thu Mar
20 15:51:58 2014
@@ -400,6 +400,14 @@ public abstract class TomcatBaseTest ext
return rc;
}
+ protected static String getStatusCode(String statusLine) {
+ if (statusLine == null || statusLine.length() < 12) {
+ return statusLine;
+ } else {
+ return statusLine.substring(9, 12);
+ }
+ }
+
private static class TomcatWithFastSessionIDs extends Tomcat {
@Override
Modified: tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java?rev=1579672&r1=1579671&r2=1579672&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Thu Mar
20 15:51:58 2014
@@ -180,8 +180,7 @@ public class TestUpgrade extends TomcatB
String status = reader.readLine();
Assert.assertNotNull(status);
- Assert.assertEquals("HTTP/1.1 101 Switching Protocols",
- status.substring(0, 32));
+ Assert.assertEquals("101", getStatusCode(status));
// Skip the remaining response headers
String line = reader.readLine();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
