You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/02/10 22:05:22 UTC

svn commit: r376846 [6/14] - in /struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib: ./ bean/ bean/resources/ html/ logic/

Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCancelTag2.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCancelTag2.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCancelTag2.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCancelTag2.java Fri Feb 10 13:05:03 2006
@@ -17,19 +17,17 @@
  */
 package org.apache.struts.taglib.html;
 
-import java.util.Locale;
-
-import javax.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.struts.Globals;
 
+import javax.servlet.jsp.PageContext;
+import java.util.Locale;
+
 /**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.CancelTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.CancelTag</code>
+ * class.
  */
 public class TestCancelTag2 extends JspTestCase {
 
@@ -48,7 +46,8 @@
      * @param theArgs the arguments. Not used
      */
     public static void main(String[] theArgs) {
-        junit.awtui.TestRunner.main(new String[] {TestCancelTag2.class.getName()});
+        junit.awtui.TestRunner
+                .main(new String[] { TestCancelTag2.class.getName() });
     }
 
     /**
@@ -61,9 +60,12 @@
     }
 
     private void runMyTest(String whichTest, String locale) throws Exception {
-        pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale), PageContext.SESSION_SCOPE);
+        pageContext.setAttribute(Globals.LOCALE_KEY,
+                new Locale(locale, locale),
+                PageContext.SESSION_SCOPE);
         request.setAttribute("runTest", whichTest);
-        pageContext.forward("/org/apache/struts/taglib/html/TestCancelTag2.jsp");
+        pageContext
+                .forward("/org/apache/struts/taglib/html/TestCancelTag2.jsp");
     }
 
     /*
@@ -72,46 +74,46 @@
 
     public void testCancelStyle() throws Exception {
         runMyTest("testCancelStyle", "");
-        }
+    }
 
     public void testCancelStyleClass() throws Exception {
         runMyTest("testCancelStyleClass", "");
-        }
+    }
 
     public void testCancelStyleId() throws Exception {
         runMyTest("testCancelStyleId", "");
-        }
+    }
 
     public void testCancelTabindex() throws Exception {
         runMyTest("testCancelTabindex", "");
-        }
+    }
 
     public void testCancelTitle() throws Exception {
         runMyTest("testCancelTitle", "");
-        }
+    }
 
     public void testCancelTitleKey() throws Exception {
         runMyTest("testCancelTitleKey", "");
-        }
+    }
 
     public void testCancelTitleKey_fr() throws Exception {
         runMyTest("testCancelTitleKey_fr", "fr");
-        }
+    }
 
     public void testCancelValue() throws Exception {
         runMyTest("testCancelValue", "");
-        }
+    }
 
     public void testCancelBodyContent() throws Exception {
         runMyTest("testCancelBodyContent", "");
-        }
+    }
 
     public void testCancelBodyContentMessageKey() throws Exception {
         runMyTest("testCancelBodyContentMessageKey", "");
-        }
+    }
 
     public void testCancelBodyContentMessageKey_fr() throws Exception {
         runMyTest("testCancelBodyContentMessageKey_fr", "fr");
-        }
+    }
 
 }

Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag1.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag1.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag1.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag1.java Fri Feb 10 13:05:03 2006
@@ -17,30 +17,27 @@
  */
 package org.apache.struts.taglib.html;
 
-import java.util.Locale;
-
-import javax.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.struts.Globals;
 import org.apache.struts.taglib.SimpleBeanForTesting;
 
+import javax.servlet.jsp.PageContext;
+import java.util.Locale;
+
 /**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.CheckboxTag</code> class.
- *  NOTE - These tests were separated into 4 files each because of the
- *         size of the jsp. (not playing well with Tomcat 3.3
- *
- *  These tests are numbered as such:
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.CheckboxTag</code>
+ * class. NOTE - These tests were separated into 4 files each because of the
+ * size of the jsp. (not playing well with Tomcat 3.3
  *
- *  TestCheckboxTag(1 and 2) - These test using a boolean property
- *                             set to true on our form.
+ * These tests are numbered as such:
  *
- *  TestCheckboxTag(3 and 4) - These test using a boolean property
- *                             set to false on our form.
+ * TestCheckboxTag(1 and 2) - These test using a boolean property set to true
+ * on our form.
  *
+ * TestCheckboxTag(3 and 4) - These test using a boolean property set to false
+ * on our form.
  */
 public class TestCheckboxTag1 extends JspTestCase {
 
@@ -59,7 +56,8 @@
      * @param theArgs the arguments. Not used
      */
     public static void main(String[] theArgs) {
-        junit.awtui.TestRunner.main(new String[] {TestCheckboxTag1.class.getName()});
+        junit.awtui.TestRunner
+                .main(new String[] { TestCheckboxTag1.class.getName() });
     }
 
     /**
@@ -72,10 +70,15 @@
     }
 
     private void runMyTest(String whichTest, String locale) throws Exception {
-        pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale), PageContext.SESSION_SCOPE);
-        pageContext.setAttribute(Constants.BEAN_KEY, new SimpleBeanForTesting(true), PageContext.REQUEST_SCOPE);
+        pageContext.setAttribute(Globals.LOCALE_KEY,
+                new Locale(locale, locale),
+                PageContext.SESSION_SCOPE);
+        pageContext.setAttribute(Constants.BEAN_KEY,
+                new SimpleBeanForTesting(true),
+                PageContext.REQUEST_SCOPE);
         request.setAttribute("runTest", whichTest);
-        pageContext.forward("/org/apache/struts/taglib/html/TestCheckboxTag1.jsp");
+        pageContext
+                .forward("/org/apache/struts/taglib/html/TestCheckboxTag1.jsp");
     }
 
     /*
@@ -83,87 +86,104 @@
      */
     public void testCheckboxPropertybooleanTrue() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrue", "");
-        }
+    }
+
     public void testCheckboxPropertybooleanTrueAccesskey() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueAccesskey", "");
-        }
+    }
+
     public void testCheckboxPropertybooleanTrueAlt() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueAlt", "");
-        }
+    }
+
     public void testCheckboxPropertybooleanTrueAltKey1() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueAltKey1", "");
-        }
+    }
+
     public void testCheckboxPropertybooleanTrueAltKey2() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueAltKey2", "");
-        }
+    }
+
     public void testCheckboxPropertybooleanTrueAltKey3() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueAltKey3", "");
     }
+
     public void testCheckboxPropertybooleanTrueAltKey_fr1() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueAltKey1_fr", "fr");
-        }
+    }
+
     public void testCheckboxPropertybooleanTrueAltKey_fr2() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueAltKey2_fr", "fr");
-        }
-    public void testCheckboxPropertybooleanTrueDisabled_True() throws Exception {
+    }
+
+    public void testCheckboxPropertybooleanTrueDisabled_True()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueDisabled_True", "");
-        }
-    public void testCheckboxPropertybooleanTrueDisabled_False1() throws Exception {
+    }
+
+    public void testCheckboxPropertybooleanTrueDisabled_False1()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueDisabled_False1", "");
-        }
-    public void testCheckboxPropertybooleanTrueDisabled_False2() throws Exception {
+    }
+
+    public void testCheckboxPropertybooleanTrueDisabled_False2()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueDisabled_False2", "");
-        }
+    }
+
     public void testCheckboxPropertybooleanTrueOnblur() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOnblur", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueOnchange() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOnchange", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueOnclick() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOnclick", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueOndblclick() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOndblclick", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueOnfocus() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOnfocus", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueOnkeydown() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOnkeydown", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueOnkeypress() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOnkeypress", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueOnkeyup() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOnkeyup", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanTrueOnmousedown() throws Exception {
+    public void testCheckboxPropertybooleanTrueOnmousedown()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOnmousedown", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanTrueOnmousemove() throws Exception {
+    public void testCheckboxPropertybooleanTrueOnmousemove()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOnmousemove", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueOnmouseout() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOnmouseout", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanTrueOnmouseover() throws Exception {
+    public void testCheckboxPropertybooleanTrueOnmouseover()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOnmouseover", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueOnmouseup() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueOnmouseup", "");
-        }
+    }
 
 }

Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag2.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag2.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag2.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag2.java Fri Feb 10 13:05:03 2006
@@ -17,23 +17,21 @@
  */
 package org.apache.struts.taglib.html;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-import javax.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.struts.Globals;
 import org.apache.struts.taglib.SimpleBeanForTesting;
 
+import javax.servlet.jsp.PageContext;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
 /**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.CheckboxTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.CheckboxTag</code>
+ * class.
  */
 public class TestCheckboxTag2 extends JspTestCase {
 
@@ -52,7 +50,8 @@
      * @param theArgs the arguments. Not used
      */
     public static void main(String[] theArgs) {
-        junit.awtui.TestRunner.main(new String[] {TestCheckboxTag2.class.getName()});
+        junit.awtui.TestRunner
+                .main(new String[] { TestCheckboxTag2.class.getName() });
     }
 
     /**
@@ -65,10 +64,15 @@
     }
 
     private void runMyTest(String whichTest, String locale) throws Exception {
-        pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale), PageContext.SESSION_SCOPE);
-        pageContext.setAttribute(Constants.BEAN_KEY, new SimpleBeanForTesting(true), PageContext.REQUEST_SCOPE);
+        pageContext.setAttribute(Globals.LOCALE_KEY,
+                new Locale(locale, locale),
+                PageContext.SESSION_SCOPE);
+        pageContext.setAttribute(Constants.BEAN_KEY,
+                new SimpleBeanForTesting(true),
+                PageContext.REQUEST_SCOPE);
         request.setAttribute("runTest", whichTest);
-        pageContext.forward("/org/apache/struts/taglib/html/TestCheckboxTag2.jsp");
+        pageContext
+                .forward("/org/apache/struts/taglib/html/TestCheckboxTag2.jsp");
     }
 
     /*
@@ -77,94 +81,104 @@
 
     public void testCheckboxPropertybooleanTrueStyle() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueStyle", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueStyleClass() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueStyleClass", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueStyleId() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueStyleId", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueTabindex() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueTabindex", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueTitle() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueTitle", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueTitleKey() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueTitleKey", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanTrueTitleKey_fr() throws Exception {
+    public void testCheckboxPropertybooleanTrueTitleKey_fr()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueTitleKey_fr", "fr");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueValue() throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueValue", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanTrueBodyContent() throws Exception {
+    public void testCheckboxPropertybooleanTrueBodyContent()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueBodyContent", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanTrueBodyContentMessageKey() throws Exception {
+    public void testCheckboxPropertybooleanTrueBodyContentMessageKey()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanTrueBodyContentMessageKey", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanTrueBodyContentMessageKey_fr() throws Exception {
-        runMyTest("testCheckboxPropertybooleanTrueBodyContentMessageKey_fr", "fr");
-        }
+    public void testCheckboxPropertybooleanTrueBodyContentMessageKey_fr()
+            throws Exception {
+        runMyTest("testCheckboxPropertybooleanTrueBodyContentMessageKey_fr",
+                "fr");
+    }
 
-    public void testCheckboxPropertybooleanTrueIndexedArray() throws Exception {
+    public void testCheckboxPropertybooleanTrueIndexedArray()
+            throws Exception {
         ArrayList lst = new ArrayList();
         lst.add("Test Message");
         pageContext.setAttribute("lst", lst, PageContext.REQUEST_SCOPE);
         runMyTest("testCheckboxPropertybooleanTrueIndexedArray", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanTrueIndexedArrayProperty() throws Exception {
+    public void testCheckboxPropertybooleanTrueIndexedArrayProperty()
+            throws Exception {
         SimpleBeanForTesting sbft = new SimpleBeanForTesting();
         ArrayList lst = new ArrayList();
         lst.add("Test Message");
         sbft.setList(lst);
         pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
         runMyTest("testCheckboxPropertybooleanTrueIndexedArrayProperty", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanTrueIndexedMap() throws Exception {
         HashMap map = new HashMap();
         map.put("tst1", "Test Message");
         pageContext.setAttribute("lst", map, PageContext.REQUEST_SCOPE);
         runMyTest("testCheckboxPropertybooleanTrueIndexedMap", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanTrueIndexedMapProperty() throws Exception {
+    public void testCheckboxPropertybooleanTrueIndexedMapProperty()
+            throws Exception {
         SimpleBeanForTesting sbft = new SimpleBeanForTesting();
         HashMap map = new HashMap();
         map.put("tst1", "Test Message");
         sbft.setMap(map);
         pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
         runMyTest("testCheckboxPropertybooleanTrueIndexedMapProperty", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanTrueIndexedEnumeration() throws Exception {
+    public void testCheckboxPropertybooleanTrueIndexedEnumeration()
+            throws Exception {
         StringTokenizer st = new StringTokenizer("Test Message");
         pageContext.setAttribute("lst", st, PageContext.REQUEST_SCOPE);
         runMyTest("testCheckboxPropertybooleanTrueIndexedEnumeration", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanTrueIndexedEnumerationProperty() throws Exception {
+    public void testCheckboxPropertybooleanTrueIndexedEnumerationProperty()
+            throws Exception {
         SimpleBeanForTesting sbft = new SimpleBeanForTesting();
         StringTokenizer st = new StringTokenizer("Test Message");
         sbft.setEnumeration(st);
         pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
-        runMyTest("testCheckboxPropertybooleanTrueIndexedEnumerationProperty", "");
-        }
-
+        runMyTest("testCheckboxPropertybooleanTrueIndexedEnumerationProperty",
+                "");
+    }
 
 
 }

Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag3.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag3.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag3.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag3.java Fri Feb 10 13:05:03 2006
@@ -17,20 +17,18 @@
  */
 package org.apache.struts.taglib.html;
 
-import java.util.Locale;
-
-import javax.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.struts.Globals;
 import org.apache.struts.taglib.SimpleBeanForTesting;
 
+import javax.servlet.jsp.PageContext;
+import java.util.Locale;
+
 /**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.CheckboxTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.CheckboxTag</code>
+ * class.
  */
 public class TestCheckboxTag3 extends JspTestCase {
 
@@ -49,7 +47,8 @@
      * @param theArgs the arguments. Not used
      */
     public static void main(String[] theArgs) {
-        junit.awtui.TestRunner.main(new String[] {TestCheckboxTag3.class.getName()});
+        junit.awtui.TestRunner
+                .main(new String[] { TestCheckboxTag3.class.getName() });
     }
 
     /**
@@ -62,10 +61,15 @@
     }
 
     private void runMyTest(String whichTest, String locale) throws Exception {
-        pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale), PageContext.SESSION_SCOPE);
-        pageContext.setAttribute(Constants.BEAN_KEY, new SimpleBeanForTesting(false), PageContext.REQUEST_SCOPE);
+        pageContext.setAttribute(Globals.LOCALE_KEY,
+                new Locale(locale, locale),
+                PageContext.SESSION_SCOPE);
+        pageContext.setAttribute(Constants.BEAN_KEY,
+                new SimpleBeanForTesting(false),
+                PageContext.REQUEST_SCOPE);
         request.setAttribute("runTest", whichTest);
-        pageContext.forward("/org/apache/struts/taglib/html/TestCheckboxTag3.jsp");
+        pageContext
+                .forward("/org/apache/struts/taglib/html/TestCheckboxTag3.jsp");
     }
 
     /*
@@ -73,84 +77,105 @@
      */
     public void testCheckboxPropertybooleanFalse() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalse", "");
-        }
+    }
+
     public void testCheckboxPropertybooleanFalseAccesskey() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseAccesskey", "");
-        }
+    }
+
     public void testCheckboxPropertybooleanFalseAlt() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseAlt", "");
-        }
+    }
+
     public void testCheckboxPropertybooleanFalseAltKey1() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseAltKey1", "");
-        }
+    }
+
     public void testCheckboxPropertybooleanFalseAltKey2() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseAltKey2", "");
-        }
-    public void testCheckboxPropertybooleanFalseAltKey_fr1() throws Exception {
+    }
+
+    public void testCheckboxPropertybooleanFalseAltKey_fr1()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseAltKey1_fr", "fr");
-        }
-    public void testCheckboxPropertybooleanFalseAltKey_fr2() throws Exception {
+    }
+
+    public void testCheckboxPropertybooleanFalseAltKey_fr2()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseAltKey2_fr", "fr");
-        }
-    public void testCheckboxPropertybooleanFalseDisabled_True() throws Exception {
+    }
+
+    public void testCheckboxPropertybooleanFalseDisabled_True()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseDisabled_True", "");
-        }
-    public void testCheckboxPropertybooleanFalseDisabled_False1() throws Exception {
+    }
+
+    public void testCheckboxPropertybooleanFalseDisabled_False1()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseDisabled_False1", "");
-        }
-    public void testCheckboxPropertybooleanFalseDisabled_False2() throws Exception {
+    }
+
+    public void testCheckboxPropertybooleanFalseDisabled_False2()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseDisabled_False2", "");
-        }
+    }
+
     public void testCheckboxPropertybooleanFalseOnblur() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOnblur", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanFalseOnchange() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOnchange", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanFalseOnclick() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOnclick", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseOndblclick() throws Exception {
+    public void testCheckboxPropertybooleanFalseOndblclick()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOndblclick", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanFalseOnfocus() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOnfocus", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanFalseOnkeydown() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOnkeydown", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseOnkeypress() throws Exception {
+    public void testCheckboxPropertybooleanFalseOnkeypress()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOnkeypress", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanFalseOnkeyup() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOnkeyup", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseOnmousedown() throws Exception {
+    public void testCheckboxPropertybooleanFalseOnmousedown()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOnmousedown", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseOnmousemove() throws Exception {
+    public void testCheckboxPropertybooleanFalseOnmousemove()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOnmousemove", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseOnmouseout() throws Exception {
+    public void testCheckboxPropertybooleanFalseOnmouseout()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOnmouseout", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseOnmouseover() throws Exception {
+    public void testCheckboxPropertybooleanFalseOnmouseover()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOnmouseover", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanFalseOnmouseup() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseOnmouseup", "");
-        }
+    }
 
 }

Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag4.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag4.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag4.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestCheckboxTag4.java Fri Feb 10 13:05:03 2006
@@ -17,23 +17,21 @@
  */
 package org.apache.struts.taglib.html;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-import javax.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.struts.Globals;
 import org.apache.struts.taglib.SimpleBeanForTesting;
 
+import javax.servlet.jsp.PageContext;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
 /**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.CheckboxTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.CheckboxTag</code>
+ * class.
  */
 public class TestCheckboxTag4 extends JspTestCase {
 
@@ -52,7 +50,8 @@
      * @param theArgs the arguments. Not used
      */
     public static void main(String[] theArgs) {
-        junit.awtui.TestRunner.main(new String[] {TestCheckboxTag4.class.getName()});
+        junit.awtui.TestRunner
+                .main(new String[] { TestCheckboxTag4.class.getName() });
     }
 
     /**
@@ -65,10 +64,15 @@
     }
 
     private void runMyTest(String whichTest, String locale) throws Exception {
-        pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale), PageContext.SESSION_SCOPE);
-        pageContext.setAttribute(Constants.BEAN_KEY, new SimpleBeanForTesting(false), PageContext.REQUEST_SCOPE);
+        pageContext.setAttribute(Globals.LOCALE_KEY,
+                new Locale(locale, locale),
+                PageContext.SESSION_SCOPE);
+        pageContext.setAttribute(Constants.BEAN_KEY,
+                new SimpleBeanForTesting(false),
+                PageContext.REQUEST_SCOPE);
         request.setAttribute("runTest", whichTest);
-        pageContext.forward("/org/apache/struts/taglib/html/TestCheckboxTag4.jsp");
+        pageContext
+                .forward("/org/apache/struts/taglib/html/TestCheckboxTag4.jsp");
     }
 
     /*
@@ -77,94 +81,107 @@
 
     public void testCheckboxPropertybooleanFalseStyle() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseStyle", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseStyleClass() throws Exception {
+    public void testCheckboxPropertybooleanFalseStyleClass()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseStyleClass", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanFalseStyleId() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseStyleId", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanFalseTabindex() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseTabindex", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanFalseTitle() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseTitle", "");
-        }
+    }
 
     public void testCheckboxPropertybooleanFalseTitleKey() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseTitleKey", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseTitleKey_fr() throws Exception {
+    public void testCheckboxPropertybooleanFalseTitleKey_fr()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseTitleKey_fr", "fr");
-        }
+    }
 
     public void testCheckboxPropertybooleanFalseValue() throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseValue", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseBodyContent() throws Exception {
+    public void testCheckboxPropertybooleanFalseBodyContent()
+            throws Exception {
         runMyTest("testCheckboxPropertybooleanFalseBodyContent", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseBodyContentMessageKey() throws Exception {
-        runMyTest("testCheckboxPropertybooleanFalseBodyContentMessageKey", "");
-        }
+    public void testCheckboxPropertybooleanFalseBodyContentMessageKey()
+            throws Exception {
+        runMyTest("testCheckboxPropertybooleanFalseBodyContentMessageKey",
+                "");
+    }
 
-    public void testCheckboxPropertybooleanFalseBodyContentMessageKey_fr() throws Exception {
-        runMyTest("testCheckboxPropertybooleanFalseBodyContentMessageKey_fr", "fr");
-        }
+    public void testCheckboxPropertybooleanFalseBodyContentMessageKey_fr()
+            throws Exception {
+        runMyTest("testCheckboxPropertybooleanFalseBodyContentMessageKey_fr",
+                "fr");
+    }
 
-    public void testCheckboxPropertybooleanFalseIndexedArray() throws Exception {
+    public void testCheckboxPropertybooleanFalseIndexedArray()
+            throws Exception {
         ArrayList lst = new ArrayList();
         lst.add("Test Message");
         pageContext.setAttribute("lst", lst, PageContext.REQUEST_SCOPE);
         runMyTest("testCheckboxPropertybooleanFalseIndexedArray", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseIndexedArrayProperty() throws Exception {
+    public void testCheckboxPropertybooleanFalseIndexedArrayProperty()
+            throws Exception {
         SimpleBeanForTesting sbft = new SimpleBeanForTesting();
         ArrayList lst = new ArrayList();
         lst.add("Test Message");
         sbft.setList(lst);
         pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
         runMyTest("testCheckboxPropertybooleanFalseIndexedArrayProperty", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseIndexedMap() throws Exception {
+    public void testCheckboxPropertybooleanFalseIndexedMap()
+            throws Exception {
         HashMap map = new HashMap();
         map.put("tst1", "Test Message");
         pageContext.setAttribute("lst", map, PageContext.REQUEST_SCOPE);
         runMyTest("testCheckboxPropertybooleanFalseIndexedMap", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseIndexedMapProperty() throws Exception {
+    public void testCheckboxPropertybooleanFalseIndexedMapProperty()
+            throws Exception {
         SimpleBeanForTesting sbft = new SimpleBeanForTesting();
         HashMap map = new HashMap();
         map.put("tst1", "Test Message");
         sbft.setMap(map);
         pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
         runMyTest("testCheckboxPropertybooleanFalseIndexedMapProperty", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseIndexedEnumeration() throws Exception {
+    public void testCheckboxPropertybooleanFalseIndexedEnumeration()
+            throws Exception {
         StringTokenizer st = new StringTokenizer("Test Message");
         pageContext.setAttribute("lst", st, PageContext.REQUEST_SCOPE);
         runMyTest("testCheckboxPropertybooleanFalseIndexedEnumeration", "");
-        }
+    }
 
-    public void testCheckboxPropertybooleanFalseIndexedEnumerationProperty() throws Exception {
+    public void testCheckboxPropertybooleanFalseIndexedEnumerationProperty()
+            throws Exception {
         SimpleBeanForTesting sbft = new SimpleBeanForTesting();
         StringTokenizer st = new StringTokenizer("Test Message");
         sbft.setEnumeration(st);
         pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
-        runMyTest("testCheckboxPropertybooleanFalseIndexedEnumerationProperty", "");
-        }
-
+        runMyTest("testCheckboxPropertybooleanFalseIndexedEnumerationProperty",
+                "");
+    }
 
 
 }

Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag1.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag1.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag1.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag1.java Fri Feb 10 13:05:03 2006
@@ -17,20 +17,17 @@
  */
 package org.apache.struts.taglib.html;
 
-import java.util.Locale;
-
-import javax.servlet.jsp.PageContext;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.struts.Globals;
 
+import javax.servlet.jsp.PageContext;
+import java.util.Locale;
+
 /**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.ErrorsTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ErrorsTag</code>
+ * class.
  */
 public class TestErrorsTag1 extends JspTestCase {
 
@@ -49,7 +46,8 @@
      * @param theArgs the arguments. Not used
      */
     public static void main(String[] theArgs) {
-        junit.awtui.TestRunner.main(new String[] {TestErrorsTag1.class.getName()});
+        junit.awtui.TestRunner
+                .main(new String[] { TestErrorsTag1.class.getName() });
     }
 
     /**
@@ -62,9 +60,12 @@
     }
 
     private void runMyTest(String whichTest, String locale) throws Exception {
-                request.setAttribute("runTest", whichTest);
-        pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale), PageContext.SESSION_SCOPE);
-        pageContext.forward("/org/apache/struts/taglib/html/TestErrorsTag1.jsp");
+        request.setAttribute("runTest", whichTest);
+        pageContext.setAttribute(Globals.LOCALE_KEY,
+                new Locale(locale, locale),
+                PageContext.SESSION_SCOPE);
+        pageContext
+                .forward("/org/apache/struts/taglib/html/TestErrorsTag1.jsp");
     }
 
     /*
@@ -72,67 +73,90 @@
      */
     public void testErrorsDefaultBundle0Errors() throws Exception {
         runMyTest("testErrorsDefaultBundle0Errors", "");
-        }
+    }
+
     public void testErrorsDefaultBundle2Errors() throws Exception {
         runMyTest("testErrorsDefaultBundle2Errors", "");
-        }
+    }
 
     public void testErrorsAlternateBundle0Errors() throws Exception {
         runMyTest("testErrorsAlternateBundle0Errors", "");
-        }
+    }
+
     public void testErrorsAlternateBundle2Errors() throws Exception {
         runMyTest("testErrorsAlternateBundle2Errors", "");
-        }
+    }
 
     public void testErrorsDefaultBundle0Errors_fr() throws Exception {
         runMyTest("testErrorsDefaultBundle0Errors_fr", "fr");
-        }
+    }
+
     public void testErrorsDefaultBundle2Errors_fr() throws Exception {
         runMyTest("testErrorsDefaultBundle2Errors_fr", "fr");
-        }
+    }
 
     public void testErrorsAlternateBundle0Errors_fr() throws Exception {
         runMyTest("testErrorsAlternateBundle0Errors_fr", "fr");
-        }
+    }
+
     public void testErrorsAlternateBundle2Errors_fr() throws Exception {
         runMyTest("testErrorsAlternateBundle2Errors_fr", "fr");
-        }
-
+    }
 
 
     public void testErrorsDefaultBundle0ErrorsLocale() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle0ErrorsLocale", "");
-        }
+    }
+
     public void testErrorsDefaultBundle2ErrorsLocale() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle2ErrorsLocale", "");
-        }
+    }
 
     public void testErrorsAlternateBundle0ErrorsLocale() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle0ErrorsLocale", "");
-        }
+    }
+
     public void testErrorsAlternateBundle2ErrorsLocale() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle2ErrorsLocale", "");
-        }
+    }
 
     public void testErrorsDefaultBundle0ErrorsLocale_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle0ErrorsLocale_fr", "");
-        }
+    }
+
     public void testErrorsDefaultBundle2ErrorsLocale_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle2ErrorsLocale_fr", "");
-        }
+    }
 
     public void testErrorsAlternateBundle0ErrorsLocale_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle0ErrorsLocale_fr", "");
-        }
+    }
+
     public void testErrorsAlternateBundle2ErrorsLocale_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle2ErrorsLocale_fr", "");
-        }
+    }
 }

Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag2.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag2.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag2.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag2.java Fri Feb 10 13:05:03 2006
@@ -17,20 +17,17 @@
  */
 package org.apache.struts.taglib.html;
 
-import java.util.Locale;
-
-import javax.servlet.jsp.PageContext;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.struts.Globals;
 
+import javax.servlet.jsp.PageContext;
+import java.util.Locale;
+
 /**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.ErrorsTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ErrorsTag</code>
+ * class.
  */
 public class TestErrorsTag2 extends JspTestCase {
 
@@ -49,7 +46,8 @@
      * @param theArgs the arguments. Not used
      */
     public static void main(String[] theArgs) {
-        junit.awtui.TestRunner.main(new String[] {TestErrorsTag2.class.getName()});
+        junit.awtui.TestRunner
+                .main(new String[] { TestErrorsTag2.class.getName() });
     }
 
     /**
@@ -63,79 +61,114 @@
 
     private void runMyTest(String whichTest, String locale) throws Exception {
         request.setAttribute("runTest", whichTest);
-        pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale), PageContext.SESSION_SCOPE);
-        pageContext.forward("/org/apache/struts/taglib/html/TestErrorsTag2.jsp");
+        pageContext.setAttribute(Globals.LOCALE_KEY,
+                new Locale(locale, locale),
+                PageContext.SESSION_SCOPE);
+        pageContext
+                .forward("/org/apache/struts/taglib/html/TestErrorsTag2.jsp");
     }
 
-
     /*
-     * Testing ErrorsTag.
-     */
+    * Testing ErrorsTag.
+    */
 
     public void testErrorsDefaultBundle0ErrorsProperty() throws Exception {
         runMyTest("testErrorsDefaultBundle0ErrorsProperty", "");
-        }
+    }
+
     public void testErrorsDefaultBundle2ErrorsProperty() throws Exception {
         runMyTest("testErrorsDefaultBundle2ErrorsProperty", "");
-        }
+    }
 
     public void testErrorsAlternateBundle0ErrorsProperty() throws Exception {
         runMyTest("testErrorsAlternateBundle0ErrorsProperty", "");
-        }
+    }
+
     public void testErrorsAlternateBundle2ErrorsProperty() throws Exception {
         runMyTest("testErrorsAlternateBundle2ErrorsProperty", "");
-        }
+    }
 
     public void testErrorsDefaultBundle0ErrorsProperty_fr() throws Exception {
         runMyTest("testErrorsDefaultBundle0ErrorsProperty_fr", "fr");
-        }
+    }
+
     public void testErrorsDefaultBundle2ErrorsProperty_fr() throws Exception {
         runMyTest("testErrorsDefaultBundle2ErrorsProperty_fr", "fr");
-        }
+    }
 
-    public void testErrorsAlternateBundle0ErrorsProperty_fr() throws Exception {
+    public void testErrorsAlternateBundle0ErrorsProperty_fr()
+            throws Exception {
         runMyTest("testErrorsAlternateBundle0ErrorsProperty_fr", "fr");
-        }
-    public void testErrorsAlternateBundle2ErrorsProperty_fr() throws Exception {
-        runMyTest("testErrorsAlternateBundle2ErrorsProperty_fr", "fr");
-        }
+    }
 
+    public void testErrorsAlternateBundle2ErrorsProperty_fr()
+            throws Exception {
+        runMyTest("testErrorsAlternateBundle2ErrorsProperty_fr", "fr");
+    }
 
 
-    public void testErrorsDefaultBundle0ErrorsLocaleProperty() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    public void testErrorsDefaultBundle0ErrorsLocaleProperty()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle0ErrorsLocaleProperty", "");
-        }
-    public void testErrorsDefaultBundle2ErrorsLocaleProperty() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    }
+
+    public void testErrorsDefaultBundle2ErrorsLocaleProperty()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle2ErrorsLocaleProperty", "");
-        }
+    }
 
-    public void testErrorsAlternateBundle0ErrorsLocaleProperty() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    public void testErrorsAlternateBundle0ErrorsLocaleProperty()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle0ErrorsLocaleProperty", "");
-        }
-    public void testErrorsAlternateBundle2ErrorsLocaleProperty() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    }
+
+    public void testErrorsAlternateBundle2ErrorsLocaleProperty()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle2ErrorsLocaleProperty", "");
-        }
+    }
 
-    public void testErrorsDefaultBundle0ErrorsLocaleProperty_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    public void testErrorsDefaultBundle0ErrorsLocaleProperty_fr()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle0ErrorsLocaleProperty_fr", "");
-        }
-    public void testErrorsDefaultBundle2ErrorsLocaleProperty_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    }
+
+    public void testErrorsDefaultBundle2ErrorsLocaleProperty_fr()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle2ErrorsLocaleProperty_fr", "");
-        }
+    }
 
-    public void testErrorsAlternateBundle0ErrorsLocaleProperty_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    public void testErrorsAlternateBundle0ErrorsLocaleProperty_fr()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle0ErrorsLocaleProperty_fr", "");
-        }
-    public void testErrorsAlternateBundle2ErrorsLocaleProperty_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    }
+
+    public void testErrorsAlternateBundle2ErrorsLocaleProperty_fr()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle2ErrorsLocaleProperty_fr", "");
-        }
+    }
 
 }

Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag3.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag3.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag3.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag3.java Fri Feb 10 13:05:03 2006
@@ -17,20 +17,17 @@
  */
 package org.apache.struts.taglib.html;
 
-import java.util.Locale;
-
-import javax.servlet.jsp.PageContext;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.struts.Globals;
 
+import javax.servlet.jsp.PageContext;
+import java.util.Locale;
+
 /**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.ErrorsTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ErrorsTag</code>
+ * class.
  */
 public class TestErrorsTag3 extends JspTestCase {
 
@@ -49,7 +46,8 @@
      * @param theArgs the arguments. Not used
      */
     public static void main(String[] theArgs) {
-        junit.awtui.TestRunner.main(new String[] {TestErrorsTag3.class.getName()});
+        junit.awtui.TestRunner
+                .main(new String[] { TestErrorsTag3.class.getName() });
     }
 
     /**
@@ -62,9 +60,12 @@
     }
 
     private void runMyTest(String whichTest, String locale) throws Exception {
-                request.setAttribute("runTest", whichTest);
-        pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale), PageContext.SESSION_SCOPE);
-        pageContext.forward("/org/apache/struts/taglib/html/TestErrorsTag3.jsp");
+        request.setAttribute("runTest", whichTest);
+        pageContext.setAttribute(Globals.LOCALE_KEY,
+                new Locale(locale, locale),
+                PageContext.SESSION_SCOPE);
+        pageContext
+                .forward("/org/apache/struts/taglib/html/TestErrorsTag3.jsp");
     }
 
     /*
@@ -72,69 +73,98 @@
      */
     public void testErrorsDefaultBundle0ErrorsName() throws Exception {
         runMyTest("testErrorsDefaultBundle0ErrorsName", "");
-        }
+    }
+
     public void testErrorsDefaultBundle2ErrorsName() throws Exception {
         runMyTest("testErrorsDefaultBundle2ErrorsName", "");
-        }
+    }
 
     public void testErrorsAlternateBundle0ErrorsName() throws Exception {
         runMyTest("testErrorsAlternateBundle0ErrorsName", "");
-        }
+    }
+
     public void testErrorsAlternateBundle2ErrorsName() throws Exception {
         runMyTest("testErrorsAlternateBundle2ErrorsName", "");
-        }
+    }
 
     public void testErrorsDefaultBundle0ErrorsName_fr() throws Exception {
         runMyTest("testErrorsDefaultBundle0ErrorsName_fr", "fr");
-        }
+    }
+
     public void testErrorsDefaultBundle2ErrorsName_fr() throws Exception {
         runMyTest("testErrorsDefaultBundle2ErrorsName_fr", "fr");
-        }
+    }
 
     public void testErrorsAlternateBundle0ErrorsName_fr() throws Exception {
         runMyTest("testErrorsAlternateBundle0ErrorsName_fr", "fr");
-        }
+    }
+
     public void testErrorsAlternateBundle2ErrorsName_fr() throws Exception {
         runMyTest("testErrorsAlternateBundle2ErrorsName_fr", "fr");
-        }
-
+    }
 
 
     public void testErrorsDefaultBundle0ErrorsLocaleName() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle0ErrorsLocaleName", "");
-        }
+    }
+
     public void testErrorsDefaultBundle2ErrorsLocaleName() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle2ErrorsLocaleName", "");
-        }
+    }
 
-    public void testErrorsAlternateBundle0ErrorsLocaleName() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    public void testErrorsAlternateBundle0ErrorsLocaleName()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle0ErrorsLocaleName", "");
-        }
-    public void testErrorsAlternateBundle2ErrorsLocaleName() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    }
+
+    public void testErrorsAlternateBundle2ErrorsLocaleName()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle2ErrorsLocaleName", "");
-        }
+    }
 
-    public void testErrorsDefaultBundle0ErrorsLocaleName_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    public void testErrorsDefaultBundle0ErrorsLocaleName_fr()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle0ErrorsLocaleName_fr", "");
-        }
-    public void testErrorsDefaultBundle2ErrorsLocaleName_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    }
+
+    public void testErrorsDefaultBundle2ErrorsLocaleName_fr()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle2ErrorsLocaleName_fr", "");
-        }
+    }
 
-    public void testErrorsAlternateBundle0ErrorsLocaleName_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    public void testErrorsAlternateBundle0ErrorsLocaleName_fr()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle0ErrorsLocaleName_fr", "");
-        }
-    public void testErrorsAlternateBundle2ErrorsLocaleName_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    }
+
+    public void testErrorsAlternateBundle2ErrorsLocaleName_fr()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle2ErrorsLocaleName_fr", "");
-        }
+    }
 
 
 }

Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag4.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag4.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag4.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestErrorsTag4.java Fri Feb 10 13:05:03 2006
@@ -17,20 +17,17 @@
  */
 package org.apache.struts.taglib.html;
 
-import java.util.Locale;
-
-import javax.servlet.jsp.PageContext;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.struts.Globals;
 
+import javax.servlet.jsp.PageContext;
+import java.util.Locale;
+
 /**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.ErrorsTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ErrorsTag</code>
+ * class.
  */
 public class TestErrorsTag4 extends JspTestCase {
 
@@ -49,7 +46,8 @@
      * @param theArgs the arguments. Not used
      */
     public static void main(String[] theArgs) {
-        junit.awtui.TestRunner.main(new String[] {TestErrorsTag4.class.getName()});
+        junit.awtui.TestRunner
+                .main(new String[] { TestErrorsTag4.class.getName() });
     }
 
     /**
@@ -63,85 +61,129 @@
 
     private void runMyTest(String whichTest, String locale) throws Exception {
         request.setAttribute("runTest", whichTest);
-        pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale), PageContext.SESSION_SCOPE);
-        pageContext.forward("/org/apache/struts/taglib/html/TestErrorsTag4.jsp");
+        pageContext.setAttribute(Globals.LOCALE_KEY,
+                new Locale(locale, locale),
+                PageContext.SESSION_SCOPE);
+        pageContext
+                .forward("/org/apache/struts/taglib/html/TestErrorsTag4.jsp");
     }
 
-
     /*
-     * Testing ErrorsTag.
-     */
+    * Testing ErrorsTag.
+    */
 
-    public void testErrorsDefaultBundle0ErrorsNameProperty() throws Exception {
+    public void testErrorsDefaultBundle0ErrorsNameProperty()
+            throws Exception {
         runMyTest("testErrorsDefaultBundle0ErrorsNameProperty", "");
-        }
-    public void testErrorsDefaultBundle2ErrorsNameProperty() throws Exception {
+    }
+
+    public void testErrorsDefaultBundle2ErrorsNameProperty()
+            throws Exception {
         runMyTest("testErrorsDefaultBundle2ErrorsNameProperty", "");
-        }
+    }
 
-    public void testErrorsAlternateBundle0ErrorsNameProperty() throws Exception {
+    public void testErrorsAlternateBundle0ErrorsNameProperty()
+            throws Exception {
         runMyTest("testErrorsAlternateBundle0ErrorsNameProperty", "");
-        }
-    public void testErrorsAlternateBundle2ErrorsNameProperty() throws Exception {
+    }
+
+    public void testErrorsAlternateBundle2ErrorsNameProperty()
+            throws Exception {
         runMyTest("testErrorsAlternateBundle2ErrorsNameProperty", "");
-        }
+    }
 
-    public void testErrorsDefaultBundle0ErrorsNameProperty_fr() throws Exception {
+    public void testErrorsDefaultBundle0ErrorsNameProperty_fr()
+            throws Exception {
         runMyTest("testErrorsDefaultBundle0ErrorsNameProperty_fr", "fr");
-        }
-    public void testErrorsDefaultBundle2ErrorsNameProperty_fr() throws Exception {
+    }
+
+    public void testErrorsDefaultBundle2ErrorsNameProperty_fr()
+            throws Exception {
         runMyTest("testErrorsDefaultBundle2ErrorsNameProperty_fr", "fr");
-        }
+    }
 
-    public void testErrorsAlternateBundle0ErrorsNameProperty_fr() throws Exception {
+    public void testErrorsAlternateBundle0ErrorsNameProperty_fr()
+            throws Exception {
         runMyTest("testErrorsAlternateBundle0ErrorsNameProperty_fr", "fr");
-        }
-    public void testErrorsAlternateBundle2ErrorsNameProperty_fr() throws Exception {
-        runMyTest("testErrorsAlternateBundle2ErrorsNameProperty_fr", "fr");
-        }
+    }
 
+    public void testErrorsAlternateBundle2ErrorsNameProperty_fr()
+            throws Exception {
+        runMyTest("testErrorsAlternateBundle2ErrorsNameProperty_fr", "fr");
+    }
 
 
-    public void testErrorsDefaultBundle0ErrorsLocaleNameProperty() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    public void testErrorsDefaultBundle0ErrorsLocaleNameProperty()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle0ErrorsLocaleNameProperty", "");
-        }
-    public void testErrorsDefaultBundle2ErrorsLocaleNameProperty() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    }
+
+    public void testErrorsDefaultBundle2ErrorsLocaleNameProperty()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle2ErrorsLocaleNameProperty", "");
-        }
+    }
 
-    public void testErrorsAlternateBundle0ErrorsLocaleNameProperty() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    public void testErrorsAlternateBundle0ErrorsLocaleNameProperty()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle0ErrorsLocaleNameProperty", "");
-        }
-    public void testErrorsAlternateBundle2ErrorsLocaleNameProperty() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    }
+
+    public void testErrorsAlternateBundle2ErrorsLocaleNameProperty()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsAlternateBundle2ErrorsLocaleNameProperty", "");
-        }
+    }
 
-    public void testErrorsDefaultBundle0ErrorsLocaleNameProperty_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    public void testErrorsDefaultBundle0ErrorsLocaleNameProperty_fr()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle0ErrorsLocaleNameProperty_fr", "");
-        }
-    public void testErrorsDefaultBundle2ErrorsLocaleNameProperty_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+    }
+
+    public void testErrorsDefaultBundle2ErrorsLocaleNameProperty_fr()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
         runMyTest("testErrorsDefaultBundle2ErrorsLocaleNameProperty_fr", "");
-        }
+    }
 
-    public void testErrorsAlternateBundle0ErrorsLocaleNameProperty_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
-        runMyTest("testErrorsAlternateBundle0ErrorsLocaleNameProperty_fr", "");
-        }
-    public void testErrorsAlternateBundle2ErrorsLocaleNameProperty_fr() throws Exception {
-        pageContext.setAttribute("MY_LOCALE_KEY", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
-        runMyTest("testErrorsAlternateBundle2ErrorsLocaleNameProperty_fr", "");
-        }
+    public void testErrorsAlternateBundle0ErrorsLocaleNameProperty_fr()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
+        runMyTest("testErrorsAlternateBundle0ErrorsLocaleNameProperty_fr",
+                "");
+    }
+
+    public void testErrorsAlternateBundle2ErrorsLocaleNameProperty_fr()
+            throws Exception {
+        pageContext.setAttribute("MY_LOCALE_KEY",
+                new Locale("fr", "fr"),
+                PageContext.SESSION_SCOPE);
+        runMyTest("testErrorsAlternateBundle2ErrorsLocaleNameProperty_fr",
+                "");
+    }
 
 
     public void testErrorsCustomResources() throws Exception {
         runMyTest("testErrorsCustomResources", "");
     }
+
     public void testErrorsCustomResourcesAltBundle() throws Exception {
         runMyTest("testErrorsCustomResourcesAltBundle", "");
     }

Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFileTag1.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFileTag1.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFileTag1.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFileTag1.java Fri Feb 10 13:05:03 2006
@@ -17,20 +17,18 @@
  */
 package org.apache.struts.taglib.html;
 
-import java.util.Locale;
-
-import javax.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.struts.Globals;
 import org.apache.struts.taglib.SimpleBeanForTesting;
 
+import javax.servlet.jsp.PageContext;
+import java.util.Locale;
+
 /**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.FileTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.FileTag</code>
+ * class.
  */
 public class TestFileTag1 extends JspTestCase {
 
@@ -49,7 +47,8 @@
      * @param theArgs the arguments. Not used
      */
     public static void main(String[] theArgs) {
-        junit.awtui.TestRunner.main(new String[] {TestFileTag1.class.getName()});
+        junit.awtui.TestRunner
+                .main(new String[] { TestFileTag1.class.getName() });
     }
 
     /**
@@ -62,10 +61,15 @@
     }
 
     private void runMyTest(String whichTest, String locale) throws Exception {
-        pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale), PageContext.SESSION_SCOPE);
-        pageContext.setAttribute(Constants.BEAN_KEY, new SimpleBeanForTesting("Test Value"), PageContext.REQUEST_SCOPE);
+        pageContext.setAttribute(Globals.LOCALE_KEY,
+                new Locale(locale, locale),
+                PageContext.SESSION_SCOPE);
+        pageContext.setAttribute(Constants.BEAN_KEY,
+                new SimpleBeanForTesting("Test Value"),
+                PageContext.REQUEST_SCOPE);
         request.setAttribute("runTest", whichTest);
-        pageContext.forward("/org/apache/struts/taglib/html/TestFileTag1.jsp");
+        pageContext
+                .forward("/org/apache/struts/taglib/html/TestFileTag1.jsp");
     }
 
     /*
@@ -73,90 +77,102 @@
      */
     public void testFileProperty() throws Exception {
         runMyTest("testFileProperty", "");
-        }
+    }
+
     public void testFilePropertyAccept() throws Exception {
         runMyTest("testFilePropertyAccept", "");
-        }
+    }
+
     public void testFilePropertyAccesskey() throws Exception {
         runMyTest("testFilePropertyAccesskey", "");
-        }
+    }
+
     public void testFilePropertyAlt() throws Exception {
         runMyTest("testFilePropertyAlt", "");
-        }
+    }
+
     public void testFilePropertyAltKey1() throws Exception {
         runMyTest("testFilePropertyAltKey1", "");
-        }
+    }
+
     public void testFilePropertyAltKey2() throws Exception {
         runMyTest("testFilePropertyAltKey2", "");
-        }
+    }
+
     public void testFilePropertyAltKey3() throws Exception {
         runMyTest("testFilePropertyAltKey3", "");
     }
+
     public void testFilePropertyAltKey_fr1() throws Exception {
         runMyTest("testFilePropertyAltKey1_fr", "fr");
-        }
+    }
+
     public void testFilePropertyAltKey_fr2() throws Exception {
         runMyTest("testFilePropertyAltKey2_fr", "fr");
-        }
+    }
+
     public void testFilePropertyDisabled_True() throws Exception {
         runMyTest("testFilePropertyDisabled_True", "");
-        }
+    }
+
     public void testFilePropertyDisabled_False1() throws Exception {
         runMyTest("testFilePropertyDisabled_False1", "");
-        }
+    }
+
     public void testFilePropertyDisabled_False2() throws Exception {
         runMyTest("testFilePropertyDisabled_False2", "");
-        }
+    }
+
     public void testFilePropertyOnblur() throws Exception {
         runMyTest("testFilePropertyOnblur", "");
-        }
+    }
 
     public void testFilePropertyOnchange() throws Exception {
         runMyTest("testFilePropertyOnchange", "");
-        }
+    }
 
     public void testFilePropertyOnclick() throws Exception {
         runMyTest("testFilePropertyOnclick", "");
-        }
+    }
 
     public void testFilePropertyOndblclick() throws Exception {
         runMyTest("testFilePropertyOndblclick", "");
-        }
+    }
 
     public void testFilePropertyOnfocus() throws Exception {
         runMyTest("testFilePropertyOnfocus", "");
-        }
+    }
 
     public void testFilePropertyOnkeydown() throws Exception {
         runMyTest("testFilePropertyOnkeydown", "");
-        }
+    }
 
     public void testFilePropertyOnkeypress() throws Exception {
         runMyTest("testFilePropertyOnkeypress", "");
-        }
+    }
 
     public void testFilePropertyOnkeyup() throws Exception {
         runMyTest("testFilePropertyOnkeyup", "");
-        }
+    }
 
     public void testFilePropertyOnmousedown() throws Exception {
         runMyTest("testFilePropertyOnmousedown", "");
-        }
+    }
 
     public void testFilePropertyOnmousemove() throws Exception {
         runMyTest("testFilePropertyOnmousemove", "");
-        }
+    }
 
     public void testFilePropertyOnmouseout() throws Exception {
         runMyTest("testFilePropertyOnmouseout", "");
-        }
+    }
 
     public void testFilePropertyOnmouseover() throws Exception {
         runMyTest("testFilePropertyOnmouseover", "");
-        }
+    }
 
     public void testFilePropertyOnmouseup() throws Exception {
         runMyTest("testFilePropertyOnmouseup", "");
-        }
+    }
 
 }

Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFileTag2.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFileTag2.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFileTag2.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFileTag2.java Fri Feb 10 13:05:03 2006
@@ -17,23 +17,21 @@
  */
 package org.apache.struts.taglib.html;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-import javax.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.struts.Globals;
 import org.apache.struts.taglib.SimpleBeanForTesting;
 
+import javax.servlet.jsp.PageContext;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
 /**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.FileTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.FileTag</code>
+ * class.
  */
 public class TestFileTag2 extends JspTestCase {
 
@@ -52,7 +50,8 @@
      * @param theArgs the arguments. Not used
      */
     public static void main(String[] theArgs) {
-        junit.awtui.TestRunner.main(new String[] {TestFileTag2.class.getName()});
+        junit.awtui.TestRunner
+                .main(new String[] { TestFileTag2.class.getName() });
     }
 
     /**
@@ -65,10 +64,15 @@
     }
 
     private void runMyTest(String whichTest, String locale) throws Exception {
-        pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale), PageContext.SESSION_SCOPE);
-        pageContext.setAttribute(Constants.BEAN_KEY, new SimpleBeanForTesting("Test Value"), PageContext.REQUEST_SCOPE);
+        pageContext.setAttribute(Globals.LOCALE_KEY,
+                new Locale(locale, locale),
+                PageContext.SESSION_SCOPE);
+        pageContext.setAttribute(Constants.BEAN_KEY,
+                new SimpleBeanForTesting("Test Value"),
+                PageContext.REQUEST_SCOPE);
         request.setAttribute("runTest", whichTest);
-        pageContext.forward("/org/apache/struts/taglib/html/TestFileTag2.jsp");
+        pageContext
+                .forward("/org/apache/struts/taglib/html/TestFileTag2.jsp");
     }
 
     /*
@@ -77,7 +81,7 @@
 
     public void testFilePropertyStyle() throws Exception {
         runMyTest("testFilePropertyStyle", "");
-        }
+    }
 
     public void testFilePropertyErrorStyle() throws Exception {
         runMyTest("testFilePropertyErrorStyle", "");
@@ -85,7 +89,7 @@
 
     public void testFilePropertyStyleClass() throws Exception {
         runMyTest("testFilePropertyStyleClass", "");
-        }
+    }
 
     public void testFilePropertyErrorStyleClass() throws Exception {
         runMyTest("testFilePropertyErrorStyleClass", "");
@@ -93,7 +97,7 @@
 
     public void testFilePropertyStyleId() throws Exception {
         runMyTest("testFilePropertyStyleId", "");
-        }
+    }
 
     public void testFilePropertyErrorStyleId() throws Exception {
         runMyTest("testFilePropertyErrorStyleId", "");
@@ -101,42 +105,42 @@
 
     public void testFilePropertyTabindex() throws Exception {
         runMyTest("testFilePropertyTabindex", "");
-        }
+    }
 
     public void testFilePropertyTitle() throws Exception {
         runMyTest("testFilePropertyTitle", "");
-        }
+    }
 
     public void testFilePropertyTitleKey() throws Exception {
         runMyTest("testFilePropertyTitleKey", "");
-        }
+    }
 
     public void testFilePropertyTitleKey_fr() throws Exception {
         runMyTest("testFilePropertyTitleKey_fr", "fr");
-        }
+    }
 
     public void testFilePropertyValue() throws Exception {
         runMyTest("testFilePropertyValue", "");
-        }
+    }
 
     public void testFilePropertyBodyContent() throws Exception {
         runMyTest("testFilePropertyBodyContent", "");
-        }
+    }
 
     public void testFilePropertyBodyContentMessageKey() throws Exception {
         runMyTest("testFilePropertyBodyContentMessageKey", "");
-        }
+    }
 
     public void testFilePropertyBodyContentMessageKey_fr() throws Exception {
         runMyTest("testFilePropertyBodyContentMessageKey_fr", "fr");
-        }
+    }
 
     public void testFilePropertyIndexedArray() throws Exception {
         ArrayList lst = new ArrayList();
         lst.add("Test Message");
         pageContext.setAttribute("lst", lst, PageContext.REQUEST_SCOPE);
         runMyTest("testFilePropertyIndexedArray", "");
-        }
+    }
 
     public void testFilePropertyIndexedArrayProperty() throws Exception {
         SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -145,14 +149,14 @@
         sbft.setList(lst);
         pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
         runMyTest("testFilePropertyIndexedArrayProperty", "");
-        }
+    }
 
     public void testFilePropertyIndexedMap() throws Exception {
         HashMap map = new HashMap();
         map.put("tst1", "Test Message");
         pageContext.setAttribute("lst", map, PageContext.REQUEST_SCOPE);
         runMyTest("testFilePropertyIndexedMap", "");
-        }
+    }
 
     public void testFilePropertyIndexedMapProperty() throws Exception {
         SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -161,22 +165,22 @@
         sbft.setMap(map);
         pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
         runMyTest("testFilePropertyIndexedMapProperty", "");
-        }
+    }
 
     public void testFilePropertyIndexedEnumeration() throws Exception {
         StringTokenizer st = new StringTokenizer("Test Message");
         pageContext.setAttribute("lst", st, PageContext.REQUEST_SCOPE);
         runMyTest("testFilePropertyIndexedEnumeration", "");
-        }
+    }
 
-    public void testFilePropertyIndexedEnumerationProperty() throws Exception {
+    public void testFilePropertyIndexedEnumerationProperty()
+            throws Exception {
         SimpleBeanForTesting sbft = new SimpleBeanForTesting();
         StringTokenizer st = new StringTokenizer("Test Message");
         sbft.setEnumeration(st);
         pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
         runMyTest("testFilePropertyIndexedEnumerationProperty", "");
-        }
-
+    }
 
 
 }

Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFormTag1.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFormTag1.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFormTag1.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFormTag1.java Fri Feb 10 13:05:03 2006
@@ -17,20 +17,18 @@
  */
 package org.apache.struts.taglib.html;
 
-import java.util.Locale;
-
-import javax.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.struts.Globals;
 import org.apache.struts.taglib.SimpleBeanForTesting;
 
+import javax.servlet.jsp.PageContext;
+import java.util.Locale;
+
 /**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.FormTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.FormTag</code>
+ * class.
  */
 public class TestFormTag1 extends JspTestCase {
 
@@ -49,7 +47,8 @@
      * @param theArgs the arguments. Not used
      */
     public static void main(String[] theArgs) {
-        junit.awtui.TestRunner.main(new String[] {TestFormTag1.class.getName()});
+        junit.awtui.TestRunner
+                .main(new String[] { TestFormTag1.class.getName() });
     }
 
     /**
@@ -62,10 +61,15 @@
     }
 
     private void runMyTest(String whichTest, String locale) throws Exception {
-        pageContext.setAttribute(Globals.LOCALE_KEY, new Locale(locale, locale), PageContext.SESSION_SCOPE);
-        pageContext.setAttribute(Constants.BEAN_KEY, new SimpleBeanForTesting("Test Value"), PageContext.REQUEST_SCOPE);
+        pageContext.setAttribute(Globals.LOCALE_KEY,
+                new Locale(locale, locale),
+                PageContext.SESSION_SCOPE);
+        pageContext.setAttribute(Constants.BEAN_KEY,
+                new SimpleBeanForTesting("Test Value"),
+                PageContext.REQUEST_SCOPE);
         request.setAttribute("runTest", whichTest);
-        pageContext.forward("/org/apache/struts/taglib/html/TestFormTag1.jsp");
+        pageContext
+                .forward("/org/apache/struts/taglib/html/TestFormTag1.jsp");
     }
 
     /*
@@ -73,56 +77,67 @@
      */
     public void testFormAction() throws Exception {
         runMyTest("testFormAction", "");
-        }
+    }
+
     public void testFormActionEnctype() throws Exception {
         runMyTest("testFormActionEnctype", "");
-        }
+    }
+
     public void testFormActionAcceptCharset() throws Exception {
         runMyTest("testFormActionAcceptCharset", "");
-        }
+    }
+
     public void testFormActionFocus() throws Exception {
         runMyTest("testFormActionFocus", "");
-        }
+    }
+
     public void testFormActionFocusIndexed() throws Exception {
         runMyTest("testFormActionFocusIndexed", "");
-        }
+    }
+
     public void testFormActionMethod1() throws Exception {
         runMyTest("testFormActionMethod1", "");
-        }
+    }
+
     public void testFormActionMethod2() throws Exception {
         runMyTest("testFormActionMethod2", "");
-        }
+    }
+
     public void testFormActionMethod3() throws Exception {
         runMyTest("testFormActionMethod3", "");
-        }
+    }
+
     public void testFormActionMethod4() throws Exception {
         runMyTest("testFormActionMethod4", "");
-        }
+    }
+
     public void testFormActionMethod5() throws Exception {
         runMyTest("testFormActionMethod5", "");
-        }
+    }
+
     public void testFormActionOnreset() throws Exception {
         runMyTest("testFormActionOnreset", "");
-        }
+    }
+
     public void testFormActionOnsubmit() throws Exception {
         runMyTest("testFormActionOnsubmit", "");
-        }
+    }
+
     public void testFormActionStyle() throws Exception {
         runMyTest("testFormActionStyle", "");
-        }
+    }
+
     public void testFormActionStyleClass() throws Exception {
         runMyTest("testFormActionStyleClass", "");
-        }
+    }
+
     public void testFormActionStyleId() throws Exception {
         runMyTest("testFormActionStyleId", "");
-        }
+    }
+
     public void testFormActionTarget() throws Exception {
         runMyTest("testFormActionTarget", "");
-        }
-
-
-
-
+    }
 
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org