Author: kkolinko
Date: Tue Mar 9 02:58:50 2010
New Revision: 920632
URL: http://svn.apache.org/viewvc?rev=920632&view=rev
Log:
Updated the tests because r920110 was reverted in r920608.
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
tomcat/trunk/test/webapp-2.4/WEB-INF/tags11.tld
tomcat/trunk/test/webapp-2.4/WEB-INF/tags12.tld
tomcat/trunk/test/webapp-2.5/WEB-INF/tags11.tld
tomcat/trunk/test/webapp-2.5/WEB-INF/tags12.tld
tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld
tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java?rev=920632&r1=920631&r2=920632&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java Tue Mar 9
02:58:50 2010
@@ -91,9 +91,9 @@ public class TestValidator extends Tomca
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 Tomca
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 Tomca
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);
Modified: tomcat/trunk/test/webapp-2.4/WEB-INF/tags11.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.4/WEB-INF/tags11.tld?rev=920632&r1=920631&r2=920632&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.4/WEB-INF/tags11.tld (original)
+++ tomcat/trunk/test/webapp-2.4/WEB-INF/tags11.tld Tue Mar 9 02:58:50 2010
@@ -30,6 +30,7 @@
<attribute>
<name>echo</name>
<required>yes</required>
+ <rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
Modified: tomcat/trunk/test/webapp-2.4/WEB-INF/tags12.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.4/WEB-INF/tags12.tld?rev=920632&r1=920631&r2=920632&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.4/WEB-INF/tags12.tld (original)
+++ tomcat/trunk/test/webapp-2.4/WEB-INF/tags12.tld Tue Mar 9 02:58:50 2010
@@ -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>
Modified: tomcat/trunk/test/webapp-2.5/WEB-INF/tags11.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.5/WEB-INF/tags11.tld?rev=920632&r1=920631&r2=920632&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.5/WEB-INF/tags11.tld (original)
+++ tomcat/trunk/test/webapp-2.5/WEB-INF/tags11.tld Tue Mar 9 02:58:50 2010
@@ -30,6 +30,7 @@
<attribute>
<name>echo</name>
<required>yes</required>
+ <rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
Modified: tomcat/trunk/test/webapp-2.5/WEB-INF/tags12.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.5/WEB-INF/tags12.tld?rev=920632&r1=920631&r2=920632&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.5/WEB-INF/tags12.tld (original)
+++ tomcat/trunk/test/webapp-2.5/WEB-INF/tags12.tld Tue Mar 9 02:58:50 2010
@@ -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>
Modified: tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld?rev=920632&r1=920631&r2=920632&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld Tue Mar 9 02:58:50 2010
@@ -30,6 +30,7 @@
<attribute>
<name>echo</name>
<required>yes</required>
+ <rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
Modified: tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld?rev=920632&r1=920631&r2=920632&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld Tue Mar 9 02:58:50 2010
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
