tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1187806 [4/5] - in /tomcat/trunk/test: javax/el/ javax/servlet/jsp/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/catalina/deploy/ org/apache/catalina/filters/ org/apache/catalina/ha...
Date Sat, 22 Oct 2011 21:23:12 GMT
Modified: tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java (original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java Sat Oct 22 21:23:07 2011
@@ -31,7 +31,7 @@ public class SimpleAjpClient {
 
     private static final int AJP_PACKET_SIZE = 8192;
     private static final byte[] AJP_CPING;
-   
+
     static {
         TesterAjpMessage ajpCping = new TesterAjpMessage(16);
         ajpCping.reset();
@@ -45,19 +45,19 @@ public class SimpleAjpClient {
     private String host = "localhost";
     private int port = -1;
     private Socket socket = null;
-    
+
     public void setPort(int port) {
         this.port = port;
     }
-    
+
     public int getPort() {
         return port;
     }
-    
+
     public void connect() throws IOException {
         socket = SocketFactory.getDefault().createSocket(host, port);
     }
-    
+
     public void disconnect() throws IOException {
         socket.close();
         socket = null;
@@ -69,17 +69,17 @@ public class SimpleAjpClient {
     public TesterAjpMessage createForwardMessage(String url) {
         TesterAjpMessage message = new TesterAjpMessage(AJP_PACKET_SIZE);
         message.reset();
-        
+
         // Set the header bytes
         message.getBuffer()[0] = 0x12;
         message.getBuffer()[1] = 0x34;
-        
+
         // Code 2 for forward request
         message.appendByte(Constants.JK_AJP13_FORWARD_REQUEST);
 
         // HTTP method, GET = 2
         message.appendByte(0x02);
-        
+
         // Protocol
         message.appendString("http");
 
@@ -91,19 +91,19 @@ public class SimpleAjpClient {
 
         // Remote host
         message.appendString("client.dev.local");
-        
+
         // Server name
         message.appendString(host);
-        
+
         // Port
         message.appendInt(port);
 
         // Is ssl
         message.appendByte(0x00);
-        
+
         // No other headers or attributes
         message.appendInt(0);
-        
+
         // Terminator
         message.appendByte(0xFF);
 
@@ -165,7 +165,7 @@ public class SimpleAjpClient {
             return message;
         }
     }
-    
+
     protected boolean read(InputStream is, byte[] buf, int pos, int n)
         throws IOException {
 

Modified: tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java (original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java Sat Oct 22 21:23:07 2011
@@ -34,7 +34,7 @@ public class TestAbstractAjpProcessor ex
          */
         // Has a protocol been specified
         String protocol = System.getProperty("tomcat.test.protocol");
-        
+
         // Use BIO by default
         if (protocol == null) {
             protocol = "org.apache.coyote.ajp.AjpProtocol";
@@ -45,7 +45,7 @@ public class TestAbstractAjpProcessor ex
         } else {
             protocol = "org.apache.coyote.ajp.AjpProtocol";
         }
-        
+
         return protocol;
     }
 
@@ -56,17 +56,17 @@ public class TestAbstractAjpProcessor ex
         tomcat.start();
 
         // Must have a real docBase - just use temp
-        org.apache.catalina.Context ctx = 
+        org.apache.catalina.Context ctx =
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
         Tomcat.addServlet(ctx, "helloWorld", new HelloWorldServlet());
         ctx.addServletMapping("/", "helloWorld");
 
         SimpleAjpClient ajpClient = new SimpleAjpClient();
-        
+
         ajpClient.setPort(getPort());
-        
+
         ajpClient.connect();
-        
+
         validateCpong(ajpClient.cping());
 
         TesterAjpMessage forwardMessage = ajpClient.createForwardMessage("/");
@@ -75,14 +75,14 @@ public class TestAbstractAjpProcessor ex
         for (int i = 0; i < 2; i++) {
             TesterAjpMessage responseHeaders = ajpClient.sendMessage(forwardMessage);
             // Expect 3 packets: headers, body, end
-            validateResponseHeaders(responseHeaders, 200);        
+            validateResponseHeaders(responseHeaders, 200);
             TesterAjpMessage responseBody = ajpClient.readMessage();
             validateResponseBody(responseBody, HelloWorldServlet.RESPONSE_TEXT);
             validateResponseEnd(ajpClient.readMessage(), true);
-            
+
             // Give connections plenty of time to time out
             Thread.sleep(2000);
-            
+
             // Double check the connection is still open
             validateCpong(ajpClient.cping());
         }
@@ -99,19 +99,19 @@ public class TestAbstractAjpProcessor ex
         // First two bytes should always be AB
         assertEquals((byte) 'A', message.buf[0]);
         assertEquals((byte) 'B', message.buf[1]);
-        
+
         // Set the start position and read the length
         message.processHeader(false);
-        
+
         // Check the length
         assertTrue(message.len > 0);
-        
+
         // Should be a header message
         assertEquals(0x04, message.readByte());
-        
+
         // Check status
         assertEquals(expectedStatus, message.readInt());
-        
+
         // Read the status message
         message.readString();
 
@@ -134,10 +134,10 @@ public class TestAbstractAjpProcessor ex
             String expectedBody) throws Exception {
         assertEquals((byte) 'A', message.buf[0]);
         assertEquals((byte) 'B', message.buf[1]);
-        
+
         // Set the start position and read the length
         message.processHeader(false);
-        
+
         // Should be a body chunk message
         assertEquals(0x03, message.readByte());
 
@@ -154,7 +154,7 @@ public class TestAbstractAjpProcessor ex
         assertEquals((byte) 'B', message.buf[1]);
 
         message.processHeader(false);
-        
+
         // Should be an end body message
         assertEquals(0x05, message.readByte());
 

Modified: tomcat/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java (original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java Sat Oct 22 21:23:07 2011
@@ -27,7 +27,7 @@ public class TesterAjpMessage extends Aj
     public TesterAjpMessage(int packetSize) {
         super(packetSize);
     }
-    
+
     public byte readByte() {
         return buf[pos++];
     }
@@ -42,10 +42,10 @@ public class TesterAjpMessage extends Aj
         int len = readInt();
         return readString(len);
     }
-    
+
     public String readString(int len) {
         StringBuilder buffer = new StringBuilder(len);
-        
+
         for (int i = 0; i < len; i++) {
             char c = (char) buf[pos++];
             buffer.append(c);
@@ -79,5 +79,5 @@ public class TesterAjpMessage extends Aj
         buf[3] = (byte) (dLen & 0xFF);
     }
 
-    
+
 }

Modified: tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java Sat Oct 22 21:23:07 2011
@@ -36,13 +36,13 @@ public class TestAbstractHttp11Processor
     @Test
     public void testWithTEVoid() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        
+
         // Use the normal Tomcat ROOT context
         File root = new File("test/webapp-3.0");
         tomcat.addWebapp("", root.getAbsolutePath());
-        
+
         tomcat.start();
-        
+
         String request =
             "POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
             "Host: any" + SimpleHttpClient.CRLF +
@@ -65,13 +65,13 @@ public class TestAbstractHttp11Processor
     @Test
     public void testWithTEBuffered() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        
+
         // Use the normal Tomcat ROOT context
         File root = new File("test/webapp-3.0");
         tomcat.addWebapp("", root.getAbsolutePath());
-        
+
         tomcat.start();
-        
+
         String request =
             "POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
             "Host: any" + SimpleHttpClient.CRLF +
@@ -95,13 +95,13 @@ public class TestAbstractHttp11Processor
     @Test
     public void testWithTEIdentity() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        
+
         // Use the normal Tomcat ROOT context
         File root = new File("test/webapp-3.0");
         tomcat.addWebapp("", root.getAbsolutePath());
-        
+
         tomcat.start();
-        
+
         String request =
             "POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
             "Host: any" + SimpleHttpClient.CRLF +
@@ -127,13 +127,13 @@ public class TestAbstractHttp11Processor
     @Test
     public void testWithTESavedRequest() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        
+
         // Use the normal Tomcat ROOT context
         File root = new File("test/webapp-3.0");
         tomcat.addWebapp("", root.getAbsolutePath());
-        
+
         tomcat.start();
-        
+
         String request =
             "POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
             "Host: any" + SimpleHttpClient.CRLF +
@@ -157,13 +157,13 @@ public class TestAbstractHttp11Processor
     @Test
     public void testWithTEUnsupported() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        
+
         // Use the normal Tomcat ROOT context
         File root = new File("test/webapp-3.0");
         tomcat.addWebapp("", root.getAbsolutePath());
-        
+
         tomcat.start();
-        
+
         String request =
             "POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
             "Host: any" + SimpleHttpClient.CRLF +
@@ -187,15 +187,15 @@ public class TestAbstractHttp11Processor
     @Test
     public void testPipelining() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        
+
         // Must have a real docBase - just use temp
         Context ctxt = tomcat.addContext("",
                 System.getProperty("java.io.tmpdir"));
-        
+
         // Add protected servlet
         Tomcat.addServlet(ctxt, "TesterServlet", new TesterServlet());
         ctxt.addServletMapping("/foo", "TesterServlet");
-        
+
         tomcat.start();
 
         String requestPart1 =
@@ -226,17 +226,17 @@ public class TestAbstractHttp11Processor
         };
         Thread t = new Thread(send);
         t.start();
-        
+
         // Sleep for 1500 ms which should mean the all of request 1 has been
         // sent and half of request 2
         Thread.sleep(1500);
-        
+
         // Now read the first response
         client.readResponse(true);
         assertFalse(client.isResponse50x());
         assertTrue(client.isResponse200());
         assertEquals("OK", client.getResponseBody());
-        
+
         // Read the second response. No need to sleep, read will block until
         // there is data to process
         client.readResponse(true);
@@ -244,7 +244,7 @@ public class TestAbstractHttp11Processor
         assertTrue(client.isResponse200());
         assertEquals("OK", client.getResponseBody());
     }
-    
+
     private static final class Client extends SimpleHttpClient {
         @Override
         public boolean isResponseBodyOK() {

Modified: tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java Sat Oct 22 21:23:07 2011
@@ -45,7 +45,7 @@ public class TestGzipOutputFilter {
      * to GZIPOutputStream and close it (to force flushing) 6. Compare the size
      * of the two arrays, they should be close (instead of one being much
      * shorter than the other one)
-     * 
+     *
      * @throws Exception
      */
     @Test

Modified: tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java Sat Oct 22 21:23:07 2011
@@ -37,31 +37,31 @@ import org.apache.catalina.startup.Tomca
 import org.apache.catalina.startup.TomcatBaseTest;
 
 public class TestInternalInputBuffer extends TomcatBaseTest {
-    
+
     /**
      * Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=48839
      */
     @Test
     public void testBug48839() {
-        
+
         Bug48839Client client = new Bug48839Client();
         client.setPort(getPort());
-        
+
         client.doRequest();
         assertTrue(client.isResponse200());
         assertTrue(client.isResponseBodyOK());
     }
 
-    
+
     /**
      * Bug 48839 test client.
      */
     private class Bug48839Client extends SimpleHttpClient {
-                
+
         private Exception doRequest() {
-        
+
             Tomcat tomcat = getTomcatInstance();
-            
+
             Context root = tomcat.addContext("", TEMP_DIR);
             Tomcat.addServlet(root, "Bug48839", new Bug48839Servlet());
             root.addServletMapping("/test", "Bug48839");
@@ -71,7 +71,7 @@ public class TestInternalInputBuffer ext
 
                 // Open connection
                 connect();
-                
+
                 String[] request = new String[1];
                 request[0] =
                     "GET http://localhost:8080/test HTTP/1.1" + CRLF +
@@ -79,10 +79,10 @@ public class TestInternalInputBuffer ext
                     "\tefgh" + CRLF +
                     "Connection: close" + CRLF +
                     CRLF;
-                
+
                 setRequest(request);
                 processRequest(); // blocks until response has been read
-                
+
                 // Close the connection
                 disconnect();
             } catch (Exception e) {
@@ -101,11 +101,11 @@ public class TestInternalInputBuffer ext
             }
             return true;
         }
-        
+
     }
 
     private static class Bug48839Servlet extends HttpServlet {
-        
+
         private static final long serialVersionUID = 1L;
 
         /**
@@ -116,9 +116,9 @@ public class TestInternalInputBuffer ext
                 throws ServletException, IOException {
             // Just echo the header value back as plain text
             resp.setContentType("text/plain");
-            
+
             PrintWriter out = resp.getWriter();
-            
+
             Enumeration<String> values = req.getHeaders("X-Bug48839");
             while (values.hasMoreElements()) {
                 out.println(values.nextElement());
@@ -129,23 +129,23 @@ public class TestInternalInputBuffer ext
 
     @Test
     public void testBug51557NoColon() {
-        
+
         Bug51557Client client = new Bug51557Client("X-Bug51557NoColon");
         client.setPort(getPort());
-        
+
         client.doRequest();
         assertTrue(client.isResponse200());
         assertEquals("abcd", client.getResponseBody());
         assertTrue(client.isResponseBodyOK());
     }
 
-    
+
     @Test
     public void testBug51557Separators() throws Exception {
         char httpSeparators[] = new char[] {
                 '\t', ' ', '\"', '(', ')', ',', '/', ':', ';', '<',
                 '=', '>', '?', '@', '[', '\\', ']', '{', '}' };
-        
+
         for (char s : httpSeparators) {
             doTestBug51557Char(s);
             tearDown();
@@ -167,46 +167,46 @@ public class TestInternalInputBuffer ext
 
     @Test
     public void testBug51557Continuation() {
-        
+
         Bug51557Client client = new Bug51557Client("X-Bug=51557NoColon",
                 "foo" + SimpleHttpClient.CRLF + " bar");
         client.setPort(getPort());
-        
+
         client.doRequest();
         assertTrue(client.isResponse200());
         assertEquals("abcd", client.getResponseBody());
         assertTrue(client.isResponseBodyOK());
     }
 
-    
+
     @Test
     public void testBug51557BoundaryStart() {
-        
+
         Bug51557Client client = new Bug51557Client("=X-Bug51557",
                 "invalid");
         client.setPort(getPort());
-        
+
         client.doRequest();
         assertTrue(client.isResponse200());
         assertEquals("abcd", client.getResponseBody());
         assertTrue(client.isResponseBodyOK());
     }
 
-    
+
     @Test
     public void testBug51557BoundaryEnd() {
-        
+
         Bug51557Client client = new Bug51557Client("X-Bug51557=",
                 "invalid");
         client.setPort(getPort());
-        
+
         client.doRequest();
         assertTrue(client.isResponse200());
         assertEquals("abcd", client.getResponseBody());
         assertTrue(client.isResponseBodyOK());
     }
 
-    
+
     private void doTestBug51557Char(char s) {
         Bug51557Client client =
             new Bug51557Client("X-Bug" + s + "51557", "invalid");
@@ -217,7 +217,7 @@ public class TestInternalInputBuffer ext
         assertEquals("abcd", client.getResponseBody());
         assertTrue(client.isResponseBodyOK());
     }
-    
+
     /**
      * Bug 51557 test client.
      */
@@ -237,9 +237,9 @@ public class TestInternalInputBuffer ext
         }
 
         private Exception doRequest() {
-        
+
             Tomcat tomcat = getTomcatInstance();
-            
+
             Context root = tomcat.addContext("", TEMP_DIR);
             Tomcat.addServlet(root, "Bug51557",
                     new Bug51557Servlet(headerName));
@@ -250,7 +250,7 @@ public class TestInternalInputBuffer ext
 
                 // Open connection
                 connect();
-                
+
                 String[] request = new String[1];
                 request[0] =
                     "GET http://localhost:8080/test HTTP/1.1" + CRLF +
@@ -258,10 +258,10 @@ public class TestInternalInputBuffer ext
                     "X-Bug51557: abcd" + CRLF +
                     "Connection: close" + CRLF +
                     CRLF;
-                
+
                 setRequest(request);
                 processRequest(); // blocks until response has been read
-                
+
                 // Close the connection
                 disconnect();
             } catch (Exception e) {
@@ -280,11 +280,11 @@ public class TestInternalInputBuffer ext
             }
             return true;
         }
-        
+
     }
 
     private static class Bug51557Servlet extends HttpServlet {
-        
+
         private static final long serialVersionUID = 1L;
 
         private String invalidHeaderName;
@@ -305,13 +305,13 @@ public class TestInternalInputBuffer ext
                 throws ServletException, IOException {
             // Just echo the header value back as plain text
             resp.setContentType("text/plain");
-            
+
             PrintWriter out = resp.getWriter();
-            
+
             processHeaders(invalidHeaderName, req, out);
             processHeaders("X-Bug51557", req, out);
         }
-        
+
         private void processHeaders(String header, HttpServletRequest req,
                 PrintWriter out) {
             Enumeration<String> values = req.getHeaders(header);

Modified: tomcat/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java Sat Oct 22 21:23:07 2011
@@ -44,7 +44,7 @@ public class TestChunkedInputFilter exte
         Tomcat tomcat = getTomcatInstance();
 
         // Must have a real docBase - just use temp
-        Context ctx = 
+        Context ctx =
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
 
         Tomcat.addServlet(ctx, "servlet", new EchoHeaderServlet());
@@ -83,7 +83,7 @@ public class TestChunkedInputFilter exte
         Tomcat tomcat = getTomcatInstance();
 
         // Must have a real docBase - just use temp
-        Context ctx = 
+        Context ctx =
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
 
         Tomcat.addServlet(ctx, "servlet", new EchoHeaderServlet());
@@ -126,7 +126,7 @@ public class TestChunkedInputFilter exte
         Tomcat tomcat = getTomcatInstance();
 
         // Must have a real docBase - just use temp
-        Context ctx = 
+        Context ctx =
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
 
         Tomcat.addServlet(ctx, "servlet", new EchoHeaderServlet());
@@ -157,12 +157,12 @@ public class TestChunkedInputFilter exte
         client.processRequest();
         assertEquals("null7null", client.getResponseBody());
     }
-    
+
     private static class EchoHeaderServlet extends HttpServlet {
         private static final long serialVersionUID = 1L;
 
         @Override
-        protected void doPost(HttpServletRequest req, HttpServletResponse resp) 
+        protected void doPost(HttpServletRequest req, HttpServletResponse resp)
                 throws ServletException, IOException {
             resp.setContentType("text/plain");
             PrintWriter pw = resp.getWriter();
@@ -179,9 +179,9 @@ public class TestChunkedInputFilter exte
             while (is.read() > -1) {
                 count++;
             }
-            
+
             pw.write(Integer.valueOf(count).toString());
-            
+
             // Header should be visible now
             value = req.getHeader("x-trailer");
             if (value == null) {
@@ -190,7 +190,7 @@ public class TestChunkedInputFilter exte
             pw.write(value);
         }
     }
-    
+
     private static class TrailerClient extends SimpleHttpClient {
 
         @Override

Modified: tomcat/trunk/test/org/apache/el/TestELEvaluation.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELEvaluation.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELEvaluation.java Sat Oct 22 21:23:07 2011
@@ -68,7 +68,7 @@ public class TestELEvaluation {
 
 
     /**
-     * Test use nested ternary expressions. This was primarily an EL parser bug. 
+     * Test use nested ternary expressions. This was primarily an EL parser bug.
      */
     @Test
     public void testBug44994() {
@@ -102,7 +102,7 @@ public class TestELEvaluation {
 
         // '\' is only an escape character inside a StringLiteral
         assertEquals("\\\\", evaluateExpression("\\\\"));
-        
+
         /*
          * LiteralExpresions can only contain ${ or #{ if escaped with \
          * \ is not an escape character in any other circumstances including \\
@@ -124,7 +124,7 @@ public class TestELEvaluation {
     public void testParserStringLiteral() {
         // Inspired by work on bug 45451, comments from kkolinko on the dev
         // list and looking at the spec to find some edge cases
-        
+
         // The only characters that can be escaped inside a String literal
         // are \ " and '. # and $ are not escaped inside a String literal.
         assertEquals("\\", evaluateExpression("${'\\\\'}"));
@@ -170,7 +170,7 @@ public class TestELEvaluation {
         compareBoth("Null should compare equal to \"\"", 0, "", null);
         compareBoth("Null should be less than File()",-1, null, new File(""));
         compareBoth("Null should be less than Date()",-1, null, new Date());
-        compareBoth("Date(0) should be less than Date(1)",-1, new Date(0), new Date(1));        
+        compareBoth("Date(0) should be less than Date(1)",-1, new Date(0), new Date(1));
         try {
             compareBoth("Should not compare",0, new Date(), new File(""));
             fail("Expecting ClassCastException");
@@ -206,7 +206,7 @@ public class TestELEvaluation {
                 String.class);
         return (String) ve.getValue(ctx);
     }
-    
+
     public static class FMapper extends FunctionMapper {
 
         @Override
@@ -220,7 +220,7 @@ public class TestELEvaluation {
                     // Ignore
                 } catch (NoSuchMethodException e) {
                     // Ignore
-                } 
+                }
             }
             return null;
         }

Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Sat Oct 22 21:23:07 2011
@@ -41,12 +41,12 @@ public class TestELInJsp extends TomcatB
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/bug36923.jsp");
-        
+
         String result = res.toString();
         assertEcho(result, "00-${hello world}");
     }
@@ -58,12 +58,12 @@ public class TestELInJsp extends TomcatB
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/bug42565.jsp");
-        
+
         String result = res.toString();
         assertEcho(result, "00-false");
         assertEcho(result, "01-false");
@@ -87,16 +87,16 @@ public class TestELInJsp extends TomcatB
     public void testBug44994() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/bug44994.jsp");
-        
+
         String result = res.toString();
         assertEcho(result, "00-none");
         assertEcho(result, "01-one");
@@ -107,16 +107,16 @@ public class TestELInJsp extends TomcatB
     public void testBug45427() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/bug45nnn/bug45427.jsp");
-        
+
         String result = res.toString();
         // Warning: JSP attribute escaping != Java String escaping
         assertEcho(result, "00-hello world");
@@ -143,23 +143,23 @@ public class TestELInJsp extends TomcatB
     public void testBug45451() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/bug45nnn/bug45451a.jsp");
-        
+
         String result = res.toString();
         // Warning: JSP attribute escaping != Java String escaping
         assertEcho(result, "00-\\'hello world\\'");
         assertEcho(result, "01-\\'hello world\\'");
         assertEcho(result, "02-\\'hello world\\'");
         assertEcho(result, "03-\\'hello world\\'");
-        
+
         res = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45451b.jsp");
         result = res.toString();
         // Warning: JSP attribute escaping != Java String escaping
@@ -173,13 +173,13 @@ public class TestELInJsp extends TomcatB
         assertEcho(result, "05-${1+1}");
         assertEcho(result, "06-\\2");
         assertEcho(result, "07-\\${1+1}");
-        assertEcho(result, "08-\\\\2"); 
+        assertEcho(result, "08-\\\\2");
         assertEcho(result, "09-2");
         assertEcho(result, "10-#{1+1}");
         assertEcho(result, "11-\\2");
         assertEcho(result, "12-\\#{1+1}");
-        assertEcho(result, "13-\\\\2"); 
-        
+        assertEcho(result, "13-\\\\2");
+
         res = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45451c.jsp");
         result = res.toString();
         // Warning: JSP attribute escaping != Java String escaping
@@ -218,7 +218,7 @@ public class TestELInJsp extends TomcatB
         assertEcho(result, "11-\\#{1+1}");
         assertEcho(result, "12-\\\\#{1+1}");
         assertEcho(result, "13-\\\\\\#{1+1}");
-        
+
         res = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45451e.jsp");
         result = res.toString();
         // Warning: JSP attribute escaping != Java String escaping
@@ -230,9 +230,9 @@ public class TestELInJsp extends TomcatB
         assertEcho(result, "03-\\\\${1+1}");
         assertEcho(result, "04-2");
         assertEcho(result, "05-${1+1}");
-        assertEcho(result, "06-\\2");      
+        assertEcho(result, "06-\\2");
         assertEcho(result, "07-\\${1+1}");
-        assertEcho(result, "08-\\\\2"); 
+        assertEcho(result, "08-\\\\2");
         assertEcho(result, "09-#{1+1}");
         assertEcho(result, "10-\\#{1+1}");
         assertEcho(result, "11-\\#{1+1}");
@@ -244,16 +244,16 @@ public class TestELInJsp extends TomcatB
     public void testBug45511() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/bug45nnn/bug45511.jsp");
-        
+
         String result = res.toString();
         assertEcho(result, "00-true");
         assertEcho(result, "01-false");
@@ -263,11 +263,11 @@ public class TestELInJsp extends TomcatB
     public void testBug46596() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -280,16 +280,16 @@ public class TestELInJsp extends TomcatB
     public void testBug47413() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/bug47413.jsp");
-        
+
         String result = res.toString();
         assertEcho(result, "00-hello world");
         assertEcho(result, "01-hello world");
@@ -309,11 +309,11 @@ public class TestELInJsp extends TomcatB
     public void testBug48112() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -329,12 +329,12 @@ public class TestELInJsp extends TomcatB
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/bug49nnn/bug49555.jsp");
-        
+
         String result = res.toString();
         assertEcho(result, "00-" + TesterFunctions.Inner$Class.RETVAL);
     }
@@ -346,12 +346,12 @@ public class TestELInJsp extends TomcatB
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/bug51544.jsp");
-        
+
         String result = res.toString();
         assertEcho(result, "Empty list: true");
     }
@@ -360,11 +360,11 @@ public class TestELInJsp extends TomcatB
     public void testELMisc() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -394,11 +394,11 @@ public class TestELInJsp extends TomcatB
     public void testScriptingExpression() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -422,11 +422,11 @@ public class TestELInJsp extends TomcatB
     public void testELMethod() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -440,7 +440,7 @@ public class TestELInJsp extends TomcatB
         assertEcho(result, "05-Hello JUnit from Tomcat");
     }
 
-    // Assertion for text contained with <p></p>, e.g. printed by tags:echo 
+    // Assertion for text contained with <p></p>, e.g. printed by tags:echo
     private static void assertEcho(String result, String expected) {
         assertTrue(result.indexOf("<p>" + expected + "</p>") > 0);
     }

Modified: tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java Sat Oct 22 21:23:07 2011
@@ -46,32 +46,32 @@ public class TestMethodExpressionImpl {
         beanA.setName("A");
         context.getVariableMapper().setVariable("beanA",
                 factory.createValueExpression(beanA, TesterBeanA.class));
-        
+
         TesterBeanAA beanAA = new TesterBeanAA();
         beanAA.setName("AA");
         context.getVariableMapper().setVariable("beanAA",
                 factory.createValueExpression(beanAA, TesterBeanAA.class));
-        
+
         TesterBeanAAA beanAAA = new TesterBeanAAA();
         beanAAA.setName("AAA");
         context.getVariableMapper().setVariable("beanAAA",
                 factory.createValueExpression(beanAAA, TesterBeanAAA.class));
-        
-        TesterBeanB beanB = new TesterBeanB();        
+
+        TesterBeanB beanB = new TesterBeanB();
         beanB.setName("B");
         context.getVariableMapper().setVariable("beanB",
                 factory.createValueExpression(beanB, TesterBeanB.class));
-        
-        TesterBeanBB beanBB = new TesterBeanBB();        
+
+        TesterBeanBB beanBB = new TesterBeanBB();
         beanBB.setName("BB");
         context.getVariableMapper().setVariable("beanBB",
                 factory.createValueExpression(beanBB, TesterBeanBB.class));
-        
-        TesterBeanBBB beanBBB = new TesterBeanBBB();        
+
+        TesterBeanBBB beanBBB = new TesterBeanBBB();
         beanBBB.setName("BBB");
         context.getVariableMapper().setVariable("beanBBB",
                 factory.createValueExpression(beanBBB, TesterBeanBBB.class));
-        
+
         TesterBeanC beanC = new TesterBeanC();
         context.getVariableMapper().setVariable("beanC",
                 factory.createValueExpression(beanC, TesterBeanC.class));

Modified: tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java Sat Oct 22 21:23:07 2011
@@ -41,7 +41,7 @@ public class TestValueExpressionImpl {
     public void testGetValueReference() {
         ExpressionFactory factory = ExpressionFactory.newInstance();
         ELContext context = new ELContextImpl();
-        
+
         TesterBeanB beanB = new TesterBeanB();
         beanB.setName("Tomcat");
         ValueExpression var =
@@ -54,11 +54,11 @@ public class TestValueExpressionImpl {
         // First check the basics work
         String result = (String) ve.getValue(context);
         assertEquals("Tomcat", result);
-        
+
         // Now check the value reference
         ValueReference vr = ve.getValueReference(context);
         assertNotNull(vr);
-        
+
         assertEquals(beanB, vr.getBase());
         assertEquals("name", vr.getProperty());
     }
@@ -67,12 +67,12 @@ public class TestValueExpressionImpl {
     public void testBug49345() {
         ExpressionFactory factory = ExpressionFactory.newInstance();
         ELContext context = new ELContextImpl();
-        
+
         TesterBeanA beanA = new TesterBeanA();
         TesterBeanB beanB = new TesterBeanB();
         beanB.setName("Tomcat");
         beanA.setBean(beanB);
-        
+
         ValueExpression var =
             factory.createValueExpression(beanA, TesterBeanA.class);
         context.getVariableMapper().setVariable("beanA", var);
@@ -83,11 +83,11 @@ public class TestValueExpressionImpl {
         // First check the basics work
         String result = (String) ve.getValue(context);
         assertEquals("Tomcat", result);
-        
+
         // Now check the value reference
         ValueReference vr = ve.getValueReference(context);
         assertNotNull(vr);
-        
+
         assertEquals(beanB, vr.getBase());
         assertEquals("name", vr.getProperty());
     }
@@ -96,9 +96,9 @@ public class TestValueExpressionImpl {
     public void testBug50105() {
         ExpressionFactory factory = ExpressionFactory.newInstance();
         ELContext context = new ELContextImpl();
-        
+
         TesterEnum testEnum = TesterEnum.APPLE;
-        
+
         ValueExpression var =
             factory.createValueExpression(testEnum, TesterEnum.class);
         context.getVariableMapper().setVariable("testEnum", var);
@@ -108,7 +108,7 @@ public class TestValueExpressionImpl {
                 context, "${testEnum}", String.class);
         String result1 = (String) ve1.getValue(context);
         assertEquals("APPLE", result1);
-        
+
         ValueExpression ve2 = factory.createValueExpression(
                 context, "foo${testEnum}bar", String.class);
         String result2 = (String) ve2.getValue(context);
@@ -119,14 +119,14 @@ public class TestValueExpressionImpl {
     public void testBug51177ObjectMap() {
         ExpressionFactory factory = ExpressionFactory.newInstance();
         ELContext context = new ELContextImpl();
-        
+
         Object o1 = "String value";
         Object o2 = Integer.valueOf(32);
 
         Map<Object,Object> map = new HashMap<Object,Object>();
         map.put("key1", o1);
         map.put("key2", o2);
-        
+
         ValueExpression var =
             factory.createValueExpression(map, Map.class);
         context.getVariableMapper().setVariable("map", var);
@@ -135,7 +135,7 @@ public class TestValueExpressionImpl {
                 context, "${map.key1}", Object.class);
         ve1.setValue(context, o2);
         assertEquals(o2, ve1.getValue(context));
-        
+
         ValueExpression ve2 = factory.createValueExpression(
                 context, "${map.key2}", Object.class);
         ve2.setValue(context, o1);
@@ -146,14 +146,14 @@ public class TestValueExpressionImpl {
     public void testBug51177ObjectList() {
         ExpressionFactory factory = ExpressionFactory.newInstance();
         ELContext context = new ELContextImpl();
-        
+
         Object o1 = "String value";
         Object o2 = Integer.valueOf(32);
 
         List<Object> list = new ArrayList<Object>();
         list.add(0, o1);
         list.add(1, o2);
-        
+
         ValueExpression var =
             factory.createValueExpression(list, List.class);
         context.getVariableMapper().setVariable("list", var);
@@ -162,7 +162,7 @@ public class TestValueExpressionImpl {
                 context, "${list[0]}", Object.class);
         ve1.setValue(context, o2);
         assertEquals(o2, ve1.getValue(context));
-        
+
         ValueExpression ve2 = factory.createValueExpression(
                 context, "${list[1]}", Object.class);
         ve2.setValue(context, o1);
@@ -177,10 +177,10 @@ public class TestValueExpressionImpl {
     public void testBug51544Bean() throws Exception {
         ExpressionFactory factory = ExpressionFactory.newInstance();
         ELContext context = new ELContextImpl();
-        
+
         TesterBeanA beanA = new TesterBeanA();
         beanA.setValList(Collections.emptyList());
-        
+
         ValueExpression var =
             factory.createValueExpression(beanA, TesterBeanA.class);
         context.getVariableMapper().setVariable("beanA", var);
@@ -200,9 +200,9 @@ public class TestValueExpressionImpl {
     public void testBug51544Direct() throws Exception {
         ExpressionFactory factory = ExpressionFactory.newInstance();
         ELContext context = new ELContextImpl();
-        
+
         List<?> list = Collections.emptyList();
-        
+
         ValueExpression var =
             factory.createValueExpression(list, List.class);
         context.getVariableMapper().setVariable("list", var);

Modified: tomcat/trunk/test/org/apache/el/TesterBeanA.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TesterBeanA.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TesterBeanA.java (original)
+++ tomcat/trunk/test/org/apache/el/TesterBeanA.java Sat Oct 22 21:23:07 2011
@@ -40,11 +40,11 @@ public class TesterBeanA {
     public void setName(String name) {
         this.name = name;
     }
-    
+
     public long getValLong() {
         return valLong;
     }
-    
+
     public void setValLong(long valLong) {
         this.valLong = valLong;
     }

Modified: tomcat/trunk/test/org/apache/el/TesterBeanB.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TesterBeanB.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TesterBeanB.java (original)
+++ tomcat/trunk/test/org/apache/el/TesterBeanB.java Sat Oct 22 21:23:07 2011
@@ -27,7 +27,7 @@ public class TesterBeanB {
     public void setName(String name) {
         this.name = name;
     }
-    
+
     public String sayHello() {
         return "Hello from " + name;
     }

Modified: tomcat/trunk/test/org/apache/el/TesterEnum.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TesterEnum.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TesterEnum.java (original)
+++ tomcat/trunk/test/org/apache/el/TesterEnum.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@ package org.apache.el;
 
 public enum TesterEnum {
     APPLE, ORANGE;
-    
+
     @Override
     public String toString() {
         return "This is a " + this.name();

Modified: tomcat/trunk/test/org/apache/el/TesterFunctions.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TesterFunctions.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TesterFunctions.java (original)
+++ tomcat/trunk/test/org/apache/el/TesterFunctions.java Sat Oct 22 21:23:07 2011
@@ -23,7 +23,7 @@ public class TesterFunctions {
     }
 
     public static class Inner$Class {
-        
+
         public static final String RETVAL = "Return from bug49555";
         public static String bug49555() {
             return RETVAL;

Modified: tomcat/trunk/test/org/apache/el/lang/TestELSupport.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/lang/TestELSupport.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/lang/TestELSupport.java (original)
+++ tomcat/trunk/test/org/apache/el/lang/TestELSupport.java Sat Oct 22 21:23:07 2011
@@ -117,7 +117,7 @@ public class TestELSupport {
     private static void testIsSame(Object value) {
         assertEquals(value, ELSupport.coerceToNumber(value, value.getClass()));
     }
-    
+
     private static enum TestEnumA {
         VALA1,
         VALA2

Modified: tomcat/trunk/test/org/apache/el/parser/TestELParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/parser/TestELParser.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/parser/TestELParser.java (original)
+++ tomcat/trunk/test/org/apache/el/parser/TestELParser.java Sat Oct 22 21:23:07 2011
@@ -35,7 +35,7 @@ public class TestELParser {
     public void testBug49081() {
         // OP's report
         testExpression("#${1+1}", "#2");
-        
+
         // Variations on a theme
         testExpression("#", "#");
         testExpression("##", "##");
@@ -64,7 +64,7 @@ public class TestELParser {
     public void testJavaKeyWordSuffix() {
         ExpressionFactory factory = ExpressionFactory.newInstance();
         ELContext context = new ELContextImpl();
-        
+
         TesterBeanA beanA = new TesterBeanA();
         beanA.setInt("five");
         ValueExpression var =
@@ -86,7 +86,7 @@ public class TestELParser {
     public void testJavaKeyWordIdentifier() {
         ExpressionFactory factory = ExpressionFactory.newInstance();
         ELContext context = new ELContextImpl();
-        
+
         TesterBeanA beanA = new TesterBeanA();
         beanA.setInt("five");
         ValueExpression var =
@@ -107,7 +107,7 @@ public class TestELParser {
     private void testExpression(String expression, String expected) {
         ExpressionFactory factory = ExpressionFactory.newInstance();
         ELContext context = new ELContextImpl();
-        
+
         ValueExpression ve = factory.createValueExpression(
                 context, expression, String.class);
 

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java Sat Oct 22 21:23:07 2011
@@ -76,7 +76,7 @@ public class TestAttributeParser {
                 evalAttr("${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}", '\"'));
     }
 
-    
+
     /**
      * Test the quoting requirements of JSP attributes. This doesn't make use of
      * EL. See {@link #testBug45451()} for a test that combines JSP attribute
@@ -95,7 +95,7 @@ public class TestAttributeParser {
         assertEquals("hello world\"", evalAttr("hello world\"", '\"'));
         assertEquals("hello world'", evalAttr("hello world\\'", '\"'));
         assertEquals("hello world\"", evalAttr("hello world\\\"", '\"'));
-        
+
         assertEquals("hello 'world'", evalAttr("hello 'world'", '\''));
         assertEquals("hello 'world", evalAttr("hello 'world", '\''));
         assertEquals("hello world'", evalAttr("hello world'", '\''));
@@ -125,7 +125,7 @@ public class TestAttributeParser {
     public void testLiteral() {
         // Inspired by work on bug 45451, comments from kkolinko on the dev
         // list and looking at the spec to find some edge cases
-        
+
         // '\' is only an escape character inside a StringLiteral
         assertEquals("\\", evalAttr("${'\\\\\\\\'}", '\"'));
         assertEquals("\\", evalAttr("${\"\\\\\\\\\"}", '\"'));
@@ -140,7 +140,7 @@ public class TestAttributeParser {
         assertEquals("'\\", evalAttr("${\\\"'\\\\\\\\\\\"}", '\"'));
         assertEquals("\\\"", evalAttr("${\\\"\\\\\\\\\\\\\\\"\\\"}", '\"'));
         assertEquals("\"\\", evalAttr("${\\\"\\\\\\\"\\\\\\\\\\\"}", '\"'));
-        
+
         // Quoting <% and %>
         assertEquals("hello <% world", evalAttr("hello <\\% world", '\"'));
         assertEquals("hello %> world", evalAttr("hello %> world", '\"'));
@@ -170,7 +170,7 @@ public class TestAttributeParser {
     }
 
     private String evalAttr(String expression, char quote) {
-        
+
         ELContextImpl ctx = new ELContextImpl();
         ctx.setFunctionMapper(new FMapper());
         ExpressionFactoryImpl exprFactory = new ExpressionFactoryImpl();
@@ -180,7 +180,7 @@ public class TestAttributeParser {
                 String.class);
         return (String) ve.getValue(ctx);
     }
-    
+
     private String parseScriptExpression(String expression, char quote) {
         return AttributeParser.getUnquoted(expression, quote, false, false,
                 false);
@@ -199,7 +199,7 @@ public class TestAttributeParser {
                     // Ignore
                 } catch (NoSuchMethodException e) {
                     // Ignore
-                } 
+                }
             }
             return null;
         }

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java Sat Oct 22 21:23:07 2011
@@ -42,14 +42,14 @@ public class TestCompiler extends Tomcat
 
         ByteChunk res = new ByteChunk();
         Map<String,List<String>> headers = new HashMap<String,List<String>>();
-        
+
         getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49726a.jsp",
                 res, headers);
 
         // Check request completed
         String result = res.toString();
         assertEcho(result, "OK");
-        
+
         // Check content type
         assertTrue(headers.get("Content-Type").get(0).startsWith("text/html"));
     }
@@ -64,14 +64,14 @@ public class TestCompiler extends Tomcat
 
         ByteChunk res = new ByteChunk();
         Map<String,List<String>> headers = new HashMap<String,List<String>>();
-        
+
         getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49726b.jsp",
                 res, headers);
 
         // Check request completed
         String result = res.toString();
         assertEcho(result, "OK");
-        
+
         // Check content type
         assertTrue(headers.get("Content-Type").get(0).startsWith("text/plain"));
     }

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java Sat Oct 22 21:23:07 2011
@@ -46,16 +46,16 @@ public class TestGenerator extends Tomca
     public void testBug45015a() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/bug45nnn/bug45015a.jsp");
-        
+
         String result = res.toString();
         // Beware of the differences between escaping in JSP attributes and
         // in Java Strings
@@ -75,16 +75,16 @@ public class TestGenerator extends Tomca
     public void testBug45015b() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         int rc = getUrl("http://localhost:" + getPort() +
                 "/test/bug45nnn/bug45015b.jsp", new ByteChunk(), null);
-        
+
         assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
     }
 
@@ -92,16 +92,16 @@ public class TestGenerator extends Tomca
     public void testBug45015c() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         int rc = getUrl("http://localhost:" + getPort() +
                 "/test/bug45nnn/bug45015c.jsp", new ByteChunk(), null);
-        
+
         assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
     }
 
@@ -109,21 +109,21 @@ public class TestGenerator extends Tomca
     public void testBug48701Fail() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         StandardContext ctxt = (StandardContext) tomcat.addWebapp(null,
                 "/test", appDir.getAbsolutePath());
-        
+
         // This test needs the JSTL libraries
         File lib = new File("webapps/examples/WEB-INF/lib");
         ctxt.setAliases("/WEB-INF/lib=" + lib.getCanonicalPath());
-        
+
         tomcat.start();
 
         int rc = getUrl("http://localhost:" + getPort() +
                 "/test/bug48nnn/bug48701-fail.jsp", new ByteChunk(), null);
-        
+
         assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
     }
 
@@ -146,20 +146,20 @@ public class TestGenerator extends Tomca
     public void testBug48701TagVariableInfoNameFromAttribute() throws Exception {
         testBug48701("bug48nnn/bug48701-TVI-NFA.jsp");
     }
-    
+
     private void testBug48701(String jsp) throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/" + jsp);
-        
+
         String result = res.toString();
         assertEcho(result, "00-PASS");
     }
@@ -186,9 +186,9 @@ public class TestGenerator extends Tomca
             return super.doStartTag();
         }
 
-        
+
     }
-    
+
     public static class Bug48701TEI extends TagExtraInfo {
 
         @Override
@@ -200,7 +200,7 @@ public class TestGenerator extends Tomca
         }
 
     }
-    
+
     public static class Bean {
         private String time;
 
@@ -231,7 +231,7 @@ public class TestGenerator extends Tomca
 
         ByteChunk res = new ByteChunk();
         Map<String,List<String>> headers = new HashMap<String,List<String>>();
-        
+
         getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49799.jsp",
                 res, headers);
 

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Sat Oct 22 21:23:07 2011
@@ -33,18 +33,18 @@ public class TestJspConfig extends Tomca
     public void testServlet23NoEL() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-2.3");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/el-as-literal.jsp");
 
         String result = res.toString();
-        
+
         assertTrue(result.indexOf("<p>00-${'hello world'}</p>") > 0);
         assertTrue(result.indexOf("<p>01-#{'hello world'}</p>") > 0);
     }
@@ -53,18 +53,18 @@ public class TestJspConfig extends Tomca
     public void testServlet24NoEL() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-2.4");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/el-as-literal.jsp");
 
         String result = res.toString();
-        
+
         assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
         assertTrue(result.indexOf("<p>01-#{'hello world'}</p>") > 0);
     }
@@ -73,18 +73,18 @@ public class TestJspConfig extends Tomca
     public void testServlet25NoEL() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-2.5");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/el-as-literal.jsp");
 
         String result = res.toString();
-        
+
         assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
     }
 
@@ -92,18 +92,18 @@ public class TestJspConfig extends Tomca
     public void testServlet30NoEL() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/el-as-literal.jsp");
 
         String result = res.toString();
-        
+
         assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
     }
 

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java Sat Oct 22 21:23:07 2011
@@ -37,16 +37,16 @@ public class TestJspDocumentParser exten
     public void testBug47977() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         int rc = getUrl("http://localhost:" + getPort() +
                 "/test/bug47977.jspx", new ByteChunk(), null);
-        
+
         assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
     }
 
@@ -54,11 +54,11 @@ public class TestJspDocumentParser exten
     public void testBug48827() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         Exception e = null;

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Sat Oct 22 21:23:07 2011
@@ -40,16 +40,16 @@ public class TestParser extends TomcatBa
     public void testBug48627() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/bug48nnn/bug48627.jsp");
-        
+
         String result = res.toString();
         // Beware of the differences between escaping in JSP attributes and
         // in Java Strings
@@ -61,11 +61,11 @@ public class TestParser extends TomcatBa
     public void testBug48668a() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -110,7 +110,7 @@ public class TestParser extends TomcatBa
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -127,7 +127,7 @@ public class TestParser extends TomcatBa
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         int sc = getUrl("http://localhost:" + getPort() +
@@ -144,7 +144,7 @@ public class TestParser extends TomcatBa
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         int sc = getUrl("http://localhost:" + getPort() +
@@ -162,7 +162,7 @@ public class TestParser extends TomcatBa
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = new ByteChunk();
@@ -182,7 +182,7 @@ public class TestParser extends TomcatBa
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = new ByteChunk();
@@ -202,7 +202,7 @@ public class TestParser extends TomcatBa
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = new ByteChunk();
@@ -221,7 +221,7 @@ public class TestParser extends TomcatBa
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = new ByteChunk();
@@ -240,7 +240,7 @@ public class TestParser extends TomcatBa
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = new ByteChunk();
@@ -259,7 +259,7 @@ public class TestParser extends TomcatBa
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = new ByteChunk();
@@ -278,7 +278,7 @@ public class TestParser extends TomcatBa
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = new ByteChunk();

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java Sat Oct 22 21:23:07 2011
@@ -35,7 +35,7 @@ import org.apache.tomcat.util.buf.ByteCh
  * enabled by default.
  */
 public class TestParserNoStrictWhitespace extends TomcatBaseTest {
-    
+
     @Override
     public void setUp() throws Exception {
         System.setProperty(
@@ -48,16 +48,16 @@ public class TestParserNoStrictWhitespac
     public void testBug48627() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
                 "/test/bug48nnn/bug48627.jsp");
-        
+
         String result = res.toString();
         // Beware of the differences between escaping in JSP attributes and
         // in Java Strings
@@ -69,11 +69,11 @@ public class TestParserNoStrictWhitespac
     public void testBug48668a() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -118,7 +118,7 @@ public class TestParserNoStrictWhitespac
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -136,7 +136,7 @@ public class TestParserNoStrictWhitespac
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = new ByteChunk();
@@ -156,7 +156,7 @@ public class TestParserNoStrictWhitespac
         File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         int sc = getUrl("http://localhost:" + getPort() +

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java Sat Oct 22 21:23:07 2011
@@ -38,11 +38,11 @@ public class TestScriptingVariabler exte
     public void testBug42390() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         Exception e = null;
@@ -55,7 +55,7 @@ public class TestScriptingVariabler exte
         // Should not fail
         assertNull(e);
     }
-    
+
     public static class Bug48616aTag extends TagSupport {
         private static final long serialVersionUID = 1L;
     }
@@ -81,11 +81,11 @@ public class TestScriptingVariabler exte
     public void testBug48616() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         Exception e = null;
@@ -103,11 +103,11 @@ public class TestScriptingVariabler exte
     public void testBug48616b() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         Exception e = null;

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java Sat Oct 22 21:23:07 2011
@@ -39,16 +39,16 @@ public class TestValidator extends Tomca
     public void testBug47331() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         int rc = getUrl("http://localhost:" + getPort() +
                 "/test/bug47331.jsp", new ByteChunk(), null);
-        
+
         assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
     }
 
@@ -56,11 +56,11 @@ public class TestValidator extends Tomca
     public void testTldVersions23() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-2.3");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -81,11 +81,11 @@ public class TestValidator extends Tomca
     public void testTldVersions24() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-2.4");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -106,11 +106,11 @@ public class TestValidator extends Tomca
     public void testTldVersions25() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-2.5");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -131,11 +131,11 @@ public class TestValidator extends Tomca
     public void testTldVersions30() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = 
+        File appDir =
             new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
@@ -151,7 +151,7 @@ public class TestValidator extends Tomca
         assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
         assertTrue(result.indexOf("<p>06-hello world</p>") > 0);
     }
-    
+
     public static class Echo extends TagSupport {
 
         private static final long serialVersionUID = 1L;

Modified: tomcat/trunk/test/org/apache/naming/resources/TestDirContextURLStreamHandlerFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestDirContextURLStreamHandlerFactory.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TestDirContextURLStreamHandlerFactory.java (original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestDirContextURLStreamHandlerFactory.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,9 +30,9 @@ public class TestDirContextURLStreamHand
 
     @Test
     public void testUserSuppliedFactory() throws Exception {
-        
+
         URL url = null;
-        
+
         // Initially unknown
         try {
             url = new URL("foo://www.apache.org");
@@ -40,7 +40,7 @@ public class TestDirContextURLStreamHand
             // Ignore
         }
         assertNull(url);
-        
+
         // Set the factory
         URL.setURLStreamHandlerFactory(
                 DirContextURLStreamHandlerFactory.getInstance());
@@ -56,7 +56,7 @@ public class TestDirContextURLStreamHand
         // Register a user factory
         DirContextURLStreamHandlerFactory.addUserFactory(
                 new FooURLStreamHandlerFactory());
-        
+
         // Now it works
         try {
             url = new URL("foo://www.apache.org");
@@ -65,7 +65,7 @@ public class TestDirContextURLStreamHand
         }
         assertNotNull(url);
     }
-    
+
     public static class FooURLStreamHandlerFactory
             implements URLStreamHandlerFactory {
 

Modified: tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java (original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50,15 +50,15 @@ public class TestNamingContext extends T
     public void testLookupNonSingletonResource() throws Exception {
         doTestLookup(false);
     }
-    
+
     public void doTestLookup(boolean useSingletonResource) throws Exception {
         Tomcat tomcat = getTomcatInstance();
         tomcat.enableNaming();
-        
+
         // Must have a real docBase - just use temp
         StandardContext ctx = (StandardContext)
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
-        
+
         // Create the resource
         ContextResource cr = new ContextResource();
         cr.setName("list/foo");
@@ -66,7 +66,7 @@ public class TestNamingContext extends T
         cr.setProperty("factory", "org.apache.naming.resources.TesterFactory");
         cr.setSingleton(useSingletonResource);
         ctx.getNamingResources().addResource(cr);
-        
+
         // Map the test Servlet
         Bug49994Servlet bug49994Servlet = new Bug49994Servlet();
         Tomcat.addServlet(ctx, "bug49994Servlet", bug49994Servlet);
@@ -75,7 +75,7 @@ public class TestNamingContext extends T
         tomcat.start();
 
         ByteChunk bc = getUrl("http://localhost:" + getPort() + "/");
-        
+
         String expected;
         if (useSingletonResource) {
             expected = "EQUAL";
@@ -89,7 +89,7 @@ public class TestNamingContext extends T
     public static final class Bug49994Servlet extends HttpServlet {
 
         private static final long serialVersionUID = 1L;
-        
+
         @Override
         protected void doGet(HttpServletRequest req, HttpServletResponse resp)
                 throws ServletException, IOException {
@@ -116,18 +116,18 @@ public class TestNamingContext extends T
     public void testListBindings() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         tomcat.enableNaming();
-        
+
         // Must have a real docBase - just use temp
         StandardContext ctx = (StandardContext)
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
-        
+
         // Create the resource
         ContextResource cr = new ContextResource();
         cr.setName("list/foo");
         cr.setType("org.apache.naming.resources.TesterObject");
         cr.setProperty("factory", "org.apache.naming.resources.TesterFactory");
         ctx.getNamingResources().addResource(cr);
-        
+
         // Map the test Servlet
         Bug23950Servlet bug23950Servlet = new Bug23950Servlet();
         Tomcat.addServlet(ctx, "bug23950Servlet", bug23950Servlet);
@@ -138,11 +138,11 @@ public class TestNamingContext extends T
         ByteChunk bc = getUrl("http://localhost:" + getPort() + "/");
         assertEquals("org.apache.naming.resources.TesterObject", bc.toString());
     }
-    
+
     public static final class Bug23950Servlet extends HttpServlet {
 
         private static final long serialVersionUID = 1L;
-        
+
         @Override
         protected void doGet(HttpServletRequest req, HttpServletResponse resp)
                 throws ServletException, IOException {
@@ -168,11 +168,11 @@ public class TestNamingContext extends T
     public void testBeanFactory() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         tomcat.enableNaming();
-        
+
         // Must have a real docBase - just use temp
         StandardContext ctx = (StandardContext)
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
-        
+
         // Create the resource
         ContextResource cr = new ContextResource();
         cr.setName("bug50351");
@@ -180,7 +180,7 @@ public class TestNamingContext extends T
         cr.setProperty("factory", "org.apache.naming.factory.BeanFactory");
         cr.setProperty("foo", "value");
         ctx.getNamingResources().addResource(cr);
-        
+
         // Map the test Servlet
         Bug50351Servlet bug50351Servlet = new Bug50351Servlet();
         Tomcat.addServlet(ctx, "bug50351Servlet", bug50351Servlet);
@@ -195,7 +195,7 @@ public class TestNamingContext extends T
     public static final class Bug50351Servlet extends HttpServlet {
 
         private static final long serialVersionUID = 1L;
-        
+
         @Override
         protected void doGet(HttpServletRequest req, HttpServletResponse resp)
                 throws ServletException, IOException {
@@ -213,16 +213,16 @@ public class TestNamingContext extends T
             }
         }
     }
-    
+
     @Test
     public void testBug51744() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         tomcat.enableNaming();
-        
+
         // Must have a real docBase - just use temp
         StandardContext ctx = (StandardContext)
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
-        
+
         // Map the test Servlet
         Bug51744Servlet bug51744Servlet = new Bug51744Servlet();
         Tomcat.addServlet(ctx, "bug51744Servlet", bug51744Servlet);
@@ -264,7 +264,7 @@ public class TestNamingContext extends T
                     throw new ServletException(
                             "No error when one was expected");
                 }
-                
+
                 out.print(env1.getEnvironment().get("TestName"));
             } catch (NamingException ne) {
                 ne.printStackTrace(out);

Modified: tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java (original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,13 +39,13 @@ public class TestProxyDirContext extends
     @Test
     public void testLookupException() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        
+
         // Must have a real docBase - just use temp
         StandardContext ctx = (StandardContext)
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
         ctx.setCacheTTL(500);
         tomcat.start();
-        
+
         try {
             ctx.getResources().lookup("/WEB-INF/web.xml");
             fail();



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


Mime
View raw message