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 [7/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/TestFrameTag1.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag1.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag1.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag1.java Fri Feb 10 13:05:03 2006
@@ -17,23 +17,20 @@
*/
package org.apache.struts.taglib.html;
-import java.util.HashMap;
-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.HashMap;
+import java.util.Locale;
+
/**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.FrameTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.FrameTag</code>
+ * class.
*/
public class TestFrameTag1 extends JspTestCase {
@@ -52,7 +49,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestFrameTag1.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestFrameTag1.class.getName() });
}
/**
@@ -65,9 +63,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/TestFrameTag1.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestFrameTag1.jsp");
}
/*
@@ -105,87 +106,97 @@
}
public void testFrameForwardNameNoScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameForwardNameNoScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameForwardNameNoScope", "");
}
public void testFrameForwardNamePropertyNoScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameForwardNamePropertyNoScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameForwardNamePropertyNoScope", "");
}
public void testFrameForwardNameApplicationScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.APPLICATION_SCOPE);
- runMyTest("testFrameForwardNameApplicationScope", "");
- }
-
- public void testFrameForwardNamePropertyApplicationScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.APPLICATION_SCOPE);
- runMyTest("testFrameForwardNamePropertyApplicationScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext
+ .setAttribute("paramMap", map, PageContext.APPLICATION_SCOPE);
+ runMyTest("testFrameForwardNameApplicationScope", "");
+ }
+
+ public void testFrameForwardNamePropertyApplicationScope()
+ throws Exception {
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testFrameForwardNamePropertyApplicationScope", "");
}
public void testFrameForwardNameSessionScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.SESSION_SCOPE);
- runMyTest("testFrameForwardNameSessionScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMap", map, PageContext.SESSION_SCOPE);
+ runMyTest("testFrameForwardNameSessionScope", "");
}
public void testFrameForwardNamePropertySessionScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.SESSION_SCOPE);
- runMyTest("testFrameForwardNamePropertySessionScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testFrameForwardNamePropertySessionScope", "");
}
public void testFrameForwardNameRequestScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameForwardNameRequestScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameForwardNameRequestScope", "");
}
public void testFrameForwardNamePropertyRequestScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameForwardNamePropertyRequestScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameForwardNamePropertyRequestScope", "");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag2.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag2.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag2.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag2.java Fri Feb 10 13:05:03 2006
@@ -17,21 +17,19 @@
*/
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.FrameTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.FrameTag</code>
+ * class.
*/
public class TestFrameTag2 extends JspTestCase {
@@ -50,7 +48,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestFrameTag2.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestFrameTag2.class.getName() });
}
/**
@@ -63,10 +62,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/TestFrameTag2.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestFrameTag2.jsp");
}
/*
@@ -74,48 +78,80 @@
*/
//--------Testing attributes using forward------
+
public void testFrameForwardParamIdParamNameNoScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.REQUEST_SCOPE);
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.REQUEST_SCOPE);
runMyTest("testFrameForwardParamIdParamNameNoScope", "");
}
- public void testFrameForwardParamIdParamNameParamPropertyNoScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.REQUEST_SCOPE);
+ public void testFrameForwardParamIdParamNameParamPropertyNoScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.REQUEST_SCOPE);
runMyTest("testFrameForwardParamIdParamNameParamPropertyNoScope", "");
}
- public void testFrameForwardParamIdParamNameApplicationScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.APPLICATION_SCOPE);
+ public void testFrameForwardParamIdParamNameApplicationScope()
+ throws Exception {
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.APPLICATION_SCOPE);
runMyTest("testFrameForwardParamIdParamNameApplicationScope", "");
}
- public void testFrameForwardParamIdParamNameParamPropertyApplicationScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.APPLICATION_SCOPE);
- runMyTest("testFrameForwardParamIdParamNameParamPropertyApplicationScope", "");
- }
-
- public void testFrameForwardParamIdParamNameSessionScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.SESSION_SCOPE);
+ public void testFrameForwardParamIdParamNameParamPropertyApplicationScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest(
+ "testFrameForwardParamIdParamNameParamPropertyApplicationScope",
+ "");
+ }
+
+ public void testFrameForwardParamIdParamNameSessionScope()
+ throws Exception {
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.SESSION_SCOPE);
runMyTest("testFrameForwardParamIdParamNameSessionScope", "");
}
- public void testFrameForwardParamIdParamNameParamPropertySessionScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.SESSION_SCOPE);
- runMyTest("testFrameForwardParamIdParamNameParamPropertySessionScope", "");
- }
-
- public void testFrameForwardParamIdParamNameRequestScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.REQUEST_SCOPE);
+ public void testFrameForwardParamIdParamNameParamPropertySessionScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testFrameForwardParamIdParamNameParamPropertySessionScope",
+ "");
+ }
+
+ public void testFrameForwardParamIdParamNameRequestScope()
+ throws Exception {
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.REQUEST_SCOPE);
runMyTest("testFrameForwardParamIdParamNameRequestScope", "");
}
- public void testFrameForwardParamIdParamNameParamPropertyRequestScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameForwardParamIdParamNameParamPropertyRequestScope", "");
+ public void testFrameForwardParamIdParamNameParamPropertyRequestScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameForwardParamIdParamNameParamPropertyRequestScope",
+ "");
}
public void testFrameForwardScrolling1() throws Exception {
@@ -169,17 +205,17 @@
public void testFrameForwardTitleKey() throws Exception {
runMyTest("testFrameForwardTitleKey", "");
}
+
public void testFrameForwardTitleKeyAlt() throws Exception {
runMyTest("testFrameForwardTitleKeyAlt", "");
}
public void testFrameForwardTransaction() throws Exception {
- pageContext.setAttribute(Globals.TRANSACTION_TOKEN_KEY, "Some_Token_Here", PageContext.SESSION_SCOPE);
+ pageContext.setAttribute(Globals.TRANSACTION_TOKEN_KEY,
+ "Some_Token_Here",
+ PageContext.SESSION_SCOPE);
runMyTest("testFrameForwardTransaction", "");
}
-
-
-
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag3.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag3.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag3.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag3.java Fri Feb 10 13:05:03 2006
@@ -17,22 +17,19 @@
*/
package org.apache.struts.taglib.html;
-import java.util.HashMap;
-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.HashMap;
+import java.util.Locale;
+
/**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.FrameTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.FrameTag</code>
+ * class.
*/
public class TestFrameTag3 extends JspTestCase {
@@ -51,7 +48,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestFrameTag3.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestFrameTag3.class.getName() });
}
/**
@@ -64,9 +62,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/TestFrameTag3.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestFrameTag3.jsp");
}
/*
@@ -104,87 +105,97 @@
}
public void testFrameActionNameNoScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameActionNameNoScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameActionNameNoScope", "");
}
public void testFrameActionNamePropertyNoScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameActionNamePropertyNoScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameActionNamePropertyNoScope", "");
}
public void testFrameActionNameApplicationScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.APPLICATION_SCOPE);
- runMyTest("testFrameActionNameApplicationScope", "");
- }
-
- public void testFrameActionNamePropertyApplicationScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.APPLICATION_SCOPE);
- runMyTest("testFrameActionNamePropertyApplicationScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext
+ .setAttribute("paramMap", map, PageContext.APPLICATION_SCOPE);
+ runMyTest("testFrameActionNameApplicationScope", "");
+ }
+
+ public void testFrameActionNamePropertyApplicationScope()
+ throws Exception {
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testFrameActionNamePropertyApplicationScope", "");
}
public void testFrameActionNameSessionScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.SESSION_SCOPE);
- runMyTest("testFrameActionNameSessionScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMap", map, PageContext.SESSION_SCOPE);
+ runMyTest("testFrameActionNameSessionScope", "");
}
public void testFrameActionNamePropertySessionScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.SESSION_SCOPE);
- runMyTest("testFrameActionNamePropertySessionScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testFrameActionNamePropertySessionScope", "");
}
public void testFrameActionNameRequestScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameActionNameRequestScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameActionNameRequestScope", "");
}
public void testFrameActionNamePropertyRequestScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameActionNamePropertyRequestScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameActionNamePropertyRequestScope", "");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag4.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag4.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag4.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag4.java Fri Feb 10 13:05:03 2006
@@ -17,21 +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.FrameTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.FrameTag</code>
+ * class.
*/
public class TestFrameTag4 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestFrameTag4.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestFrameTag4.class.getName() });
}
/**
@@ -63,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);
- request.setAttribute("runTest", whichTest);
- pageContext.forward("/org/apache/struts/taglib/html/TestFrameTag4.jsp");
+ 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/TestFrameTag4.jsp");
}
/*
@@ -74,48 +77,80 @@
*/
//--------Testing attributes using forward------
+
public void testFrameActionParamIdParamNameNoScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.REQUEST_SCOPE);
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.REQUEST_SCOPE);
runMyTest("testFrameActionParamIdParamNameNoScope", "");
}
- public void testFrameActionParamIdParamNameParamPropertyNoScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.REQUEST_SCOPE);
+ public void testFrameActionParamIdParamNameParamPropertyNoScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.REQUEST_SCOPE);
runMyTest("testFrameActionParamIdParamNameParamPropertyNoScope", "");
}
- public void testFrameActionParamIdParamNameApplicationScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.APPLICATION_SCOPE);
+ public void testFrameActionParamIdParamNameApplicationScope()
+ throws Exception {
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.APPLICATION_SCOPE);
runMyTest("testFrameActionParamIdParamNameApplicationScope", "");
}
- public void testFrameActionParamIdParamNameParamPropertyApplicationScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.APPLICATION_SCOPE);
- runMyTest("testFrameActionParamIdParamNameParamPropertyApplicationScope", "");
- }
-
- public void testFrameActionParamIdParamNameSessionScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.SESSION_SCOPE);
+ public void testFrameActionParamIdParamNameParamPropertyApplicationScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest(
+ "testFrameActionParamIdParamNameParamPropertyApplicationScope",
+ "");
+ }
+
+ public void testFrameActionParamIdParamNameSessionScope()
+ throws Exception {
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.SESSION_SCOPE);
runMyTest("testFrameActionParamIdParamNameSessionScope", "");
}
- public void testFrameActionParamIdParamNameParamPropertySessionScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.SESSION_SCOPE);
- runMyTest("testFrameActionParamIdParamNameParamPropertySessionScope", "");
- }
-
- public void testFrameActionParamIdParamNameRequestScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.REQUEST_SCOPE);
+ public void testFrameActionParamIdParamNameParamPropertySessionScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testFrameActionParamIdParamNameParamPropertySessionScope",
+ "");
+ }
+
+ public void testFrameActionParamIdParamNameRequestScope()
+ throws Exception {
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.REQUEST_SCOPE);
runMyTest("testFrameActionParamIdParamNameRequestScope", "");
}
- public void testFrameActionParamIdParamNameParamPropertyRequestScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameActionParamIdParamNameParamPropertyRequestScope", "");
+ public void testFrameActionParamIdParamNameParamPropertyRequestScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameActionParamIdParamNameParamPropertyRequestScope",
+ "");
}
public void testFrameActionScrolling1() throws Exception {
@@ -171,12 +206,11 @@
}
public void testFrameActionTransaction() throws Exception {
- pageContext.setAttribute(Globals.TRANSACTION_TOKEN_KEY, "Some_Token_Here", PageContext.SESSION_SCOPE);
+ pageContext.setAttribute(Globals.TRANSACTION_TOKEN_KEY,
+ "Some_Token_Here",
+ PageContext.SESSION_SCOPE);
runMyTest("testFrameActionTransaction", "");
}
-
-
-
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag5.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag5.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag5.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag5.java Fri Feb 10 13:05:03 2006
@@ -17,22 +17,19 @@
*/
package org.apache.struts.taglib.html;
-import java.util.HashMap;
-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.HashMap;
+import java.util.Locale;
+
/**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.FrameTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.FrameTag</code>
+ * class.
*/
public class TestFrameTag5 extends JspTestCase {
@@ -51,7 +48,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestFrameTag5.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestFrameTag5.class.getName() });
}
/**
@@ -64,9 +62,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/TestFrameTag5.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestFrameTag5.jsp");
}
/*
@@ -104,87 +105,96 @@
}
public void testFrameHrefNameNoScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameHrefNameNoScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameHrefNameNoScope", "");
}
public void testFrameHrefNamePropertyNoScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameHrefNamePropertyNoScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameHrefNamePropertyNoScope", "");
}
public void testFrameHrefNameApplicationScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.APPLICATION_SCOPE);
- runMyTest("testFrameHrefNameApplicationScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext
+ .setAttribute("paramMap", map, PageContext.APPLICATION_SCOPE);
+ runMyTest("testFrameHrefNameApplicationScope", "");
}
public void testFrameHrefNamePropertyApplicationScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.APPLICATION_SCOPE);
- runMyTest("testFrameHrefNamePropertyApplicationScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testFrameHrefNamePropertyApplicationScope", "");
}
public void testFrameHrefNameSessionScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.SESSION_SCOPE);
- runMyTest("testFrameHrefNameSessionScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMap", map, PageContext.SESSION_SCOPE);
+ runMyTest("testFrameHrefNameSessionScope", "");
}
public void testFrameHrefNamePropertySessionScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.SESSION_SCOPE);
- runMyTest("testFrameHrefNamePropertySessionScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testFrameHrefNamePropertySessionScope", "");
}
public void testFrameHrefNameRequestScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameHrefNameRequestScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameHrefNameRequestScope", "");
}
public void testFrameHrefNamePropertyRequestScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameHrefNamePropertyRequestScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameHrefNamePropertyRequestScope", "");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag6.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag6.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag6.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag6.java Fri Feb 10 13:05:03 2006
@@ -17,21 +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.FrameTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.FrameTag</code>
+ * class.
*/
public class TestFrameTag6 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestFrameTag6.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestFrameTag6.class.getName() });
}
/**
@@ -63,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/TestFrameTag6.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestFrameTag6.jsp");
}
/*
@@ -74,48 +77,77 @@
*/
//--------Testing attributes using forward------
+
public void testFrameHrefParamIdParamNameNoScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.REQUEST_SCOPE);
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.REQUEST_SCOPE);
runMyTest("testFrameHrefParamIdParamNameNoScope", "");
}
- public void testFrameHrefParamIdParamNameParamPropertyNoScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.REQUEST_SCOPE);
+ public void testFrameHrefParamIdParamNameParamPropertyNoScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.REQUEST_SCOPE);
runMyTest("testFrameHrefParamIdParamNameParamPropertyNoScope", "");
}
- public void testFrameHrefParamIdParamNameApplicationScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.APPLICATION_SCOPE);
+ public void testFrameHrefParamIdParamNameApplicationScope()
+ throws Exception {
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.APPLICATION_SCOPE);
runMyTest("testFrameHrefParamIdParamNameApplicationScope", "");
}
- public void testFrameHrefParamIdParamNameParamPropertyApplicationScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.APPLICATION_SCOPE);
- runMyTest("testFrameHrefParamIdParamNameParamPropertyApplicationScope", "");
+ public void testFrameHrefParamIdParamNameParamPropertyApplicationScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testFrameHrefParamIdParamNameParamPropertyApplicationScope",
+ "");
}
public void testFrameHrefParamIdParamNameSessionScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.SESSION_SCOPE);
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.SESSION_SCOPE);
runMyTest("testFrameHrefParamIdParamNameSessionScope", "");
}
- public void testFrameHrefParamIdParamNameParamPropertySessionScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.SESSION_SCOPE);
- runMyTest("testFrameHrefParamIdParamNameParamPropertySessionScope", "");
+ public void testFrameHrefParamIdParamNameParamPropertySessionScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testFrameHrefParamIdParamNameParamPropertySessionScope",
+ "");
}
public void testFrameHrefParamIdParamNameRequestScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.REQUEST_SCOPE);
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.REQUEST_SCOPE);
runMyTest("testFrameHrefParamIdParamNameRequestScope", "");
}
- public void testFrameHrefParamIdParamNameParamPropertyRequestScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testFrameHrefParamIdParamNameParamPropertyRequestScope", "");
+ public void testFrameHrefParamIdParamNameParamPropertyRequestScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testFrameHrefParamIdParamNameParamPropertyRequestScope",
+ "");
}
public void testFrameHrefScrolling1() throws Exception {
@@ -171,12 +203,11 @@
}
public void testFrameHrefTransaction() throws Exception {
- pageContext.setAttribute(Globals.TRANSACTION_TOKEN_KEY, "Some_Token_Here", PageContext.SESSION_SCOPE);
+ pageContext.setAttribute(Globals.TRANSACTION_TOKEN_KEY,
+ "Some_Token_Here",
+ PageContext.SESSION_SCOPE);
runMyTest("testFrameHrefTransaction", "");
}
-
-
-
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag7.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag7.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag7.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag7.java Fri Feb 10 13:05:03 2006
@@ -17,22 +17,19 @@
*/
package org.apache.struts.taglib.html;
-import java.util.HashMap;
-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.HashMap;
+import java.util.Locale;
+
/**
- * Suite of unit tests for the
- * <code>org.apache.struts.taglib.html.FrameTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.FrameTag</code>
+ * class.
*/
public class TestFrameTag7 extends JspTestCase {
@@ -51,7 +48,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestFrameTag7.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestFrameTag7.class.getName() });
}
/**
@@ -64,9 +62,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/TestFrameTag7.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestFrameTag7.jsp");
}
/*
@@ -104,87 +105,96 @@
}
public void testFramePageNameNoScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
- runMyTest("testFramePageNameNoScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
+ runMyTest("testFramePageNameNoScope", "");
}
public void testFramePageNamePropertyNoScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testFramePageNamePropertyNoScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testFramePageNamePropertyNoScope", "");
}
public void testFramePageNameApplicationScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.APPLICATION_SCOPE);
- runMyTest("testFramePageNameApplicationScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext
+ .setAttribute("paramMap", map, PageContext.APPLICATION_SCOPE);
+ runMyTest("testFramePageNameApplicationScope", "");
}
public void testFramePageNamePropertyApplicationScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.APPLICATION_SCOPE);
- runMyTest("testFramePageNamePropertyApplicationScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testFramePageNamePropertyApplicationScope", "");
}
public void testFramePageNameSessionScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.SESSION_SCOPE);
- runMyTest("testFramePageNameSessionScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMap", map, PageContext.SESSION_SCOPE);
+ runMyTest("testFramePageNameSessionScope", "");
}
public void testFramePageNamePropertySessionScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.SESSION_SCOPE);
- runMyTest("testFramePageNamePropertySessionScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testFramePageNamePropertySessionScope", "");
}
public void testFramePageNameRequestScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
- runMyTest("testFramePageNameRequestScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMap", map, PageContext.REQUEST_SCOPE);
+ runMyTest("testFramePageNameRequestScope", "");
}
public void testFramePageNamePropertyRequestScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
- pageContext.setAttribute("paramPropertyMap", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testFramePageNamePropertyRequestScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ SimpleBeanForTesting sbft = new SimpleBeanForTesting(map);
+ pageContext.setAttribute("paramPropertyMap",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testFramePageNamePropertyRequestScope", "");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag8.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag8.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag8.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestFrameTag8.java Fri Feb 10 13:05:03 2006
@@ -17,21 +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.FrameTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.FrameTag</code>
+ * class.
*/
public class TestFrameTag8 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestFrameTag8.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestFrameTag8.class.getName() });
}
/**
@@ -63,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/TestFrameTag8.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestFrameTag8.jsp");
}
/*
@@ -74,48 +77,77 @@
*/
//--------Testing attributes using forward------
+
public void testFramePageParamIdParamNameNoScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.REQUEST_SCOPE);
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.REQUEST_SCOPE);
runMyTest("testFramePageParamIdParamNameNoScope", "");
}
- public void testFramePageParamIdParamNameParamPropertyNoScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.REQUEST_SCOPE);
+ public void testFramePageParamIdParamNameParamPropertyNoScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.REQUEST_SCOPE);
runMyTest("testFramePageParamIdParamNameParamPropertyNoScope", "");
}
- public void testFramePageParamIdParamNameApplicationScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.APPLICATION_SCOPE);
+ public void testFramePageParamIdParamNameApplicationScope()
+ throws Exception {
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.APPLICATION_SCOPE);
runMyTest("testFramePageParamIdParamNameApplicationScope", "");
}
- public void testFramePageParamIdParamNameParamPropertyApplicationScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.APPLICATION_SCOPE);
- runMyTest("testFramePageParamIdParamNameParamPropertyApplicationScope", "");
+ public void testFramePageParamIdParamNameParamPropertyApplicationScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testFramePageParamIdParamNameParamPropertyApplicationScope",
+ "");
}
public void testFramePageParamIdParamNameSessionScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.SESSION_SCOPE);
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.SESSION_SCOPE);
runMyTest("testFramePageParamIdParamNameSessionScope", "");
}
- public void testFramePageParamIdParamNameParamPropertySessionScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.SESSION_SCOPE);
- runMyTest("testFramePageParamIdParamNameParamPropertySessionScope", "");
+ public void testFramePageParamIdParamNameParamPropertySessionScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testFramePageParamIdParamNameParamPropertySessionScope",
+ "");
}
public void testFramePageParamIdParamNameRequestScope() throws Exception {
- pageContext.setAttribute("paramName", "paramValue", PageContext.REQUEST_SCOPE);
+ pageContext.setAttribute("paramName",
+ "paramValue",
+ PageContext.REQUEST_SCOPE);
runMyTest("testFramePageParamIdParamNameRequestScope", "");
}
- public void testFramePageParamIdParamNameParamPropertyRequestScope() throws Exception {
- SimpleBeanForTesting sbft = new SimpleBeanForTesting("paramPropertyValue");
- pageContext.setAttribute("testingParamProperty", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testFramePageParamIdParamNameParamPropertyRequestScope", "");
+ public void testFramePageParamIdParamNameParamPropertyRequestScope()
+ throws Exception {
+ SimpleBeanForTesting sbft =
+ new SimpleBeanForTesting("paramPropertyValue");
+ pageContext.setAttribute("testingParamProperty",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testFramePageParamIdParamNameParamPropertyRequestScope",
+ "");
}
public void testFramePageScrolling1() throws Exception {
@@ -171,12 +203,11 @@
}
public void testFramePageTransaction() throws Exception {
- pageContext.setAttribute(Globals.TRANSACTION_TOKEN_KEY, "Some_Token_Here", PageContext.SESSION_SCOPE);
+ pageContext.setAttribute(Globals.TRANSACTION_TOKEN_KEY,
+ "Some_Token_Here",
+ PageContext.SESSION_SCOPE);
runMyTest("testFramePageTransaction", "");
}
-
-
-
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHiddenTag1.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHiddenTag1.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHiddenTag1.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHiddenTag1.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.HiddenTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.HiddenTag</code>
+ * class.
*/
public class TestHiddenTag1 extends JspTestCase {
@@ -49,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestHiddenTag1.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestHiddenTag1.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/TestHiddenTag1.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestHiddenTag1.jsp");
}
/*
@@ -73,78 +77,86 @@
*/
public void testHiddenProperty() throws Exception {
runMyTest("testHiddenProperty", "");
- }
+ }
+
public void testHiddenPropertyAccesskey() throws Exception {
runMyTest("testHiddenPropertyAccesskey", "");
- }
+ }
+
public void testHiddenPropertyAlt() throws Exception {
runMyTest("testHiddenPropertyAlt", "");
- }
+ }
+
public void testHiddenPropertyAltKey1() throws Exception {
runMyTest("testHiddenPropertyAltKey1", "");
- }
+ }
+
public void testHiddenPropertyAltKey2() throws Exception {
runMyTest("testHiddenPropertyAltKey2", "");
- }
+ }
+
public void testHiddenPropertyAltKey3() throws Exception {
runMyTest("testHiddenPropertyAltKey3", "");
}
+
public void testHiddenPropertyAltKey_fr1() throws Exception {
runMyTest("testHiddenPropertyAltKey1_fr", "fr");
- }
+ }
+
public void testHiddenPropertyAltKey_fr2() throws Exception {
runMyTest("testHiddenPropertyAltKey2_fr", "fr");
- }
+ }
+
public void testHiddenPropertyOnblur() throws Exception {
runMyTest("testHiddenPropertyOnblur", "");
- }
+ }
public void testHiddenPropertyOnchange() throws Exception {
runMyTest("testHiddenPropertyOnchange", "");
- }
+ }
public void testHiddenPropertyOnclick() throws Exception {
runMyTest("testHiddenPropertyOnclick", "");
- }
+ }
public void testHiddenPropertyOndblclick() throws Exception {
runMyTest("testHiddenPropertyOndblclick", "");
- }
+ }
public void testHiddenPropertyOnfocus() throws Exception {
runMyTest("testHiddenPropertyOnfocus", "");
- }
+ }
public void testHiddenPropertyOnkeydown() throws Exception {
runMyTest("testHiddenPropertyOnkeydown", "");
- }
+ }
public void testHiddenPropertyOnkeypress() throws Exception {
runMyTest("testHiddenPropertyOnkeypress", "");
- }
+ }
public void testHiddenPropertyOnkeyup() throws Exception {
runMyTest("testHiddenPropertyOnkeyup", "");
- }
+ }
public void testHiddenPropertyOnmousedown() throws Exception {
runMyTest("testHiddenPropertyOnmousedown", "");
- }
+ }
public void testHiddenPropertyOnmousemove() throws Exception {
runMyTest("testHiddenPropertyOnmousemove", "");
- }
+ }
public void testHiddenPropertyOnmouseout() throws Exception {
runMyTest("testHiddenPropertyOnmouseout", "");
- }
+ }
public void testHiddenPropertyOnmouseover() throws Exception {
runMyTest("testHiddenPropertyOnmouseover", "");
- }
+ }
public void testHiddenPropertyOnmouseup() throws Exception {
runMyTest("testHiddenPropertyOnmouseup", "");
- }
+ }
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHiddenTag2.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHiddenTag2.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHiddenTag2.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestHiddenTag2.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.HiddenTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.HiddenTag</code>
+ * class.
*/
public class TestHiddenTag2 extends JspTestCase {
@@ -52,7 +50,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestHiddenTag2.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestHiddenTag2.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/TestHiddenTag2.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestHiddenTag2.jsp");
}
/*
@@ -77,38 +81,38 @@
public void testHiddenPropertyStyle() throws Exception {
runMyTest("testHiddenPropertyStyle", "");
- }
+ }
public void testHiddenPropertyStyleClass() throws Exception {
runMyTest("testHiddenPropertyStyleClass", "");
- }
+ }
public void testHiddenPropertyStyleId() throws Exception {
runMyTest("testHiddenPropertyStyleId", "");
- }
+ }
public void testHiddenPropertyTitle() throws Exception {
runMyTest("testHiddenPropertyTitle", "");
- }
+ }
public void testHiddenPropertyTitleKey() throws Exception {
runMyTest("testHiddenPropertyTitleKey", "");
- }
+ }
public void testHiddenPropertyTitleKey_fr() throws Exception {
runMyTest("testHiddenPropertyTitleKey_fr", "fr");
- }
+ }
public void testHiddenPropertyValue() throws Exception {
runMyTest("testHiddenPropertyValue", "");
- }
+ }
public void testHiddenPropertyIndexedArray() throws Exception {
ArrayList lst = new ArrayList();
lst.add("Test Message");
pageContext.setAttribute("lst", lst, PageContext.REQUEST_SCOPE);
runMyTest("testHiddenPropertyIndexedArray", "");
- }
+ }
public void testHiddenPropertyIndexedArrayProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -117,14 +121,14 @@
sbft.setList(lst);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testHiddenPropertyIndexedArrayProperty", "");
- }
+ }
public void testHiddenPropertyIndexedMap() throws Exception {
HashMap map = new HashMap();
map.put("tst1", "Test Message");
pageContext.setAttribute("lst", map, PageContext.REQUEST_SCOPE);
runMyTest("testHiddenPropertyIndexedMap", "");
- }
+ }
public void testHiddenPropertyIndexedMapProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -133,22 +137,22 @@
sbft.setMap(map);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testHiddenPropertyIndexedMapProperty", "");
- }
+ }
public void testHiddenPropertyIndexedEnumeration() throws Exception {
StringTokenizer st = new StringTokenizer("Test Message");
pageContext.setAttribute("lst", st, PageContext.REQUEST_SCOPE);
runMyTest("testHiddenPropertyIndexedEnumeration", "");
- }
+ }
- public void testHiddenPropertyIndexedEnumerationProperty() throws Exception {
+ public void testHiddenPropertyIndexedEnumerationProperty()
+ throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
StringTokenizer st = new StringTokenizer("Test Message");
sbft.setEnumeration(st);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testHiddenPropertyIndexedEnumerationProperty", "");
- }
-
+ }
}
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=376846&r1=376845&r2=376846&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 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.HtmlTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.HtmlTag</code>
+ * class.
*/
public class TestHtmlTag extends JspTestCase {
@@ -49,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestHtmlTag.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestHtmlTag.class.getName() });
}
/**
@@ -62,8 +61,12 @@
}
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/TestHtmlTag.jsp");
}
@@ -73,30 +76,30 @@
*/
public void testHtml() throws Exception {
runMyTest("testHtml", "");
- }
+ }
public void testHtmlXhtml1() throws Exception {
runMyTest("testHtmlXhtml1", "");
- }
+ }
public void testHtmlXhtml2() throws Exception {
runMyTest("testHtmlXhtml2", "");
- }
+ }
public void testHtmlXhtml3() throws Exception {
runMyTest("testHtmlXhtml3", "");
- }
+ }
public void testHtmlXhtml4() throws Exception {
runMyTest("testHtmlXhtml4", "");
- }
+ }
public void testHtmlXhtml5() throws Exception {
runMyTest("testHtmlXhtml5", "");
- }
+ }
public void testHtmlXhtml6() throws Exception {
runMyTest("testHtmlXhtml6", "");
- }
+ }
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag1.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag1.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag1.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag1.java Fri Feb 10 13:05:03 2006
@@ -17,21 +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.ImageTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImageTag</code>
+ * class.
*/
public class TestImageTag1 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImageTag1.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImageTag1.class.getName() });
}
/**
@@ -63,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/TestImageTag1.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestImageTag1.jsp");
}
/*
@@ -132,7 +135,9 @@
}
public void testImagePageLocale() throws Exception {
- pageContext.setAttribute("secret locale", new Locale("fr", "fr"), PageContext.SESSION_SCOPE);
+ pageContext.setAttribute("secret locale",
+ new Locale("fr", "fr"),
+ PageContext.SESSION_SCOPE);
runMyTest("testImagePageLocale", "");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org