svn commit: r686403 - /velocity/engine/trunk/src/test/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java

[nb...@apache.org]

Author: nbubna
Date: Fri Aug 15 15:22:01 2008
New Revision: 686403

URL: http://svn.apache.org/viewvc?rev=686403&view=rev
Log:
VELOCITY-447 forgot to test uppercase properties, as order differs

Modified:
    velocity/engine/trunk/src/test/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java?rev=686403&r1=686402&r2=686403&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java Fri Aug 15 15:22:01 2008
@@ -63,6 +63,7 @@
         context = new VelocityContext();
         context.put("geta", new getGetgetisTool());
         context.put("getA", new GetgetisTool());
+        context.put("geta2", new get2getisTool());
         context.put("get_a", new getisTool());
         context.put("isA", new isTool());
     }
@@ -73,7 +74,7 @@
         context = null;
     }
 
-    public void testPropertyMethods()
+    public void testLowercasePropertyMethods()
     {
         assertEvalEquals("getfoo", "$geta.foo");
         assertEvalEquals("getFoo", "$getA.foo");
@@ -81,13 +82,21 @@
         assertEvalEquals("true", "$isA.foo");
     }
 
+    public void testUppercasePropertyMethods()
+    {
+        assertEvalEquals("getFoo", "$geta.Foo");
+        assertEvalEquals("getfoo", "$geta2.Foo");
+        assertEvalEquals("getFoo", "$getA.Foo");
+        assertEvalEquals("get(Foo)", "$get_a.Foo");
+        assertEvalEquals("true", "$isA.Foo");
+    }
+
 
     protected void assertEvalEquals(String expected, String template)
     {
         try
         {
             String result = evaluate(template);
-System.out.println("expected "+expected+" and got "+result);
             assertEquals(expected, result);
         }
         catch (Exception e)
@@ -117,7 +126,7 @@
     {
         public String get(String s)
         {
-            return "get(foo)";
+            return "get("+s+")";
         }
     }
 
@@ -137,6 +146,14 @@
         }
     }
 
+    public static class get2getisTool extends getisTool
+    {
+        public String getfoo()
+        {
+            return "getfoo";
+        }
+    }
+
 }