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 [8/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/TestImageTag2.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag2.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag2.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag2.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.ImageTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImageTag</code>
+ * class.
*/
public class TestImageTag2 extends JspTestCase {
@@ -52,7 +50,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImageTag2.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImageTag2.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/TestImageTag2.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestImageTag2.jsp");
}
/*
@@ -142,7 +146,7 @@
lst.add("Test Message");
pageContext.setAttribute("lst", lst, PageContext.REQUEST_SCOPE);
runMyTest("testImagePageIndexedArray", "");
- }
+ }
public void testImagePageIndexedArrayProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -151,14 +155,14 @@
sbft.setList(lst);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testImagePageIndexedArrayProperty", "");
- }
+ }
public void testImagePageIndexedMap() throws Exception {
HashMap map = new HashMap();
map.put("tst1", "Test Message");
pageContext.setAttribute("lst", map, PageContext.REQUEST_SCOPE);
runMyTest("testImagePageIndexedMap", "");
- }
+ }
public void testImagePageIndexedMapProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -167,13 +171,13 @@
sbft.setMap(map);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testImagePageIndexedMapProperty", "");
- }
+ }
public void testImagePageIndexedEnumeration() throws Exception {
StringTokenizer st = new StringTokenizer("Test Message");
pageContext.setAttribute("lst", st, PageContext.REQUEST_SCOPE);
runMyTest("testImagePageIndexedEnumeration", "");
- }
+ }
public void testImagePageIndexedEnumerationProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -181,9 +185,7 @@
sbft.setEnumeration(st);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testImagePageIndexedEnumerationProperty", "");
- }
-
-
+ }
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag3.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag3.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag3.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag3.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 TestImageTag3 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImageTag3.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImageTag3.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/TestImageTag3.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestImageTag3.jsp");
}
/*
@@ -140,12 +143,16 @@
}
public void testImagePageKeyLocaleDefaultBundle_fr() 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("testImagePageKeyLocaleDefaultBundle_fr", "");
}
public void testImagePageKeyLocaleAlternateBundle_fr() 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("testImagePageKeyLocaleAlternateBundle_fr", "");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag4.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag4.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag4.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag4.java Fri Feb 10 13:05:03 2006
@@ -17,24 +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.ImageTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImageTag</code>
+ * class.
*/
public class TestImageTag4 extends JspTestCase {
@@ -53,7 +50,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImageTag4.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImageTag4.class.getName() });
}
/**
@@ -66,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/TestImageTag4.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestImageTag4.jsp");
}
/*
@@ -134,7 +137,8 @@
runMyTest("testImagePageKeyTitleKeyDefaultBundle_fr", "fr");
}
- public void testImagePageKeyTitleKeyAlternateBundle_fr() throws Exception {
+ public void testImagePageKeyTitleKeyAlternateBundle_fr()
+ throws Exception {
runMyTest("testImagePageKeyTitleKeyAlternateBundle_fr", "fr");
}
@@ -143,7 +147,7 @@
lst.add("Test Message");
pageContext.setAttribute("lst", lst, PageContext.REQUEST_SCOPE);
runMyTest("testImagePageKeyIndexedArray", "");
- }
+ }
public void testImagePageKeyIndexedArrayProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -152,14 +156,14 @@
sbft.setList(lst);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testImagePageKeyIndexedArrayProperty", "");
- }
+ }
public void testImagePageKeyIndexedMap() throws Exception {
HashMap map = new HashMap();
map.put("tst1", "Test Message");
pageContext.setAttribute("lst", map, PageContext.REQUEST_SCOPE);
runMyTest("testImagePageKeyIndexedMap", "");
- }
+ }
public void testImagePageKeyIndexedMapProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -168,24 +172,22 @@
sbft.setMap(map);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testImagePageKeyIndexedMapProperty", "");
- }
+ }
public void testImagePageKeyIndexedEnumeration() throws Exception {
StringTokenizer st = new StringTokenizer("Test Message");
pageContext.setAttribute("lst", st, PageContext.REQUEST_SCOPE);
runMyTest("testImagePageKeyIndexedEnumeration", "");
- }
+ }
- public void testImagePageKeyIndexedEnumerationProperty() throws Exception {
+ public void testImagePageKeyIndexedEnumerationProperty()
+ throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
StringTokenizer st = new StringTokenizer("Test Message");
sbft.setEnumeration(st);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testImagePageKeyIndexedEnumerationProperty", "");
- }
-
-
-
+ }
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag5.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag5.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag5.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag5.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 TestImageTag5 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImageTag5.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImageTag5.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/TestImageTag5.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestImageTag5.jsp");
}
/*
@@ -132,7 +135,9 @@
}
public void testImageSrcLocale() 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("testImageSrcLocale", "");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag6.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag6.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag6.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag6.java Fri Feb 10 13:05:03 2006
@@ -17,24 +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.ImageTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImageTag</code>
+ * class.
*/
public class TestImageTag6 extends JspTestCase {
@@ -53,7 +50,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImageTag6.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImageTag6.class.getName() });
}
/**
@@ -66,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/TestImageTag6.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestImageTag6.jsp");
}
/*
@@ -143,7 +146,7 @@
lst.add("Test Message");
pageContext.setAttribute("lst", lst, PageContext.REQUEST_SCOPE);
runMyTest("testImageSrcIndexedArray", "");
- }
+ }
public void testImageSrcIndexedArrayProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -152,14 +155,14 @@
sbft.setList(lst);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testImageSrcIndexedArrayProperty", "");
- }
+ }
public void testImageSrcIndexedMap() throws Exception {
HashMap map = new HashMap();
map.put("tst1", "Test Message");
pageContext.setAttribute("lst", map, PageContext.REQUEST_SCOPE);
runMyTest("testImageSrcIndexedMap", "");
- }
+ }
public void testImageSrcIndexedMapProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -168,13 +171,13 @@
sbft.setMap(map);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testImageSrcIndexedMapProperty", "");
- }
+ }
public void testImageSrcIndexedEnumeration() throws Exception {
StringTokenizer st = new StringTokenizer("Test Message");
pageContext.setAttribute("lst", st, PageContext.REQUEST_SCOPE);
runMyTest("testImageSrcIndexedEnumeration", "");
- }
+ }
public void testImageSrcIndexedEnumerationProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -182,9 +185,7 @@
sbft.setEnumeration(st);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testImageSrcIndexedEnumerationProperty", "");
- }
-
-
+ }
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag7.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag7.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag7.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag7.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 TestImageTag7 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImageTag7.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImageTag7.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/TestImageTag7.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestImageTag7.jsp");
}
/*
@@ -140,12 +143,16 @@
}
public void testImageSrcKeyLocaleDefaultBundle_fr() 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("testImageSrcKeyLocaleDefaultBundle_fr", "");
}
public void testImageSrcKeyLocaleAlternateBundle_fr() 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("testImageSrcKeyLocaleAlternateBundle_fr", "");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag8.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag8.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag8.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImageTag8.java Fri Feb 10 13:05:03 2006
@@ -17,24 +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.ImageTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImageTag</code>
+ * class.
*/
public class TestImageTag8 extends JspTestCase {
@@ -53,7 +50,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImageTag8.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImageTag8.class.getName() });
}
/**
@@ -66,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/TestImageTag8.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestImageTag8.jsp");
}
/*
@@ -143,7 +146,7 @@
lst.add("Test Message");
pageContext.setAttribute("lst", lst, PageContext.REQUEST_SCOPE);
runMyTest("testImageSrcKeyIndexedArray", "");
- }
+ }
public void testImageSrcKeyIndexedArrayProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -152,14 +155,14 @@
sbft.setList(lst);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testImageSrcKeyIndexedArrayProperty", "");
- }
+ }
public void testImageSrcKeyIndexedMap() throws Exception {
HashMap map = new HashMap();
map.put("tst1", "Test Message");
pageContext.setAttribute("lst", map, PageContext.REQUEST_SCOPE);
runMyTest("testImageSrcKeyIndexedMap", "");
- }
+ }
public void testImageSrcKeyIndexedMapProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -168,13 +171,13 @@
sbft.setMap(map);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testImageSrcKeyIndexedMapProperty", "");
- }
+ }
public void testImageSrcKeyIndexedEnumeration() throws Exception {
StringTokenizer st = new StringTokenizer("Test Message");
pageContext.setAttribute("lst", st, PageContext.REQUEST_SCOPE);
runMyTest("testImageSrcKeyIndexedEnumeration", "");
- }
+ }
public void testImageSrcKeyIndexedEnumerationProperty() throws Exception {
SimpleBeanForTesting sbft = new SimpleBeanForTesting();
@@ -182,10 +185,7 @@
sbft.setEnumeration(st);
pageContext.setAttribute("lst", sbft, PageContext.REQUEST_SCOPE);
runMyTest("testImageSrcKeyIndexedEnumerationProperty", "");
- }
-
-
-
+ }
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag1.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag1.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag1.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag1.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.ImgTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImgTag</code>
+ * class.
*/
public class TestImgTag1 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImgTag1.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImgTag1.class.getName() });
}
/**
@@ -63,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/TestImgTag1.jsp");
}
@@ -160,7 +162,9 @@
}
public void testImgPageLocale() 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("testImgPageLocale", "");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag1a.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag1a.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag1a.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag1a.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.ImgTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImgTag</code>
+ * class.
*/
public class TestImgTag1a extends JspTestCase {
@@ -51,7 +48,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImgTag1a.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImgTag1a.class.getName() });
}
/**
@@ -64,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/TestImgTag1a.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestImgTag1a.jsp");
}
/*
@@ -77,89 +80,104 @@
//--------Testing attributes using page------
public void testImgPageNameNoScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapNoScope", map, PageContext.REQUEST_SCOPE);
- runMyTest("testImgPageNameNoScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapNoScope",
+ map,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgPageNameNoScope", "");
}
public void testImgPageNamePropertyNoScope() 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("paramPropertyMapNoScope", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testImgPageNamePropertyNoScope", "");
+ 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("paramPropertyMapNoScope",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgPageNamePropertyNoScope", "");
}
public void testImgPageNameApplicationScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapApplicationScope", map, PageContext.APPLICATION_SCOPE);
- runMyTest("testImgPageNameApplicationScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapApplicationScope",
+ map,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testImgPageNameApplicationScope", "");
}
public void testImgPageNamePropertyApplicationScope() 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("paramPropertyMapApplicationScope", sbft, PageContext.APPLICATION_SCOPE);
- runMyTest("testImgPageNamePropertyApplicationScope", "");
+ 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("paramPropertyMapApplicationScope",
+ sbft,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testImgPageNamePropertyApplicationScope", "");
}
public void testImgPageNameSessionScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapSessionScope", map, PageContext.SESSION_SCOPE);
- runMyTest("testImgPageNameSessionScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapSessionScope",
+ map,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testImgPageNameSessionScope", "");
}
public void testImgPageNamePropertySessionScope() 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("paramPropertyMapSessionScope", sbft, PageContext.SESSION_SCOPE);
- runMyTest("testImgPageNamePropertySessionScope", "");
+ 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("paramPropertyMapSessionScope",
+ sbft,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testImgPageNamePropertySessionScope", "");
}
public void testImgPageNameRequestScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapRequestScope", map, PageContext.REQUEST_SCOPE);
- runMyTest("testImgPageNameRequestScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapRequestScope",
+ map,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgPageNameRequestScope", "");
}
public void testImgPageNamePropertyRequestScope() 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("paramPropertyMapRequestScope", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testImgPageNamePropertyRequestScope", "");
+ 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("paramPropertyMapRequestScope",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgPageNamePropertyRequestScope", "");
}
-
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag2.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag2.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag2.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag2.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.ImgTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImgTag</code>
+ * class.
*/
public class TestImgTag2 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImgTag2.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImgTag2.class.getName() });
}
/**
@@ -63,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/TestImgTag2.jsp");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag3.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag3.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag3.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag3.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.ImgTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImgTag</code>
+ * class.
*/
public class TestImgTag3 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImgTag3.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImgTag3.class.getName() });
}
/**
@@ -63,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/TestImgTag3.jsp");
}
@@ -160,7 +162,9 @@
}
public void testImgPageKeyLocale() 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("testImgPageKeyLocale", "");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag3a.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag3a.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag3a.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag3a.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.ImgTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImgTag</code>
+ * class.
*/
public class TestImgTag3a extends JspTestCase {
@@ -51,7 +48,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImgTag3a.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImgTag3a.class.getName() });
}
/**
@@ -64,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/TestImgTag3a.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestImgTag3a.jsp");
}
/*
@@ -77,89 +80,105 @@
//--------Testing attributes using page------
public void testImgPageKeyNameNoScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapNoScope", map, PageContext.REQUEST_SCOPE);
- runMyTest("testImgPageKeyNameNoScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapNoScope",
+ map,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgPageKeyNameNoScope", "");
}
public void testImgPageKeyNamePropertyNoScope() 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("paramPropertyMapNoScope", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testImgPageKeyNamePropertyNoScope", "");
+ 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("paramPropertyMapNoScope",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgPageKeyNamePropertyNoScope", "");
}
public void testImgPageKeyNameApplicationScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapApplicationScope", map, PageContext.APPLICATION_SCOPE);
- runMyTest("testImgPageKeyNameApplicationScope", "");
- }
-
- public void testImgPageKeyNamePropertyApplicationScope() 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("paramPropertyMapApplicationScope", sbft, PageContext.APPLICATION_SCOPE);
- runMyTest("testImgPageKeyNamePropertyApplicationScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapApplicationScope",
+ map,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testImgPageKeyNameApplicationScope", "");
+ }
+
+ public void testImgPageKeyNamePropertyApplicationScope()
+ 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("paramPropertyMapApplicationScope",
+ sbft,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testImgPageKeyNamePropertyApplicationScope", "");
}
public void testImgPageKeyNameSessionScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapSessionScope", map, PageContext.SESSION_SCOPE);
- runMyTest("testImgPageKeyNameSessionScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapSessionScope",
+ map,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testImgPageKeyNameSessionScope", "");
}
public void testImgPageKeyNamePropertySessionScope() 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("paramPropertyMapSessionScope", sbft, PageContext.SESSION_SCOPE);
- runMyTest("testImgPageKeyNamePropertySessionScope", "");
+ 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("paramPropertyMapSessionScope",
+ sbft,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testImgPageKeyNamePropertySessionScope", "");
}
public void testImgPageKeyNameRequestScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapRequestScope", map, PageContext.REQUEST_SCOPE);
- runMyTest("testImgPageKeyNameRequestScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapRequestScope",
+ map,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgPageKeyNameRequestScope", "");
}
public void testImgPageKeyNamePropertyRequestScope() 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("paramPropertyMapRequestScope", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testImgPageKeyNamePropertyRequestScope", "");
+ 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("paramPropertyMapRequestScope",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgPageKeyNamePropertyRequestScope", "");
}
-
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag4.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag4.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag4.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag4.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.ImgTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImgTag</code>
+ * class.
*/
public class TestImgTag4 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImgTag4.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImgTag4.class.getName() });
}
/**
@@ -63,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/TestImgTag4.jsp");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag5.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag5.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag5.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag5.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.ImgTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImgTag</code>
+ * class.
*/
public class TestImgTag5 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImgTag5.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImgTag5.class.getName() });
}
/**
@@ -63,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/TestImgTag5.jsp");
}
@@ -160,11 +162,11 @@
}
public void testImgSrcLocale() 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("testImgSrcLocale", "");
}
-
-
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag5a.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag5a.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag5a.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag5a.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.ImgTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImgTag</code>
+ * class.
*/
public class TestImgTag5a extends JspTestCase {
@@ -51,7 +48,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImgTag5a.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImgTag5a.class.getName() });
}
/**
@@ -64,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/TestImgTag5a.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestImgTag5a.jsp");
}
/*
@@ -77,89 +80,104 @@
//--------Testing attributes using page------
public void testImgSrcNameNoScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapNoScope", map, PageContext.REQUEST_SCOPE);
- runMyTest("testImgSrcNameNoScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapNoScope",
+ map,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgSrcNameNoScope", "");
}
public void testImgSrcNamePropertyNoScope() 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("paramPropertyMapNoScope", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testImgSrcNamePropertyNoScope", "");
+ 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("paramPropertyMapNoScope",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgSrcNamePropertyNoScope", "");
}
public void testImgSrcNameApplicationScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapApplicationScope", map, PageContext.APPLICATION_SCOPE);
- runMyTest("testImgSrcNameApplicationScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapApplicationScope",
+ map,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testImgSrcNameApplicationScope", "");
}
public void testImgSrcNamePropertyApplicationScope() 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("paramPropertyMapApplicationScope", sbft, PageContext.APPLICATION_SCOPE);
- runMyTest("testImgSrcNamePropertyApplicationScope", "");
+ 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("paramPropertyMapApplicationScope",
+ sbft,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testImgSrcNamePropertyApplicationScope", "");
}
public void testImgSrcNameSessionScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapSessionScope", map, PageContext.SESSION_SCOPE);
- runMyTest("testImgSrcNameSessionScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapSessionScope",
+ map,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testImgSrcNameSessionScope", "");
}
public void testImgSrcNamePropertySessionScope() 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("paramPropertyMapSessionScope", sbft, PageContext.SESSION_SCOPE);
- runMyTest("testImgSrcNamePropertySessionScope", "");
+ 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("paramPropertyMapSessionScope",
+ sbft,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testImgSrcNamePropertySessionScope", "");
}
public void testImgSrcNameRequestScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapRequestScope", map, PageContext.REQUEST_SCOPE);
- runMyTest("testImgSrcNameRequestScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapRequestScope",
+ map,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgSrcNameRequestScope", "");
}
public void testImgSrcNamePropertyRequestScope() 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("paramPropertyMapRequestScope", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testImgSrcNamePropertyRequestScope", "");
+ 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("paramPropertyMapRequestScope",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgSrcNamePropertyRequestScope", "");
}
-
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag6.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag6.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag6.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag6.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.ImgTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImgTag</code>
+ * class.
*/
public class TestImgTag6 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImgTag6.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImgTag6.class.getName() });
}
/**
@@ -63,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/TestImgTag6.jsp");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag7.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag7.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag7.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag7.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.ImgTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImgTag</code>
+ * class.
*/
public class TestImgTag7 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImgTag7.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImgTag7.class.getName() });
}
/**
@@ -63,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/TestImgTag7.jsp");
}
@@ -160,7 +162,9 @@
}
public void testImgSrcKeyLocale() 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("testImgSrcKeyLocale", "");
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag7a.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag7a.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag7a.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag7a.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.ImgTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImgTag</code>
+ * class.
*/
public class TestImgTag7a extends JspTestCase {
@@ -51,7 +48,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImgTag7a.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImgTag7a.class.getName() });
}
/**
@@ -64,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/TestImgTag7a.jsp");
+ pageContext
+ .forward("/org/apache/struts/taglib/html/TestImgTag7a.jsp");
}
/*
@@ -77,89 +80,104 @@
//--------Testing attributes using page------
public void testImgSrcKeyNameNoScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapNoScope", map, PageContext.REQUEST_SCOPE);
- runMyTest("testImgSrcKeyNameNoScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapNoScope",
+ map,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgSrcKeyNameNoScope", "");
}
public void testImgSrcKeyNamePropertyNoScope() 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("paramPropertyMapNoScope", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testImgSrcKeyNamePropertyNoScope", "");
+ 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("paramPropertyMapNoScope",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgSrcKeyNamePropertyNoScope", "");
}
public void testImgSrcKeyNameApplicationScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapApplicationScope", map, PageContext.APPLICATION_SCOPE);
- runMyTest("testImgSrcKeyNameApplicationScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapApplicationScope",
+ map,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testImgSrcKeyNameApplicationScope", "");
}
public void testImgSrcKeyNamePropertyApplicationScope() 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("paramPropertyMapApplicationScope", sbft, PageContext.APPLICATION_SCOPE);
- runMyTest("testImgSrcKeyNamePropertyApplicationScope", "");
+ 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("paramPropertyMapApplicationScope",
+ sbft,
+ PageContext.APPLICATION_SCOPE);
+ runMyTest("testImgSrcKeyNamePropertyApplicationScope", "");
}
public void testImgSrcKeyNameSessionScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapSessionScope", map, PageContext.SESSION_SCOPE);
- runMyTest("testImgSrcKeyNameSessionScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapSessionScope",
+ map,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testImgSrcKeyNameSessionScope", "");
}
public void testImgSrcKeyNamePropertySessionScope() 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("paramPropertyMapSessionScope", sbft, PageContext.SESSION_SCOPE);
- runMyTest("testImgSrcKeyNamePropertySessionScope", "");
+ 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("paramPropertyMapSessionScope",
+ sbft,
+ PageContext.SESSION_SCOPE);
+ runMyTest("testImgSrcKeyNamePropertySessionScope", "");
}
public void testImgSrcKeyNameRequestScope() throws Exception {
- HashMap map = new HashMap();
- map.put("param1","value1");
- map.put("param2","value2");
- map.put("param3","value3");
- map.put("param4","value4");
- pageContext.setAttribute("paramMapRequestScope", map, PageContext.REQUEST_SCOPE);
- runMyTest("testImgSrcKeyNameRequestScope", "");
+ HashMap map = new HashMap();
+ map.put("param1", "value1");
+ map.put("param2", "value2");
+ map.put("param3", "value3");
+ map.put("param4", "value4");
+ pageContext.setAttribute("paramMapRequestScope",
+ map,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgSrcKeyNameRequestScope", "");
}
public void testImgSrcKeyNamePropertyRequestScope() 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("paramPropertyMapRequestScope", sbft, PageContext.REQUEST_SCOPE);
- runMyTest("testImgSrcKeyNamePropertyRequestScope", "");
+ 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("paramPropertyMapRequestScope",
+ sbft,
+ PageContext.REQUEST_SCOPE);
+ runMyTest("testImgSrcKeyNamePropertyRequestScope", "");
}
-
}
Modified: struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag8.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag8.java?rev=376846&r1=376845&r2=376846&view=diff
==============================================================================
--- struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag8.java (original)
+++ struts/taglib/trunk/src/test-cactus/org/apache/struts/taglib/html/TestImgTag8.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.ImgTag</code> class.
- *
+ * Suite of unit tests for the <code>org.apache.struts.taglib.html.ImgTag</code>
+ * class.
*/
public class TestImgTag8 extends JspTestCase {
@@ -50,7 +47,8 @@
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[] {TestImgTag8.class.getName()});
+ junit.awtui.TestRunner
+ .main(new String[] { TestImgTag8.class.getName() });
}
/**
@@ -63,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/TestImgTag8.jsp");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org