Updated the tests because r920110 was reverted in r920608.

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

diff --git a/test/org/apache/jasper/compiler/TestValidator.java b/test/org/apache/jasper/compiler/TestValidator.java
index dd1d08d..2040bd0 100644 (file)
--- a/test/org/apache/jasper/compiler/TestValidator.java
+++ b/test/org/apache/jasper/compiler/TestValidator.java
@@ -91,9 +91,9 @@ public class TestValidator extends TomcatBaseTest {
 
         String result = res.toString();
 
-        assertTrue(result.indexOf("<p>${'00-hello world'}</p>") > 0);
+        assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
         assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
-        assertTrue(result.indexOf("<p>${'02-hello world'}</p>") > 0);
+        assertTrue(result.indexOf("<p>02-hello world</p>") > 0);
         assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
         assertTrue(result.indexOf("<p>04-hello world</p>") > 0);
         assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
@@ -116,9 +116,9 @@ public class TestValidator extends TomcatBaseTest {
 
         String result = res.toString();
 
-        assertTrue(result.indexOf("<p>${'00-hello world'}</p>") > 0);
+        assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
         assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
-        assertTrue(result.indexOf("<p>${'02-hello world'}</p>") > 0);
+        assertTrue(result.indexOf("<p>02-hello world</p>") > 0);
         assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
         assertTrue(result.indexOf("<p>04-hello world</p>") > 0);
         assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
@@ -141,9 +141,9 @@ public class TestValidator extends TomcatBaseTest {
 
         String result = res.toString();
 
-        assertTrue(result.indexOf("<p>${'00-hello world'}</p>") > 0);
+        assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
         assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
-        assertTrue(result.indexOf("<p>${'02-hello world'}</p>") > 0);
+        assertTrue(result.indexOf("<p>02-hello world</p>") > 0);
         assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
         assertTrue(result.indexOf("<p>04-hello world</p>") > 0);
         assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);

diff --git a/test/webapp-2.4/WEB-INF/tags11.tld b/test/webapp-2.4/WEB-INF/tags11.tld
index b78be03..3c7ae98 100644 (file)
--- a/test/webapp-2.4/WEB-INF/tags11.tld
+++ b/test/webapp-2.4/WEB-INF/tags11.tld
@@ -30,6 +30,7 @@
     <attribute>
       <name>echo</name>
       <required>yes</required>
+      <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 

diff --git a/test/webapp-2.4/WEB-INF/tags12.tld b/test/webapp-2.4/WEB-INF/tags12.tld
index 55908d9..533235b 100644 (file)
--- a/test/webapp-2.4/WEB-INF/tags12.tld
+++ b/test/webapp-2.4/WEB-INF/tags12.tld
@@ -25,11 +25,12 @@
 
   <tag>
     <name>Echo</name>
-    <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+    <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
     <body-content>empty</body-content>
     <attribute>
       <name>echo</name>
       <required>yes</required>
+      <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 

diff --git a/test/webapp-2.5/WEB-INF/tags11.tld b/test/webapp-2.5/WEB-INF/tags11.tld
index b78be03..3c7ae98 100644 (file)
--- a/test/webapp-2.5/WEB-INF/tags11.tld
+++ b/test/webapp-2.5/WEB-INF/tags11.tld
@@ -30,6 +30,7 @@
     <attribute>
       <name>echo</name>
       <required>yes</required>
+      <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 

diff --git a/test/webapp-2.5/WEB-INF/tags12.tld b/test/webapp-2.5/WEB-INF/tags12.tld
index 55908d9..533235b 100644 (file)
--- a/test/webapp-2.5/WEB-INF/tags12.tld
+++ b/test/webapp-2.5/WEB-INF/tags12.tld
@@ -25,11 +25,12 @@
 
   <tag>
     <name>Echo</name>
-    <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+    <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
     <body-content>empty</body-content>
     <attribute>
       <name>echo</name>
       <required>yes</required>
+      <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 

diff --git a/test/webapp-3.0/WEB-INF/tags11.tld b/test/webapp-3.0/WEB-INF/tags11.tld
index b78be03..3c7ae98 100644 (file)
--- a/test/webapp-3.0/WEB-INF/tags11.tld
+++ b/test/webapp-3.0/WEB-INF/tags11.tld
@@ -30,6 +30,7 @@
     <attribute>
       <name>echo</name>
       <required>yes</required>
+      <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 

diff --git a/test/webapp-3.0/WEB-INF/tags12.tld b/test/webapp-3.0/WEB-INF/tags12.tld
index 55908d9..533235b 100644 (file)
--- a/test/webapp-3.0/WEB-INF/tags12.tld
+++ b/test/webapp-3.0/WEB-INF/tags12.tld
@@ -25,11 +25,12 @@
 
   <tag>
     <name>Echo</name>
-    <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+    <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
     <body-content>empty</body-content>
     <attribute>
       <name>echo</name>
       <required>yes</required>
+      <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>