tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1198564 - in /tomcat/tc7.0.x/trunk/test/org/apache/el: ./ lang/ parser/
Date Sun, 06 Nov 2011 21:21:24 GMT
Author: kkolinko
Date: Sun Nov  6 21:21:23 2011
New Revision: 1198564

URL: http://svn.apache.org/viewvc?rev=1198564&view=rev
Log:
Porting r1187806 - whitespace cleanup in /test

Modified:
    tomcat/tc7.0.x/trunk/test/org/apache/el/TestELEvaluation.java
    tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java
    tomcat/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java
    tomcat/tc7.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java
    tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanA.java
    tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanB.java
    tomcat/tc7.0.x/trunk/test/org/apache/el/TesterEnum.java
    tomcat/tc7.0.x/trunk/test/org/apache/el/TesterFunctions.java
    tomcat/tc7.0.x/trunk/test/org/apache/el/lang/TestELSupport.java
    tomcat/tc7.0.x/trunk/test/org/apache/el/parser/TestELParser.java

Modified: tomcat/tc7.0.x/trunk/test/org/apache/el/TestELEvaluation.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TestELEvaluation.java?rev=1198564&r1=1198563&r2=1198564&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TestELEvaluation.java Sun Nov  6 21:21:23 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/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java?rev=1198564&r1=1198563&r2=1198564&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java Sun Nov  6 21:21:23 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/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java?rev=1198564&r1=1198563&r2=1198564&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java Sun Nov  6 21:21:23
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/tc7.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java?rev=1198564&r1=1198563&r2=1198564&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java Sun Nov  6 21:21:23
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/tc7.0.x/trunk/test/org/apache/el/TesterBeanA.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanA.java?rev=1198564&r1=1198563&r2=1198564&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanA.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanA.java Sun Nov  6 21:21:23 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/tc7.0.x/trunk/test/org/apache/el/TesterBeanB.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanB.java?rev=1198564&r1=1198563&r2=1198564&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanB.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanB.java Sun Nov  6 21:21:23 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/tc7.0.x/trunk/test/org/apache/el/TesterEnum.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TesterEnum.java?rev=1198564&r1=1198563&r2=1198564&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TesterEnum.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TesterEnum.java Sun Nov  6 21:21:23 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/tc7.0.x/trunk/test/org/apache/el/TesterFunctions.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TesterFunctions.java?rev=1198564&r1=1198563&r2=1198564&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TesterFunctions.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TesterFunctions.java Sun Nov  6 21:21:23 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/tc7.0.x/trunk/test/org/apache/el/lang/TestELSupport.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/lang/TestELSupport.java?rev=1198564&r1=1198563&r2=1198564&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/lang/TestELSupport.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/lang/TestELSupport.java Sun Nov  6 21:21:23 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/tc7.0.x/trunk/test/org/apache/el/parser/TestELParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/parser/TestELParser.java?rev=1198564&r1=1198563&r2=1198564&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/parser/TestELParser.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/parser/TestELParser.java Sun Nov  6 21:21:23 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);
 



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


Mime
View raw message