The following diff removes a set of tests dealing with the 'locale'
attribute of HtmlTag, which was removed in revision 234386. The patch
just deletes the affected (no longer applicable) tests from the TestCase
and corresponding JSP.
To quickly run the test case in isolation before/after patching, use
maven cactus:single \
-Dtestcase=org.apache.struts.taglib.html.TestHtmlTag
(make sure you've deployed struts-config.xml from my previous post first).
L.
Index: src/test-cactus/org/apache/struts/taglib/html/TestHtmlTag.java
===================================================================
--- src/test-cactus/org/apache/struts/taglib/html/TestHtmlTag.java
(revision 289678)
+++ src/test-cactus/org/apache/struts/taglib/html/TestHtmlTag.java
(working copy)
@@ -1,5 +1,5 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -75,54 +75,6 @@
runMyTest("testHtml", "");
}
- public void testHtmlLocale1() throws Exception {
- runMyTest("testHtmlLocale1", "");
- }
-
- public void testHtmlLocale2() throws Exception {
- runMyTest("testHtmlLocale2", "");
- }
-
- public void testHtmlLocale3() throws Exception {
- runMyTest("testHtmlLocale3", "");
- }
-
- public void testHtmlLocale4() throws Exception {
- runMyTest("testHtmlLocale4", "");
- }
-
- public void testHtmlLocale5() throws Exception {
- runMyTest("testHtmlLocale5", "");
- }
-
- public void testHtmlLocale6() throws Exception {
- runMyTest("testHtmlLocale6", "");
- }
-
- public void testHtmlLocale_fr1() throws Exception {
- runMyTest("testHtmlLocale_fr1", "fr");
- }
-
- public void testHtmlLocale_fr2() throws Exception {
- runMyTest("testHtmlLocale_fr2", "fr");
- }
-
- public void testHtmlLocale_fr3() throws Exception {
- runMyTest("testHtmlLocale_fr3", "fr");
- }
-
- public void testHtmlLocale_fr4() throws Exception {
- runMyTest("testHtmlLocale_fr4", "fr");
- }
-
- public void testHtmlLocale_fr5() throws Exception {
- runMyTest("testHtmlLocale_fr5", "fr");
- }
-
- public void testHtmlLocale_fr6() throws Exception {
- runMyTest("testHtmlLocale_fr6", "fr");
- }
-
public void testHtmlXhtml1() throws Exception {
runMyTest("testHtmlXhtml1", "");
}
@@ -147,29 +99,4 @@
runMyTest("testHtmlXhtml6", "");
}
- public void testHtmlLocaleXhtml1() throws Exception {
- runMyTest("testHtmlLocaleXhtml1", "");
- }
-
- public void testHtmlLocaleXhtml2() throws Exception {
- runMyTest("testHtmlLocaleXhtml2", "");
- }
-
- public void testHtmlLocaleXhtml3() throws Exception {
- runMyTest("testHtmlLocaleXhtml3", "");
- }
-
- public void testHtmlLocaleXhtml_fr1() throws Exception {
- runMyTest("testHtmlLocaleXhtml_fr1", "fr");
- }
-
- public void testHtmlLocaleXhtml_fr2() throws Exception {
- runMyTest("testHtmlLocaleXhtml_fr2", "fr");
- }
-
- public void testHtmlLocaleXhtml_fr3() throws Exception {
- runMyTest("testHtmlLocaleXhtml_fr3", "fr");
- }
-
-
}
Index: src/webapp/org/apache/struts/taglib/html/TestHtmlTag.jsp
===================================================================
--- src/webapp/org/apache/struts/taglib/html/TestHtmlTag.jsp
(revision 289678)
+++ src/webapp/org/apache/struts/taglib/html/TestHtmlTag.jsp (working
copy)
@@ -18,164 +18,6 @@
</bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testHtmlLocale1">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="true">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html>
-
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocale2">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="True">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html>
-
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocale3">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="TRUE">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html>
-
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocale4">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="false">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html>
-
- </html>
- </bean:define>
-</logic:equal>
-
-
-<logic:equal name="runTest" value="testHtmlLocale5">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="False">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html>
-
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocale6">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="FALSE">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html>
-
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocale_fr1">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="true">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html lang="fr">
-
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocale_fr2">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="True">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html lang="fr">
-
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocale_fr3">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="TRUE">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html lang="fr">
-
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocale_fr4">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="false">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html>
-
- </html>
- </bean:define>
-</logic:equal>
-
-
-<logic:equal name="runTest" value="testHtmlLocale_fr5">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="False">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html>
-
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocale_fr6">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="FALSE">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html>
-
- </html>
- </bean:define>
-</logic:equal>
-
<logic:equal name="runTest" value="testHtmlXhtml1">
<bean:define id="TEST_RESULTS" toScope="page">
<html:html xhtml="true">
@@ -254,86 +96,6 @@
</bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testHtmlLocaleXhtml1">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="true" xhtml="false">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html>
-
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocaleXhtml2">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="true" xhtml="true">
- <bean:write name="<%=Globals.XHTML_KEY%>"
scope="page"/>
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html xmlns="http://www.w3.org/1999/xhtml";>
- true
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocaleXhtml3">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="false" xhtml="false">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html>
-
- </html>
- </bean:define>
-</logic:equal>
-
-
-<logic:equal name="runTest" value="testHtmlLocaleXhtml_fr1">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="true" xhtml="false">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html lang="fr">
-
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocaleXhtml_fr2">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="true" xhtml="true">
- <bean:write name="<%=Globals.XHTML_KEY%>"
scope="page"/>
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html xmlns="http://www.w3.org/1999/xhtml"; lang="fr"
xml:lang="fr">
- true
- </html>
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testHtmlLocaleXhtml_fr3">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:html locale="false" xhtml="false">
-
- </html:html>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html>
-
- </html>
- </bean:define>
-</logic:equal>
-
-
<%
String expected = "";
String compareTo = "";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
