Extend to test deferred expressions. Need to use request scope attributes since page...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@948644 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java
index 27d8034..8026e28 100644 (file)
--- a/test/org/apache/el/TestELInJsp.java
+++ b/test/org/apache/el/TestELInJsp.java
@@ -385,6 +385,9 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "00-Hello JUnit from Tomcat");
         assertEcho(result, "01-Hello JUnit from Tomcat");
         assertEcho(result, "02-Hello JUnit from Tomcat");
+        assertEcho(result, "03-Hello JUnit from Tomcat");
+        assertEcho(result, "04-Hello JUnit from Tomcat");
+        assertEcho(result, "05-Hello JUnit from Tomcat");
     }
 
     // Assertion for text contained with <p></p>, e.g. printed by tags:echo 

diff --git a/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag b/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag
index 27530fa..ad701a7 100644 (file)
--- a/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag
+++ b/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag
@@ -13,6 +13,5 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
   See the License for the specific language governing permissions and\r
   limitations under the License.\r
---%>\r
-<%@ tag %><%@ attribute name="echo" deferredValue="true" %><%@\r
+--%><%@ tag %><%@ attribute name="echo" deferredValue="true" %><%@\r
 tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file

diff --git a/test/webapp-3.0/el-method.jsp b/test/webapp-3.0/el-method.jsp
index a7c9d62..cc930dc 100644 (file)
--- a/test/webapp-3.0/el-method.jsp
+++ b/test/webapp-3.0/el-method.jsp
@@ -25,11 +25,14 @@
     TesterBeanB beanB = new TesterBeanB();
     beanB.setName("Tomcat");
     beanA.setBean(beanB);
-    pageContext.setAttribute("testBeanA", beanA);
-    pageContext.setAttribute("testBeanB", beanB);
+    pageContext.setAttribute("testBeanA", beanA, PageContext.REQUEST_SCOPE);
+    pageContext.setAttribute("testBeanB", beanB, PageContext.REQUEST_SCOPE);
     %>
     <tags:echo echo="00-${testBeanA[\"bean\"].sayHello('JUnit')}" />
     <tags:echo echo="01-${testBeanA.bean.sayHello('JUnit')}" />
     <tags:echo echo="02-${testBeanB.sayHello('JUnit')}" />
+    <tags:echo-deferred echo="03-#{testBeanA[\"bean\"].sayHello('JUnit')}" />
+    <tags:echo-deferred echo="04-#{testBeanA.bean.sayHello('JUnit')}" />
+    <tags:echo-deferred echo="05-#{testBeanB.sayHello('JUnit')}" />
   </body>
 </html>
\ No newline at end of file