svn commit: r960711 - in /tomcat/trunk/test/org/apache/el/parser: TestELParser.java TesterBeanA.java

[markt]

Author: markt
Date: Mon Jul  5 21:44:29 2010
New Revision: 960711

URL: http://svn.apache.org/viewvc?rev=960711&view=rev
Log:
Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=49217

Added:
    tomcat/trunk/test/org/apache/el/parser/TesterBeanA.java   (with props)
Modified:
    tomcat/trunk/test/org/apache/el/parser/TestELParser.java

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=960711&r1=960710&r2=960711&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/parser/TestELParser.java (original)
+++ tomcat/trunk/test/org/apache/el/parser/TestELParser.java Mon Jul  5 
21:44:29 2010
@@ -18,6 +18,7 @@
 package org.apache.el.parser;
 
 import javax.el.ELContext;
+import javax.el.ELException;
 import javax.el.ExpressionFactory;
 import javax.el.ValueExpression;
 
@@ -53,7 +54,49 @@ public class TestELParser extends TestCa
         testExpression("#$#{1+1}", "#$2");
         testExpression("$#{1+1}", "$2");
         testExpression("$#${1+1}", "$#2");
-}
+    }
+    
+    public void testJavaKeyWordSuffix() {
+        ExpressionFactory factory = ExpressionFactory.newInstance();
+        ELContext context = new ELContextImpl();
+        
+        TesterBeanA beanA = new TesterBeanA();
+        beanA.setInt("five");
+        ValueExpression var =
+            factory.createValueExpression(beanA, TesterBeanA.class);
+        context.getVariableMapper().setVariable("beanA", var);
+
+        // Should fail
+        Exception e = null;
+        try {
+            factory.createValueExpression(context, "${beanA.int}",
+                    String.class);
+        } catch (ELException ele) {
+            e = ele;
+        }
+        assertNotNull(e);
+    }
+
+    public void testJavaKeyWordIdentifier() {
+        ExpressionFactory factory = ExpressionFactory.newInstance();
+        ELContext context = new ELContextImpl();
+        
+        TesterBeanA beanA = new TesterBeanA();
+        beanA.setInt("five");
+        ValueExpression var =
+            factory.createValueExpression(beanA, TesterBeanA.class);
+        context.getVariableMapper().setVariable("this", var);
+
+        // Should fail
+        Exception e = null;
+        try {
+            factory.createValueExpression(context, "${this}", String.class);
+        } catch (ELException ele) {
+            e = ele;
+        }
+        assertNotNull(e);
+    }
+
 
     private void testExpression(String expression, String expected) {
         ExpressionFactory factory = ExpressionFactory.newInstance();

Added: tomcat/trunk/test/org/apache/el/parser/TesterBeanA.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/parser/TesterBeanA.java?rev=960711&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/el/parser/TesterBeanA.java (added)
+++ tomcat/trunk/test/org/apache/el/parser/TesterBeanA.java Mon Jul  5 21:44:29 
2010
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.el.parser;
+
+public class TesterBeanA {
+    private String keywordInt;
+
+    public String getInt() {
+        return keywordInt;
+    }
+
+    public void setInt(String keywordInt) {
+        this.keywordInt = keywordInt;
+    }
+}

Propchange: tomcat/trunk/test/org/apache/el/parser/TesterBeanA.java
------------------------------------------------------------------------------
    svn:eol-style = native



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