Modified: 
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java?rev=409001&r1=409000&r2=409001&view=diff
==============================================================================
--- 
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java
 (original)
+++ 
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java
 Tue May 23 13:26:45 2006
@@ -17,79 +17,75 @@
  */
 package org.apache.struts.action2.views.jsp.ui;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.TestConfigurationProvider;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapper;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
-import org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
-import org.apache.struts.action2.views.jsp.ActionTag;
-
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.ObjectFactory;
-import com.opensymphony.xwork.config.ConfigurationManager;
+import com.opensymphony.xwork.XWorkStatic;
 import com.opensymphony.xwork.config.RuntimeConfiguration;
 import com.opensymphony.xwork.config.entities.ActionConfig;
 import com.opensymphony.xwork.config.entities.InterceptorMapping;
 import com.opensymphony.xwork.validator.ValidationInterceptor;
+import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.TestConfigurationProvider;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.ActionTag;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 
 /**
  * FormTagTest
- *
  */
 public class FormTagTest extends AbstractUITagTest {
 
-       public void testFormWithActionAttributeContainingBothActionAndMethod() 
throws Exception {
-               TestAction testAction = (TestAction) action;
-               
-               FormTag tag = new FormTag();
-               tag.setPageContext(pageContext);
-               tag.setName("myForm");
-               tag.setMethod("POST");
-               tag.setAcceptcharset("UTF-8");
+    public void testFormWithActionAttributeContainingBothActionAndMethod() 
throws Exception {
+        TestAction testAction = (TestAction) action;
+
+        FormTag tag = new FormTag();
+        tag.setPageContext(pageContext);
+        tag.setName("myForm");
+        tag.setMethod("POST");
+        tag.setAcceptcharset("UTF-8");
         tag.setAction("testAction!myLittleMethod");
         tag.setEnctype("myEncType");
         tag.setTitle("mytitle");
         tag.setOnsubmit("submitMe()");
-        
+
         tag.doStartTag();
         tag.doEndTag();
 
         verify(FormTag.class.getResource("Formtag-9.txt"));
-       }
-       
-       
-       public void 
testFormWithActionAttributeContainingBothActionAndMethodAndNamespace() throws 
Exception {
-               TestAction testAction = (TestAction) action;
-               
-               FormTag tag = new FormTag();
-               tag.setPageContext(pageContext);
-               tag.setName("myForm");
-               tag.setNamespace("/testNamespace");
-               tag.setMethod("POST");
-               tag.setAcceptcharset("UTF-8");
+    }
+
+
+    public void 
testFormWithActionAttributeContainingBothActionAndMethodAndNamespace() throws 
Exception {
+        TestAction testAction = (TestAction) action;
+
+        FormTag tag = new FormTag();
+        tag.setPageContext(pageContext);
+        tag.setName("myForm");
+        tag.setNamespace("/testNamespace");
+        tag.setMethod("POST");
+        tag.setAcceptcharset("UTF-8");
         tag.setAction("testNamespaceAction!myLittleMethod");
         tag.setEnctype("myEncType");
         tag.setTitle("mytitle");
         tag.setOnsubmit("submitMe()");
-        
+
         tag.doStartTag();
         tag.doEndTag();
 
         verify(FormTag.class.getResource("Formtag-10.txt"));
-       }
-       
-       
+    }
+
+
     public void testForm() throws Exception {
-       
+
         request.setupGetServletPath("/testAction");
 
         TestAction testAction = (TestAction) action;
@@ -110,201 +106,199 @@
 
         verify(FormTag.class.getResource("Formtag-1.txt"));
     }
-    
+
     /**
      * This test with form tag validation enabled. Js validation script will 
appear
      * cause action submited by the form is intercepted by validation 
interceptor which
      * "include" all methods.
      */
     public void testFormWithCustomOnsubmitEnabledWithValidateEnabled1() throws 
Exception {
-       
-       com.opensymphony.xwork.config.Configuration originalConfiguration = 
ConfigurationManager.getConfiguration();
-       ObjectFactory originalObjectFactory = ObjectFactory.getObjectFactory();
-       
-       try {
-       // used to determined if the form action needs js validation
-       ConfigurationManager.setConfiguration(new 
com.opensymphony.xwork.config.impl.DefaultConfiguration() {
-               public RuntimeConfiguration getRuntimeConfiguration() {
-                       return new RuntimeConfiguration() {
-                               public ActionConfig getActionConfig(String 
namespace, String name) {
-                                       ActionConfig actionConfig = new 
ActionConfig() {
-                                               public List getInterceptors() {
-                                                       List interceptors = new 
ArrayList();
-                                                       
-                                                       ValidationInterceptor 
validationInterceptor = new ValidationInterceptor();
-                                                       
validationInterceptor.setIncludeMethods("*");
-                                                       
-                                                       InterceptorMapping 
interceptorMapping = new InterceptorMapping();
-                                                       
interceptorMapping.setName("validation");
-                                                       
interceptorMapping.setInterceptor(validationInterceptor);
-                                                       
interceptors.add(interceptorMapping);
-                                                       
-                                                       return interceptors;
-                                               }
-                                       };
-                                       return actionConfig;
-                               }
-                               public Map getActionConfigs() {
-                                       return null;
-                               }
-                       };
-               }
-       });
-       
-       // used by form tag to get "actionClass" parameter
-       ObjectFactory.setObjectFactory(new ObjectFactory() {
-               public Class getClassInstance(String className) throws 
ClassNotFoundException {
-                       if 
(DefaultActionMapper.class.getName().equals(className)) {
-                               return DefaultActionMapper.class;
-                       }
-                       return ActionSupport.class;
-               }
-       });
-       
-       
-       
-       FormTag tag = new FormTag();
-       tag.setPageContext(pageContext);
-       tag.setName("myForm");
-       tag.setMethod("POST");
-        tag.setAction("myAction");
-        tag.setAcceptcharset("UTF-8");
-        tag.setEnctype("myEncType");
-        tag.setTitle("mytitle");
-        tag.setOnsubmit("submitMe()");
-        tag.setValidate("true");
-        tag.setNamespace("");
-        
-        UpDownSelectTag t = new UpDownSelectTag();
-        t.setPageContext(pageContext);
-        t.setName("myUpDownSelectTag");
-        t.setList("{}");
-        
-        tag.doStartTag();
-        t.doStartTag();
-        t.doEndTag();
-        tag.doEndTag();
-       
-        verify(FormTag.class.getResource("Formtag-2.txt"));
-       }
-       finally {
-               ConfigurationManager.setConfiguration(originalConfiguration);
-               ObjectFactory.setObjectFactory(originalObjectFactory);
-       }
+
+        com.opensymphony.xwork.config.Configuration originalConfiguration = 
XWorkStatic.getConfigurationManager().getConfiguration();
+        ObjectFactory originalObjectFactory = ObjectFactory.getObjectFactory();
+
+        try {
+            // used to determined if the form action needs js validation
+            XWorkStatic.getConfigurationManager().setConfiguration(new 
com.opensymphony.xwork.config.impl.DefaultConfiguration() {
+                public RuntimeConfiguration getRuntimeConfiguration() {
+                    return new RuntimeConfiguration() {
+                        public ActionConfig getActionConfig(String namespace, 
String name) {
+                            ActionConfig actionConfig = new ActionConfig() {
+                                public List getInterceptors() {
+                                    List interceptors = new ArrayList();
+
+                                    ValidationInterceptor 
validationInterceptor = new ValidationInterceptor();
+                                    
validationInterceptor.setIncludeMethods("*");
+
+                                    InterceptorMapping interceptorMapping = 
new InterceptorMapping();
+                                    interceptorMapping.setName("validation");
+                                    
interceptorMapping.setInterceptor(validationInterceptor);
+                                    interceptors.add(interceptorMapping);
+
+                                    return interceptors;
+                                }
+                            };
+                            return actionConfig;
+                        }
+
+                        public Map getActionConfigs() {
+                            return null;
+                        }
+                    };
+                }
+            });
+
+            // used by form tag to get "actionClass" parameter
+            ObjectFactory.setObjectFactory(new ObjectFactory() {
+                public Class getClassInstance(String className) throws 
ClassNotFoundException {
+                    if (DefaultActionMapper.class.getName().equals(className)) 
{
+                        return DefaultActionMapper.class;
+                    }
+                    return ActionSupport.class;
+                }
+            });
+
+
+            FormTag tag = new FormTag();
+            tag.setPageContext(pageContext);
+            tag.setName("myForm");
+            tag.setMethod("POST");
+            tag.setAction("myAction");
+            tag.setAcceptcharset("UTF-8");
+            tag.setEnctype("myEncType");
+            tag.setTitle("mytitle");
+            tag.setOnsubmit("submitMe()");
+            tag.setValidate("true");
+            tag.setNamespace("");
+
+            UpDownSelectTag t = new UpDownSelectTag();
+            t.setPageContext(pageContext);
+            t.setName("myUpDownSelectTag");
+            t.setList("{}");
+
+            tag.doStartTag();
+            t.doStartTag();
+            t.doEndTag();
+            tag.doEndTag();
+
+            verify(FormTag.class.getResource("Formtag-2.txt"));
+        }
+        finally {
+            
XWorkStatic.getConfigurationManager().setConfiguration(originalConfiguration);
+            ObjectFactory.setObjectFactory(originalObjectFactory);
+        }
     }
-    
-    
+
+
     /**
      * This test with form tag validation enabled. Js validation script will 
not appear
      * cause action submited by the form is intercepted by validation 
interceptor which
      * "excludes" all methods.
      */
     public void testFormWithCustomOnsubmitEnabledWithValidateEnabled2() throws 
Exception {
-       
-       com.opensymphony.xwork.config.Configuration originalConfiguration = 
ConfigurationManager.getConfiguration();
-       ObjectFactory originalObjectFactory = ObjectFactory.getObjectFactory();
-       
-       try {
-       // used to determined if the form action needs js validation
-       ConfigurationManager.setConfiguration(new 
com.opensymphony.xwork.config.impl.DefaultConfiguration() {
-               public RuntimeConfiguration getRuntimeConfiguration() {
-                       return new RuntimeConfiguration() {
-                               public ActionConfig getActionConfig(String 
namespace, String name) {
-                                       ActionConfig actionConfig = new 
ActionConfig() {
-                                               public List getInterceptors() {
-                                                       List interceptors = new 
ArrayList();
-                                                       
-                                                       ValidationInterceptor 
validationInterceptor = new ValidationInterceptor();
-                                                       
validationInterceptor.setExcludeMethods("*");
-                                                       
-                                                       InterceptorMapping 
interceptorMapping = new InterceptorMapping();
-                                                       
interceptorMapping.setName("validation");
-                                                       
interceptorMapping.setInterceptor(validationInterceptor);
-                                                       
interceptors.add(interceptorMapping);
-                                                       
-                                                       return interceptors;
-                                               }
-                                       };
-                                       return actionConfig;
-                               }
-                               public Map getActionConfigs() {
-                                       return null;
-                               }
-                       };
-               }
-       });
-       
-       // used by form tag to get "actionClass" parameter
-       ObjectFactory.setObjectFactory(new ObjectFactory() {
-               public Class getClassInstance(String className) throws 
ClassNotFoundException {
-                       if 
(DefaultActionMapper.class.getName().equals(className)) {
-                               return DefaultActionMapper.class;
-                       }
-                       return ActionSupport.class;
-               }
-       });
-       
-       
-       
-       FormTag tag = new FormTag();
-       tag.setPageContext(pageContext);
-       tag.setName("myForm");
-       tag.setMethod("POST");
-        tag.setAction("myAction");
-        tag.setAcceptcharset("UTF-8");
-        tag.setEnctype("myEncType");
-        tag.setTitle("mytitle");
-        tag.setOnsubmit("submitMe()");
-        tag.setValidate("true");
-        tag.setNamespace("");
-        
-        UpDownSelectTag t = new UpDownSelectTag();
-        t.setPageContext(pageContext);
-        t.setName("myUpDownSelectTag");
-        t.setList("{}");
-        
-        tag.doStartTag();
-        t.doStartTag();
-        t.doEndTag();
-        tag.doEndTag();
-       
-        verify(FormTag.class.getResource("Formtag-11.txt"));
-       }
-       finally {
-               ConfigurationManager.setConfiguration(originalConfiguration);
-               ObjectFactory.setObjectFactory(originalObjectFactory);
-       }
+
+        com.opensymphony.xwork.config.Configuration originalConfiguration = 
XWorkStatic.getConfigurationManager().getConfiguration();
+        ObjectFactory originalObjectFactory = ObjectFactory.getObjectFactory();
+
+        try {
+            // used to determined if the form action needs js validation
+            XWorkStatic.getConfigurationManager().setConfiguration(new 
com.opensymphony.xwork.config.impl.DefaultConfiguration() {
+                public RuntimeConfiguration getRuntimeConfiguration() {
+                    return new RuntimeConfiguration() {
+                        public ActionConfig getActionConfig(String namespace, 
String name) {
+                            ActionConfig actionConfig = new ActionConfig() {
+                                public List getInterceptors() {
+                                    List interceptors = new ArrayList();
+
+                                    ValidationInterceptor 
validationInterceptor = new ValidationInterceptor();
+                                    
validationInterceptor.setExcludeMethods("*");
+
+                                    InterceptorMapping interceptorMapping = 
new InterceptorMapping();
+                                    interceptorMapping.setName("validation");
+                                    
interceptorMapping.setInterceptor(validationInterceptor);
+                                    interceptors.add(interceptorMapping);
+
+                                    return interceptors;
+                                }
+                            };
+                            return actionConfig;
+                        }
+
+                        public Map getActionConfigs() {
+                            return null;
+                        }
+                    };
+                }
+            });
+
+            // used by form tag to get "actionClass" parameter
+            ObjectFactory.setObjectFactory(new ObjectFactory() {
+                public Class getClassInstance(String className) throws 
ClassNotFoundException {
+                    if (DefaultActionMapper.class.getName().equals(className)) 
{
+                        return DefaultActionMapper.class;
+                    }
+                    return ActionSupport.class;
+                }
+            });
+
+
+            FormTag tag = new FormTag();
+            tag.setPageContext(pageContext);
+            tag.setName("myForm");
+            tag.setMethod("POST");
+            tag.setAction("myAction");
+            tag.setAcceptcharset("UTF-8");
+            tag.setEnctype("myEncType");
+            tag.setTitle("mytitle");
+            tag.setOnsubmit("submitMe()");
+            tag.setValidate("true");
+            tag.setNamespace("");
+
+            UpDownSelectTag t = new UpDownSelectTag();
+            t.setPageContext(pageContext);
+            t.setName("myUpDownSelectTag");
+            t.setList("{}");
+
+            tag.doStartTag();
+            t.doStartTag();
+            t.doEndTag();
+            tag.doEndTag();
+
+            verify(FormTag.class.getResource("Formtag-11.txt"));
+        }
+        finally {
+            
XWorkStatic.getConfigurationManager().setConfiguration(originalConfiguration);
+            ObjectFactory.setObjectFactory(originalObjectFactory);
+        }
     }
 
     /**
      * This test with form tag validation disabled.
      */
     public void testFormWithCustomOnsubmitEnabledWithValidateDisabled() throws 
Exception {
-       FormTag tag = new FormTag();
-       tag.setPageContext(pageContext);
-       tag.setName("myForm");
-       tag.setMethod("POST");
+        FormTag tag = new FormTag();
+        tag.setPageContext(pageContext);
+        tag.setName("myForm");
+        tag.setMethod("POST");
         tag.setAction("myAction");
         tag.setEnctype("myEncType");
         tag.setTitle("mytitle");
         tag.setOnsubmit("submitMe()");
         tag.setValidate("false");
-        
+
         UpDownSelectTag t = new UpDownSelectTag();
         t.setPageContext(pageContext);
         t.setName("myUpDownSelectTag");
         t.setList("{}");
-        
+
         tag.doStartTag();
         t.doStartTag();
         t.doEndTag();
         tag.doEndTag();
-       
+
         verify(FormTag.class.getResource("Formtag-6.txt"));
     }
-    
-    
-    
+
 
     /**
      * Testing that this: <p>
@@ -374,129 +368,129 @@
 
         verify(FormTag.class.getResource("Formtag-3.txt"));
     }
-    
+
     public void testFormTagForStackOverflowException1() throws Exception {
-       request.setRequestURI("/requestUri");
-       
-       FormTag form1 = new FormTag();
-       form1.setPageContext(pageContext);
-       form1.doStartTag();
-       
-       assertEquals(form1.getComponent().getComponentStack().size(), 1);
-       
-       ActionTag tag = new ActionTag();
-       tag.setPageContext(pageContext);
-       tag.setName("testAction");
-       tag.doStartTag();
-       
-       assertEquals(tag.getComponent().getComponentStack().size(), 2);
-       
-       tag.doEndTag();
-       
-       assertEquals(form1.getComponent().getComponentStack().size(), 1);
-       
-       form1.doEndTag();
-       
-       assertNull(form1.getComponent()); // component is removed after end tag
+        request.setRequestURI("/requestUri");
+
+        FormTag form1 = new FormTag();
+        form1.setPageContext(pageContext);
+        form1.doStartTag();
+
+        assertEquals(form1.getComponent().getComponentStack().size(), 1);
+
+        ActionTag tag = new ActionTag();
+        tag.setPageContext(pageContext);
+        tag.setName("testAction");
+        tag.doStartTag();
+
+        assertEquals(tag.getComponent().getComponentStack().size(), 2);
+
+        tag.doEndTag();
+
+        assertEquals(form1.getComponent().getComponentStack().size(), 1);
+
+        form1.doEndTag();
+
+        assertNull(form1.getComponent()); // component is removed after end tag
     }
-    
+
     public void testFormTagForStackOverflowException2() throws Exception {
-       request.setRequestURI("/requestUri");
-       
-       FormTag form1 = new FormTag();
-       form1.setPageContext(pageContext);
-       form1.doStartTag();
-       
-       assertEquals(form1.getComponent().getComponentStack().size(), 1);
-       
-       FormTag form2 = new FormTag();
-       form2.setPageContext(pageContext);
-       form2.doStartTag();
-
-       assertEquals(form2.getComponent().getComponentStack().size(), 2);
-       
-       ActionTag tag = new ActionTag();
-       tag.setPageContext(pageContext);
-       tag.setName("testAction");
-       tag.doStartTag();
-       
-       assertEquals(tag.getComponent().getComponentStack().size(), 3);
-       
-       tag.doEndTag();
-
-       assertEquals(form2.getComponent().getComponentStack().size(), 2);
-       
-       form2.doEndTag();
-       
-       assertEquals(form1.getComponent().getComponentStack().size(), 1);
-
-       form1.doEndTag();
-       
-       assertNull(form1.getComponent()); // component is removed after end tag
+        request.setRequestURI("/requestUri");
+
+        FormTag form1 = new FormTag();
+        form1.setPageContext(pageContext);
+        form1.doStartTag();
+
+        assertEquals(form1.getComponent().getComponentStack().size(), 1);
+
+        FormTag form2 = new FormTag();
+        form2.setPageContext(pageContext);
+        form2.doStartTag();
+
+        assertEquals(form2.getComponent().getComponentStack().size(), 2);
+
+        ActionTag tag = new ActionTag();
+        tag.setPageContext(pageContext);
+        tag.setName("testAction");
+        tag.doStartTag();
+
+        assertEquals(tag.getComponent().getComponentStack().size(), 3);
+
+        tag.doEndTag();
+
+        assertEquals(form2.getComponent().getComponentStack().size(), 2);
+
+        form2.doEndTag();
+
+        assertEquals(form1.getComponent().getComponentStack().size(), 1);
+
+        form1.doEndTag();
+
+        assertNull(form1.getComponent()); // component is removed after end tag
     }
-    
-    
+
+
     public void testFormTagForStackOverflowException3() throws Exception {
-       request.setRequestURI("/requestUri");
-       
-       FormTag form1 = new FormTag();
-       form1.setPageContext(pageContext);
-       form1.doStartTag();
-       
-       assertEquals(form1.getComponent().getComponentStack().size(), 1);
-       
-       FormTag form2 = new FormTag();
-       form2.setPageContext(pageContext);
-       form2.doStartTag();
-       
-       assertEquals(form2.getComponent().getComponentStack().size(), 2);
-       
-       FormTag form3 = new FormTag();
-       form3.setPageContext(pageContext);
-       form3.doStartTag();
-
-       assertEquals(form3.getComponent().getComponentStack().size(), 3);
-       
-       ActionTag tag = new ActionTag();
-       tag.setPageContext(pageContext);
-       tag.setName("testAction");
-       tag.doStartTag();
-       
-       assertEquals(tag.getComponent().getComponentStack().size(), 4);
-       
-       tag.doEndTag();
-       
-       assertEquals(form3.getComponent().getComponentStack().size(), 3);
-
-       form3.doEndTag();
-       
-       assertEquals(form2.getComponent().getComponentStack().size(), 2);
-       
-       form2.doEndTag();
-       
-       assertEquals(form1.getComponent().getComponentStack().size(), 1);
-
-       form1.doEndTag();
-       
-       assertNull(form1.getComponent()); // component is removed after end tag
+        request.setRequestURI("/requestUri");
+
+        FormTag form1 = new FormTag();
+        form1.setPageContext(pageContext);
+        form1.doStartTag();
+
+        assertEquals(form1.getComponent().getComponentStack().size(), 1);
+
+        FormTag form2 = new FormTag();
+        form2.setPageContext(pageContext);
+        form2.doStartTag();
+
+        assertEquals(form2.getComponent().getComponentStack().size(), 2);
+
+        FormTag form3 = new FormTag();
+        form3.setPageContext(pageContext);
+        form3.doStartTag();
+
+        assertEquals(form3.getComponent().getComponentStack().size(), 3);
+
+        ActionTag tag = new ActionTag();
+        tag.setPageContext(pageContext);
+        tag.setName("testAction");
+        tag.doStartTag();
+
+        assertEquals(tag.getComponent().getComponentStack().size(), 4);
+
+        tag.doEndTag();
+
+        assertEquals(form3.getComponent().getComponentStack().size(), 3);
+
+        form3.doEndTag();
+
+        assertEquals(form2.getComponent().getComponentStack().size(), 2);
+
+        form2.doEndTag();
+
+        assertEquals(form1.getComponent().getComponentStack().size(), 1);
+
+        form1.doEndTag();
+
+        assertNull(form1.getComponent()); // component is removed after end tag
     }
-    
-    
+
+
     public void testFormComponentIsRemoved() throws Exception {
-       request.setRequestURI("/requestUri");
-       
-       FormTag form = new FormTag();
-       form.setPageContext(pageContext);
-       form.doStartTag();
-       
-       assertEquals(form.getComponent().getComponentStack().size(), 1);
-       
-       form.doEndTag();
-       
-       assertNull(form.getComponent());
+        request.setRequestURI("/requestUri");
+
+        FormTag form = new FormTag();
+        form.setPageContext(pageContext);
+        form.doStartTag();
+
+        assertEquals(form.getComponent().getComponentStack().size(), 1);
+
+        form.doEndTag();
+
+        assertNull(form.getComponent());
     }
-    
-    
+
+
     public void testFormWithNoAction() throws Exception {
         request.setupGetServletPath("/");
         request.setupGetContextPath("/");
@@ -548,8 +542,8 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        ConfigurationManager.clearConfigurationProviders();
-        ConfigurationManager.addConfigurationProvider(new 
TestConfigurationProvider());
+        XWorkStatic.getConfigurationManager().clearConfigurationProviders();
+        XWorkStatic.getConfigurationManager().addConfigurationProvider(new 
TestConfigurationProvider());
         ActionContext.getContext().setValueStack(stack);
     }
 }

Modified: 
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java?rev=409001&r1=409000&r2=409001&view=diff
==============================================================================
--- 
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java
 (original)
+++ 
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java
 Tue May 23 13:26:45 2006
@@ -18,360 +18,357 @@
 package org.apache.struts.action2.views.jsp.ui;
 
 import com.mockobjects.servlet.MockJspWriter;
+import com.opensymphony.xwork.XWorkStatic;
 import org.apache.struts.action2.TestConfigurationProvider;
 import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 import org.apache.struts.action2.views.jsp.ParamTag;
 import org.apache.struts.action2.views.jsp.StrutsMockBodyContent;
 
-import com.opensymphony.xwork.config.ConfigurationManager;
-
 /**
  * UI components Tooltip test case.
- * 
  */
 public class TooltipTest extends AbstractUITagTest {
 
-       public void testWithoutFormOverriding() throws Exception {
-               
-               ConfigurationManager.clearConfigurationProviders();
-               ConfigurationManager.addConfigurationProvider(new 
TestConfigurationProvider());
-               
-               
-               // we test it on textfield component, but since the tooltip are 
common to 
-               // all components, it will be the same for other components as 
well.
-               FormTag formTag = new FormTag();
-               formTag.setPageContext(pageContext);
-               formTag.setId("myFormId");
-               formTag.setAction("testAction");
-               formTag.setName("myForm");
-               
-               
-               TextFieldTag tag = new TextFieldTag();
-               tag.setPageContext(pageContext);
-               tag.setLabel("MyLabel");
-               tag.setId("myId");
-               
-               
-               tag.setTooltip("myTooltip");
-               tag.setTooltipConfig(
-                               "#{" +
-                               "'tooltipIcon':'/struts/tooltip/myTooltip.gif', 
" +
-                               "'tooltipAboveMousePointer':'true', " +
-                               "'tooltipBgColor':'#ffffff', " +
-                               "'tooltipBgImg':'/struts/tooltip/myBgImg.gif', 
" +
-                               "'tooltipBorderWidth':'10', " +
-                               "'tooltipBorderColor':'#eeeeee', " +
-                               "'tooltipDelay':'2000', " +
-                               "'tooltipFixCoordinateX':'300', " +
-                               "'tooltipFixCoordinateY':'300', " +
-                               "'tooltipFontColor':'#dddddd', " +
-                               "'tooltipFontFace':'San-Serif,Verdana', " +
-                               "'tooltipFontSize':'20', "+
-                               "'tooltipFontWeight':'bold', " +
-                               "'tooltipLeftOfMousePointer':'true', " +
-                               "'tooltipOffsetX':'10', " +
-                               "'tooltipOffsetY':'20', " +
-                               "'tooltipOpacity':'90', " +
-                               "'tooltipPadding':'30', " +
-                               "'tooltipShadowColor':'#cccccc', " +
-                               "'tooltipShadowWidth':'40', " +
-                               "'tooltipStatic':'true', " +
-                               "'tooltipSticky':'true', " +
-                               "'tooltipStayAppearTime':'3000', " +
-                               "'tooltipTextAlign':'right', " +
-                               "'tooltipTitle':'MyTitle', " +
-                               "'tooltipTitleColor':'#bbbbbb', " +
-                               "'tooltipWidth':'600' " +
-                               "}"
-               );
-               
-               formTag.doStartTag();
-               tag.doStartTag();
-               tag.doEndTag();
-               formTag.doEndTag();
-               
-               verify(TooltipTest.class.getResource("tooltip-1.txt"));
-       }
-       
-       public void testWithFormOverriding() throws Exception {
-               
-               ConfigurationManager.clearConfigurationProviders();
-               ConfigurationManager.addConfigurationProvider(new 
TestConfigurationProvider());
-               
-               FormTag formTag = new FormTag();
-               formTag.setPageContext(pageContext);
-               formTag.setName("myForm");
-               formTag.setId("myFormId");
-               formTag.setAction("testAction");
-               
-               formTag.setTooltipConfig(
-                               "#{ " +
-                               
"'tooltipIcon':'/struts/tooltip/formMyTooltip.gif', " +
-                               "'tooltipAboveMousePointer':'false', " +
-                               "'tooltipBgColor':'#aaaaaa', " +
-                               
"'tooltipBgImg':'/struts/tooltip/formMyBgImg.gif', " +
-                               "'tooltipBorderWidth':'11', " +
-                               "'tooltipBorderColor':'#bbbbbb', " +
-                               "'tooltipDelay':'2001', " +
-                               "'tooltipFixCoordinateX':'301', " +
-                               "'tooltipFixCoordinateY':'301', " +
-                               "'tooltipFontColor':'#cccccc', " +
-                               "'tooltipFontFace':'Verdana,San-Serif', " +
-                               "'tooltipFontSize':'21', " +
-                               "'tooltipFontWeight':'normal', " +
-                               "'tooltipLeftOfMousePointer':'false', " +
-                               "'tooltipOffsetX':'11', " +
-                               "'tooltipOffsetY':'21', " +
-                               "'tooltipOpacity':'91', " +
-                               "'tooltipPadding':'31', " +
-                               "'tooltipShadowColor':'#cccccc', " +
-                               "'tooltipShadowWidth':'41', " +
-                               "'tooltipStatic':'false', " +
-                               "'tooltipSticky':'false', " +
-                               "'tooltipStayAppearTime':'3001', " +
-                               "'tooltipTextAlign':'left', " +
-                               "'tooltipTitle':'FormMyTitle', " +
-                               "'tooltipTitleColor':'#dddddd', " +
-                               "'tooltipWidth':'601' " +
-                               "}"
-               );
-               
-               
-               TextFieldTag tag = new TextFieldTag();
-               tag.setPageContext(pageContext);
-               tag.setLabel("MyLabel");
-               tag.setId("myId");
-               
-               tag.setTooltip("myTooltip");
-               
-               formTag.doStartTag();
-               tag.doStartTag();
-               tag.doEndTag();
-               formTag.doEndTag();
-               
-               verify(TooltipTest.class.getResource("tooltip-2.txt"));
-       }
-       
-       public void testWithPartialFormOverriding() throws Exception {
-               
-               ConfigurationManager.clearConfigurationProviders();
-               ConfigurationManager.addConfigurationProvider(new 
TestConfigurationProvider());
-               
-               FormTag formTag = new FormTag();
-               formTag.setName("myForm");
-               formTag.setPageContext(pageContext);
-               formTag.setId("myFormId");
-               formTag.setAction("testAction");
-               
-               formTag.setTooltipConfig(
-                               "#{ " +
-                               
"'tooltipIcon':'/struts/tooltip/formMyTooltip.gif', " +
-                               "'tooltipAboveMousePointer':'false', " +
-                               "'tooltipBgColor':'#aaaaaa', " +
-                               
"'tooltipBgImg':'/struts/tooltip/formMyBgImg.gif', " +
-                               "'tooltipBorderWidth':'11', " +
-                               "'tooltipBorderColor':'#bbbbbb', " +
-                               "'tooltipDelay':'2001', " +
-                               "'tooltipFixCoordinateX':'301', " +
-                               "'tooltipFixCoordinateY':'301', " +
-                               "'tooltipFontColor':'#cccccc', " +
-                               "'tooltipFontFace':'Verdana,San-Serif', " +
-                               "'tooltipFontSize':'21', " +
-                               "'tooltipFontWeight':'normal', " +
-                               "'tooltipLeftOfMousePointer':'false', " +
-                               "'tooltipOffsetX':'11', " +
-                               "'tooltipOffsetY':'21', " +
-                               "'tooltipOpacity':'91', " +
-                               "'tooltipPadding':'31', " +
-                               "'tooltipShadowColor':'#cccccc', " +
-                               "'tooltipShadowWidth':'41', " +
-                               "'tooltipStatic':'false', " +
-                               "'tooltipSticky':'false', " +
-                               "'tooltipStayAppearTime':'3001', " +
-                               "'tooltipTextAlign':'left', " +
-                               "'tooltipTitle':'FormMyTitle', " +
-                               "'tooltipTitleColor':'#dddddd', " +
-                               "'tooltipWidth':'601' " +
-                               "}"
-               );
-               
-               
-               TextFieldTag tag = new TextFieldTag();
-               tag.setPageContext(pageContext);
-               tag.setLabel("MyLabel");
-               tag.setId("myId");
-               
-               tag.setTooltip("myTooltip");
-               tag.setTooltipConfig(
-                               "#{ " +
-                               "'tooltipIcon':'/struts/tooltip/myTooltip.gif', 
" +
-                               "'tooltipAboveMousePointer':'true', " +
-                               "'tooltipBgColor':'#ffffff', " +
-                               "'tooltipBgImg':'/struts/tooltip/myBgImg.gif' " 
+
-                               "}"
-               );
-               
-               formTag.doStartTag();
-               tag.doStartTag();
-               tag.doEndTag();
-               formTag.doEndTag();
-               
-               verify(TooltipTest.class.getResource("tooltip-3.txt"));
-       }
-       
-       
-       public void testUsingParamValueToSetConfigurations() throws Exception {
-               ConfigurationManager.clearConfigurationProviders();
-               ConfigurationManager.addConfigurationProvider(new 
TestConfigurationProvider());
-               
-               FormTag formTag = new FormTag();
-               formTag.setName("myForm");
-               formTag.setPageContext(pageContext);
-               formTag.setId("myFormId");
-               formTag.setAction("testAction");
-               
-               
-               ParamTag formParamTag = new ParamTag();
-               formParamTag.setPageContext(pageContext);
-               formParamTag.setName("tooltipConfig");
-               formParamTag.setValue(
-                               "#{ " +
-                               
"'tooltipIcon':'/struts/tooltip/formMyTooltip.gif', " +
-                               "'tooltipAboveMousePointer':'false', " +
-                               "'tooltipBgColor':'#aaaaaa', " +
-                               
"'tooltipBgImg':'/struts/tooltip/formMyBgImg.gif', " +
-                               "'tooltipBorderWidth':'11', " +
-                               "'tooltipBorderColor':'#bbbbbb', " +
-                               "'tooltipDelay':'2001', " +
-                               "'tooltipFixCoordinateX':'301', " +
-                               "'tooltipFixCoordinateY':'301', " +
-                               "'tooltipFontColor':'#cccccc', " +
-                               "'tooltipFontFace':'Verdana,San-Serif', " +
-                               "'tooltipFontSize':'21', " +
-                               "'tooltipFontWeight':'normal', " +
-                               "'tooltipLeftOfMousePointer':'false', " +
-                               "'tooltipOffsetX':'11', " +
-                               "'tooltipOffsetY':'21', " +
-                               "'tooltipOpacity':'91', " +
-                               "'tooltipPadding':'31', " +
-                               "'tooltipShadowColor':'#cccccc', " +
-                               "'tooltipShadowWidth':'41', " +
-                               "'tooltipStatic':'false', " +
-                               "'tooltipSticky':'false', " +
-                               "'tooltipStayAppearTime':'3001', " +
-                               "'tooltipTextAlign':'left', " +
-                               "'tooltipTitle':'FormMyTitle', " +
-                               "'tooltipTitleColor':'#dddddd', " +
-                               "'tooltipWidth':'601' " +
-                               "}"
-               );
-               
-               
-               TextFieldTag tag = new TextFieldTag();
-               tag.setPageContext(pageContext);
-               tag.setLabel("MyLabel");
-               tag.setId("myId");
-               tag.setTooltip("myTooltip");
-               
-               ParamTag textFieldParamTag = new ParamTag();
-               textFieldParamTag.setPageContext(pageContext);
-               textFieldParamTag.setName("tooltipConfig");
-               textFieldParamTag.setValue(
-                               "#{ " +
-                               "'tooltipIcon':'/struts/tooltip/myTooltip.gif', 
" +
-                               "'tooltipAboveMousePointer':'true', " +
-                               "'tooltipBgColor':'#ffffff', " +
-                               "'tooltipBgImg':'/struts/tooltip/myBgImg.gif' " 
+
-                               "}"
-               );
-               
-               formTag.doStartTag();
-               formParamTag.doStartTag();
-               formParamTag.doEndTag();
-               tag.doStartTag();
-               textFieldParamTag.doStartTag();
-               textFieldParamTag.doEndTag();
-               tag.doEndTag();
-               formTag.doEndTag();
-               
-               verify(TooltipTest.class.getResource("tooltip-3.txt"));
-       }
-       
-       
-       public void testUsingParamBodyValueToSetConfigurations() throws 
Exception {
-               ConfigurationManager.clearConfigurationProviders();
-               ConfigurationManager.addConfigurationProvider(new 
TestConfigurationProvider());
-               
-               FormTag formTag = new FormTag();
-               formTag.setName("myForm");
-               formTag.setPageContext(pageContext);
-               formTag.setId("myFormId");
-               formTag.setAction("testAction");
-               
-               
-               ParamTag formParamTag = new ParamTag();
-               formParamTag.setPageContext(pageContext);
-               formParamTag.setName("tooltipConfig");
-               StrutsMockBodyContent bodyContent = new 
StrutsMockBodyContent(new MockJspWriter());
-               bodyContent.setString(
-                               "tooltipIcon = 
/struts/tooltip/formMyTooltip.gif | " +
-                               "tooltipAboveMousePointer = false | " +
-                               "tooltipBgColor = #aaaaaa| " +
-                               "tooltipBgImg = /struts/tooltip/formMyBgImg.gif 
| " +
-                               "tooltipBorderWidth = 11 | " +
-                               "tooltipBorderColor = #bbbbbb| " +
-                               "tooltipDelay = 2001 | " +
-                               "tooltipFixCoordinateX = 301| " +
-                               "tooltipFixCoordinateY = 301| " +
-                               "tooltipFontColor = #cccccc | " +
-                               "tooltipFontFace = Verdana,San-Serif | " +
-                               "tooltipFontSize = 21 | " +
-                               "tooltipFontWeight = normal | " +
-                               "tooltipLeftOfMousePointer = false | " +
-                               "tooltipOffsetX = 11 | " +
-                               "tooltipOffsetY = 21| " +
-                               "tooltipOpacity = 91| " +
-                               "tooltipPadding = 31| " +
-                               "tooltipShadowColor = #cccccc| " +
-                               "tooltipShadowWidth = 41| " +
-                               "tooltipStatic = false | " +
-                               "tooltipSticky = false| " +
-                               "tooltipStayAppearTime = 3001| " +
-                               "tooltipTextAlign = left| " +
-                               "tooltipTitle = FormMyTitle| " +
-                               "tooltipTitleColor = #dddddd| " +
-                               "tooltipWidth = 601 "
-               );
-               formParamTag.setBodyContent(bodyContent);
-               
-               TextFieldTag tag = new TextFieldTag();
-               tag.setPageContext(pageContext);
-               tag.setLabel("MyLabel");
-               tag.setId("myId");
-               tag.setTooltip("myTooltip");
-               
-               
-               ParamTag textFieldParamTag = new ParamTag();
-               textFieldParamTag.setPageContext(pageContext);
-               textFieldParamTag.setName("tooltipConfig");
-               StrutsMockBodyContent bodyContent2 = new 
StrutsMockBodyContent(new MockJspWriter());
-               bodyContent2.setString(
-                               "tooltipIcon = /struts/tooltip/myTooltip.gif | 
" +
-                               "tooltipAboveMousePointer = true | " +
-                               "tooltipBgColor = #ffffff | " +
-                               "tooltipBgImg = /struts/tooltip/myBgImg.gif " 
-               );
-               textFieldParamTag.setBodyContent(bodyContent2);
-               
-               formTag.doStartTag();
-               formParamTag.doStartTag();
-               formParamTag.doEndTag();
-               tag.doStartTag();
-               textFieldParamTag.doStartTag();
-               textFieldParamTag.doEndTag();
-               tag.doEndTag();
-               formTag.doEndTag();
-               
-               verify(TooltipTest.class.getResource("tooltip-3.txt"));
-       }
+    public void testWithoutFormOverriding() throws Exception {
+
+        XWorkStatic.getConfigurationManager().clearConfigurationProviders();
+        XWorkStatic.getConfigurationManager().addConfigurationProvider(new 
TestConfigurationProvider());
+
+        // we test it on textfield component, but since the tooltip are common 
to
+        // all components, it will be the same for other components as well.
+        FormTag formTag = new FormTag();
+        formTag.setPageContext(pageContext);
+        formTag.setId("myFormId");
+        formTag.setAction("testAction");
+        formTag.setName("myForm");
+
+
+        TextFieldTag tag = new TextFieldTag();
+        tag.setPageContext(pageContext);
+        tag.setLabel("MyLabel");
+        tag.setId("myId");
+
+
+        tag.setTooltip("myTooltip");
+        tag.setTooltipConfig(
+                "#{" +
+                        "'tooltipIcon':'/struts/tooltip/myTooltip.gif', " +
+                        "'tooltipAboveMousePointer':'true', " +
+                        "'tooltipBgColor':'#ffffff', " +
+                        "'tooltipBgImg':'/struts/tooltip/myBgImg.gif', " +
+                        "'tooltipBorderWidth':'10', " +
+                        "'tooltipBorderColor':'#eeeeee', " +
+                        "'tooltipDelay':'2000', " +
+                        "'tooltipFixCoordinateX':'300', " +
+                        "'tooltipFixCoordinateY':'300', " +
+                        "'tooltipFontColor':'#dddddd', " +
+                        "'tooltipFontFace':'San-Serif,Verdana', " +
+                        "'tooltipFontSize':'20', " +
+                        "'tooltipFontWeight':'bold', " +
+                        "'tooltipLeftOfMousePointer':'true', " +
+                        "'tooltipOffsetX':'10', " +
+                        "'tooltipOffsetY':'20', " +
+                        "'tooltipOpacity':'90', " +
+                        "'tooltipPadding':'30', " +
+                        "'tooltipShadowColor':'#cccccc', " +
+                        "'tooltipShadowWidth':'40', " +
+                        "'tooltipStatic':'true', " +
+                        "'tooltipSticky':'true', " +
+                        "'tooltipStayAppearTime':'3000', " +
+                        "'tooltipTextAlign':'right', " +
+                        "'tooltipTitle':'MyTitle', " +
+                        "'tooltipTitleColor':'#bbbbbb', " +
+                        "'tooltipWidth':'600' " +
+                        "}"
+        );
+
+        formTag.doStartTag();
+        tag.doStartTag();
+        tag.doEndTag();
+        formTag.doEndTag();
+
+        verify(TooltipTest.class.getResource("tooltip-1.txt"));
+    }
+
+    public void testWithFormOverriding() throws Exception {
+
+        XWorkStatic.getConfigurationManager().clearConfigurationProviders();
+        XWorkStatic.getConfigurationManager().addConfigurationProvider(new 
TestConfigurationProvider());
+
+        FormTag formTag = new FormTag();
+        formTag.setPageContext(pageContext);
+        formTag.setName("myForm");
+        formTag.setId("myFormId");
+        formTag.setAction("testAction");
+
+        formTag.setTooltipConfig(
+                "#{ " +
+                        "'tooltipIcon':'/struts/tooltip/formMyTooltip.gif', " +
+                        "'tooltipAboveMousePointer':'false', " +
+                        "'tooltipBgColor':'#aaaaaa', " +
+                        "'tooltipBgImg':'/struts/tooltip/formMyBgImg.gif', " +
+                        "'tooltipBorderWidth':'11', " +
+                        "'tooltipBorderColor':'#bbbbbb', " +
+                        "'tooltipDelay':'2001', " +
+                        "'tooltipFixCoordinateX':'301', " +
+                        "'tooltipFixCoordinateY':'301', " +
+                        "'tooltipFontColor':'#cccccc', " +
+                        "'tooltipFontFace':'Verdana,San-Serif', " +
+                        "'tooltipFontSize':'21', " +
+                        "'tooltipFontWeight':'normal', " +
+                        "'tooltipLeftOfMousePointer':'false', " +
+                        "'tooltipOffsetX':'11', " +
+                        "'tooltipOffsetY':'21', " +
+                        "'tooltipOpacity':'91', " +
+                        "'tooltipPadding':'31', " +
+                        "'tooltipShadowColor':'#cccccc', " +
+                        "'tooltipShadowWidth':'41', " +
+                        "'tooltipStatic':'false', " +
+                        "'tooltipSticky':'false', " +
+                        "'tooltipStayAppearTime':'3001', " +
+                        "'tooltipTextAlign':'left', " +
+                        "'tooltipTitle':'FormMyTitle', " +
+                        "'tooltipTitleColor':'#dddddd', " +
+                        "'tooltipWidth':'601' " +
+                        "}"
+        );
+
+
+        TextFieldTag tag = new TextFieldTag();
+        tag.setPageContext(pageContext);
+        tag.setLabel("MyLabel");
+        tag.setId("myId");
+
+        tag.setTooltip("myTooltip");
+
+        formTag.doStartTag();
+        tag.doStartTag();
+        tag.doEndTag();
+        formTag.doEndTag();
+
+        verify(TooltipTest.class.getResource("tooltip-2.txt"));
+    }
+
+    public void testWithPartialFormOverriding() throws Exception {
+
+        XWorkStatic.getConfigurationManager().clearConfigurationProviders();
+        XWorkStatic.getConfigurationManager().addConfigurationProvider(new 
TestConfigurationProvider());
+
+        FormTag formTag = new FormTag();
+        formTag.setName("myForm");
+        formTag.setPageContext(pageContext);
+        formTag.setId("myFormId");
+        formTag.setAction("testAction");
+
+        formTag.setTooltipConfig(
+                "#{ " +
+                        "'tooltipIcon':'/struts/tooltip/formMyTooltip.gif', " +
+                        "'tooltipAboveMousePointer':'false', " +
+                        "'tooltipBgColor':'#aaaaaa', " +
+                        "'tooltipBgImg':'/struts/tooltip/formMyBgImg.gif', " +
+                        "'tooltipBorderWidth':'11', " +
+                        "'tooltipBorderColor':'#bbbbbb', " +
+                        "'tooltipDelay':'2001', " +
+                        "'tooltipFixCoordinateX':'301', " +
+                        "'tooltipFixCoordinateY':'301', " +
+                        "'tooltipFontColor':'#cccccc', " +
+                        "'tooltipFontFace':'Verdana,San-Serif', " +
+                        "'tooltipFontSize':'21', " +
+                        "'tooltipFontWeight':'normal', " +
+                        "'tooltipLeftOfMousePointer':'false', " +
+                        "'tooltipOffsetX':'11', " +
+                        "'tooltipOffsetY':'21', " +
+                        "'tooltipOpacity':'91', " +
+                        "'tooltipPadding':'31', " +
+                        "'tooltipShadowColor':'#cccccc', " +
+                        "'tooltipShadowWidth':'41', " +
+                        "'tooltipStatic':'false', " +
+                        "'tooltipSticky':'false', " +
+                        "'tooltipStayAppearTime':'3001', " +
+                        "'tooltipTextAlign':'left', " +
+                        "'tooltipTitle':'FormMyTitle', " +
+                        "'tooltipTitleColor':'#dddddd', " +
+                        "'tooltipWidth':'601' " +
+                        "}"
+        );
+
+
+        TextFieldTag tag = new TextFieldTag();
+        tag.setPageContext(pageContext);
+        tag.setLabel("MyLabel");
+        tag.setId("myId");
+
+        tag.setTooltip("myTooltip");
+        tag.setTooltipConfig(
+                "#{ " +
+                        "'tooltipIcon':'/struts/tooltip/myTooltip.gif', " +
+                        "'tooltipAboveMousePointer':'true', " +
+                        "'tooltipBgColor':'#ffffff', " +
+                        "'tooltipBgImg':'/struts/tooltip/myBgImg.gif' " +
+                        "}"
+        );
+
+        formTag.doStartTag();
+        tag.doStartTag();
+        tag.doEndTag();
+        formTag.doEndTag();
+
+        verify(TooltipTest.class.getResource("tooltip-3.txt"));
+    }
+
+
+    public void testUsingParamValueToSetConfigurations() throws Exception {
+        XWorkStatic.getConfigurationManager().clearConfigurationProviders();
+        XWorkStatic.getConfigurationManager().addConfigurationProvider(new 
TestConfigurationProvider());
+
+        FormTag formTag = new FormTag();
+        formTag.setName("myForm");
+        formTag.setPageContext(pageContext);
+        formTag.setId("myFormId");
+        formTag.setAction("testAction");
+
+
+        ParamTag formParamTag = new ParamTag();
+        formParamTag.setPageContext(pageContext);
+        formParamTag.setName("tooltipConfig");
+        formParamTag.setValue(
+                "#{ " +
+                        "'tooltipIcon':'/struts/tooltip/formMyTooltip.gif', " +
+                        "'tooltipAboveMousePointer':'false', " +
+                        "'tooltipBgColor':'#aaaaaa', " +
+                        "'tooltipBgImg':'/struts/tooltip/formMyBgImg.gif', " +
+                        "'tooltipBorderWidth':'11', " +
+                        "'tooltipBorderColor':'#bbbbbb', " +
+                        "'tooltipDelay':'2001', " +
+                        "'tooltipFixCoordinateX':'301', " +
+                        "'tooltipFixCoordinateY':'301', " +
+                        "'tooltipFontColor':'#cccccc', " +
+                        "'tooltipFontFace':'Verdana,San-Serif', " +
+                        "'tooltipFontSize':'21', " +
+                        "'tooltipFontWeight':'normal', " +
+                        "'tooltipLeftOfMousePointer':'false', " +
+                        "'tooltipOffsetX':'11', " +
+                        "'tooltipOffsetY':'21', " +
+                        "'tooltipOpacity':'91', " +
+                        "'tooltipPadding':'31', " +
+                        "'tooltipShadowColor':'#cccccc', " +
+                        "'tooltipShadowWidth':'41', " +
+                        "'tooltipStatic':'false', " +
+                        "'tooltipSticky':'false', " +
+                        "'tooltipStayAppearTime':'3001', " +
+                        "'tooltipTextAlign':'left', " +
+                        "'tooltipTitle':'FormMyTitle', " +
+                        "'tooltipTitleColor':'#dddddd', " +
+                        "'tooltipWidth':'601' " +
+                        "}"
+        );
+
+
+        TextFieldTag tag = new TextFieldTag();
+        tag.setPageContext(pageContext);
+        tag.setLabel("MyLabel");
+        tag.setId("myId");
+        tag.setTooltip("myTooltip");
+
+        ParamTag textFieldParamTag = new ParamTag();
+        textFieldParamTag.setPageContext(pageContext);
+        textFieldParamTag.setName("tooltipConfig");
+        textFieldParamTag.setValue(
+                "#{ " +
+                        "'tooltipIcon':'/struts/tooltip/myTooltip.gif', " +
+                        "'tooltipAboveMousePointer':'true', " +
+                        "'tooltipBgColor':'#ffffff', " +
+                        "'tooltipBgImg':'/struts/tooltip/myBgImg.gif' " +
+                        "}"
+        );
+
+        formTag.doStartTag();
+        formParamTag.doStartTag();
+        formParamTag.doEndTag();
+        tag.doStartTag();
+        textFieldParamTag.doStartTag();
+        textFieldParamTag.doEndTag();
+        tag.doEndTag();
+        formTag.doEndTag();
+
+        verify(TooltipTest.class.getResource("tooltip-3.txt"));
+    }
+
+
+    public void testUsingParamBodyValueToSetConfigurations() throws Exception {
+        XWorkStatic.getConfigurationManager().clearConfigurationProviders();
+        XWorkStatic.getConfigurationManager().addConfigurationProvider(new 
TestConfigurationProvider());
+
+        FormTag formTag = new FormTag();
+        formTag.setName("myForm");
+        formTag.setPageContext(pageContext);
+        formTag.setId("myFormId");
+        formTag.setAction("testAction");
+
+
+        ParamTag formParamTag = new ParamTag();
+        formParamTag.setPageContext(pageContext);
+        formParamTag.setName("tooltipConfig");
+        StrutsMockBodyContent bodyContent = new StrutsMockBodyContent(new 
MockJspWriter());
+        bodyContent.setString(
+                "tooltipIcon = /struts/tooltip/formMyTooltip.gif | " +
+                        "tooltipAboveMousePointer = false | " +
+                        "tooltipBgColor = #aaaaaa| " +
+                        "tooltipBgImg = /struts/tooltip/formMyBgImg.gif | " +
+                        "tooltipBorderWidth = 11 | " +
+                        "tooltipBorderColor = #bbbbbb| " +
+                        "tooltipDelay = 2001 | " +
+                        "tooltipFixCoordinateX = 301| " +
+                        "tooltipFixCoordinateY = 301| " +
+                        "tooltipFontColor = #cccccc | " +
+                        "tooltipFontFace = Verdana,San-Serif | " +
+                        "tooltipFontSize = 21 | " +
+                        "tooltipFontWeight = normal | " +
+                        "tooltipLeftOfMousePointer = false | " +
+                        "tooltipOffsetX = 11 | " +
+                        "tooltipOffsetY = 21| " +
+                        "tooltipOpacity = 91| " +
+                        "tooltipPadding = 31| " +
+                        "tooltipShadowColor = #cccccc| " +
+                        "tooltipShadowWidth = 41| " +
+                        "tooltipStatic = false | " +
+                        "tooltipSticky = false| " +
+                        "tooltipStayAppearTime = 3001| " +
+                        "tooltipTextAlign = left| " +
+                        "tooltipTitle = FormMyTitle| " +
+                        "tooltipTitleColor = #dddddd| " +
+                        "tooltipWidth = 601 "
+        );
+        formParamTag.setBodyContent(bodyContent);
+
+        TextFieldTag tag = new TextFieldTag();
+        tag.setPageContext(pageContext);
+        tag.setLabel("MyLabel");
+        tag.setId("myId");
+        tag.setTooltip("myTooltip");
+
+
+        ParamTag textFieldParamTag = new ParamTag();
+        textFieldParamTag.setPageContext(pageContext);
+        textFieldParamTag.setName("tooltipConfig");
+        StrutsMockBodyContent bodyContent2 = new StrutsMockBodyContent(new 
MockJspWriter());
+        bodyContent2.setString(
+                "tooltipIcon = /struts/tooltip/myTooltip.gif | " +
+                        "tooltipAboveMousePointer = true | " +
+                        "tooltipBgColor = #ffffff | " +
+                        "tooltipBgImg = /struts/tooltip/myBgImg.gif "
+        );
+        textFieldParamTag.setBodyContent(bodyContent2);
+
+        formTag.doStartTag();
+        formParamTag.doStartTag();
+        formParamTag.doEndTag();
+        tag.doStartTag();
+        textFieldParamTag.doStartTag();
+        textFieldParamTag.doEndTag();
+        tag.doEndTag();
+        formTag.doEndTag();
+
+        verify(TooltipTest.class.getResource("tooltip-3.txt"));
+    }
 }


Reply via email to