Author: wsmoak
Date: Sun Sep 18 20:31:46 2005
New Revision: 290054
URL: http://svn.apache.org/viewcvs?rev=290054&view=rev
Log:
Removed tests dealing with the 'locale' attribute of HtmlTag, which was removed
in r234386. Submitted by Laurie Harper (laurie at holoweb.net). Bugzilla #
36702
Modified:
struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHtmlTag.java
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestHtmlTag.jsp
Modified:
struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHtmlTag.java
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHtmlTag.java?rev=290054&r1=290053&r2=290054&view=diff
==============================================================================
---
struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHtmlTag.java
(original)
+++
struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHtmlTag.java
Sun Sep 18 20:31:46 2005
@@ -1,7 +1,7 @@
/*
- * $Id$
+ * $Id$
*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -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", "");
}
@@ -146,30 +98,5 @@
public void testHtmlXhtml6() throws Exception {
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");
- }
-
}
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestHtmlTag.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestHtmlTag.jsp?rev=290054&r1=290053&r2=290054&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestHtmlTag.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestHtmlTag.jsp
Sun Sep 18 20:31:46 2005
@@ -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">
@@ -253,86 +95,6 @@
</html>
</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 = "";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
