Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java Sun Sep 3 02:22:46 2006 @@ -17,9 +17,10 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.jsp.JspWriter; import java.io.IOException; import java.io.StringWriter; + +import javax.servlet.jsp.JspWriter; /**
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java Sun Sep 3 02:22:46 2006 @@ -17,13 +17,14 @@ */ package org.apache.struts2.views.jsp; -import com.mockobjects.servlet.MockPageContext; +import java.util.HashMap; +import java.util.Map; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import java.util.HashMap; -import java.util.Map; + +import com.mockobjects.servlet.MockPageContext; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java Sun Sep 3 02:22:46 2006 @@ -17,14 +17,19 @@ */ package org.apache.struts2.views.jsp; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.ServletException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.*; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java Sun Sep 3 02:22:46 2006 @@ -23,6 +23,7 @@ import org.apache.struts2.util.SubsetIteratorFilter.Decider; import org.apache.struts2.views.jsp.iterator.SubsetIteratorTag; + import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionSupport; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java Sun Sep 3 02:22:46 2006 @@ -17,29 +17,26 @@ */ package org.apache.struts2.views.jsp; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Locale; + +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.tagext.BodyTag; + import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsException; import org.apache.struts2.TestAction; import org.apache.struts2.components.Text; -import org.apache.struts2.views.jsp.ui.TestAction1; import org.apache.struts2.views.jsp.ui.StrutsBodyContent; +import org.apache.struts2.views.jsp.ui.TestAction1; -import com.mockobjects.servlet.MockBodyContent; import com.mockobjects.servlet.MockJspWriter; import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.OgnlValueStack; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.BodyTag; -import javax.servlet.jsp.tagext.Tag; -import javax.servlet.jsp.tagext.TagSupport; - -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Locale; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java Sun Sep 3 02:22:46 2006 @@ -18,16 +18,11 @@ package org.apache.struts2.views.jsp; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import javax.servlet.jsp.JspWriter; import org.apache.struts2.components.URL; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.mock.web.MockHttpServletResponse; - -import com.opensymphony.xwork2.util.OgnlValueStack; /** * Unit test for [EMAIL PROTECTED] URLTag}. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java Sun Sep 3 02:22:46 2006 @@ -23,7 +23,7 @@ import java.util.List; import org.apache.struts2.views.jsp.AbstractUITagTest; -import org.apache.struts2.views.jsp.ui.ActionErrorTag; + import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionSupport; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java Sun Sep 3 02:22:46 2006 @@ -23,6 +23,7 @@ import java.util.List; import org.apache.struts2.views.jsp.AbstractUITagTest; + import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionSupport; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java Sun Sep 3 02:22:46 2006 @@ -17,12 +17,12 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.struts2.TestAction; -import org.apache.struts2.views.jsp.AbstractUITagTest; - import java.util.ArrayList; import java.util.Collection; import java.util.Map; + +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java Sun Sep 3 02:22:46 2006 @@ -17,10 +17,10 @@ */ package org.apache.struts2.views.jsp.ui; +import java.util.Map; + import org.apache.struts2.TestAction; import org.apache.struts2.views.jsp.AbstractUITagTest; - -import java.util.Map; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java Sun Sep 3 02:22:46 2006 @@ -17,13 +17,13 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.struts2.TestAction; -import org.apache.struts2.views.jsp.AbstractUITagTest; - import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java Sun Sep 3 02:22:46 2006 @@ -17,10 +17,11 @@ */ package org.apache.struts2.views.jsp.ui; +import java.util.Locale; + import org.apache.struts2.views.jsp.AbstractUITagTest; -import com.opensymphony.xwork2.ActionContext; -import java.util.Locale; +import com.opensymphony.xwork2.ActionContext; /** * Unit test for [EMAIL PROTECTED] DatePickerTag}. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java Sun Sep 3 02:22:46 2006 @@ -17,14 +17,15 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.struts2.views.jsp.AbstractTagTest; -import org.apache.struts2.views.jsp.DateTag; -import com.opensymphony.xwork2.ActionContext; - import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; + +import org.apache.struts2.views.jsp.AbstractTagTest; +import org.apache.struts2.views.jsp.DateTag; + +import com.opensymphony.xwork2.ActionContext; /** * Unit test for [EMAIL PROTECTED] org.apache.struts2.components.Date}. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java Sun Sep 3 02:22:46 2006 @@ -17,12 +17,12 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.struts2.TestAction; -import org.apache.struts2.views.jsp.AbstractUITagTest; - import java.util.ArrayList; import java.util.Collection; import java.util.List; + +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** * Test case for DoubleSelectTag. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java Sun Sep 3 02:22:46 2006 @@ -25,6 +25,7 @@ import org.apache.struts2.views.jsp.AbstractUITagTest; import org.apache.struts2.views.jsp.ParamTag; + import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionSupport; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java Sun Sep 3 02:22:46 2006 @@ -17,10 +17,10 @@ */ package org.apache.struts2.views.jsp.ui; +import java.util.Map; + import org.apache.struts2.TestAction; import org.apache.struts2.views.jsp.AbstractUITagTest; - -import java.util.Map; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java Sun Sep 3 02:22:46 2006 @@ -17,13 +17,10 @@ */ package org.apache.struts2.views.jsp.ui; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.config.RuntimeConfiguration; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.InterceptorMapping; -import com.opensymphony.xwork2.validator.ValidationInterceptor; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import org.apache.struts2.StrutsConstants; import org.apache.struts2.TestAction; import org.apache.struts2.TestConfigurationProvider; @@ -32,9 +29,13 @@ import org.apache.struts2.views.jsp.AbstractUITagTest; import org.apache.struts2.views.jsp.ActionTag; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.ObjectFactory; +import com.opensymphony.xwork2.config.RuntimeConfiguration; +import com.opensymphony.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.config.entities.InterceptorMapping; +import com.opensymphony.xwork2.validator.ValidationInterceptor; /** @@ -43,8 +44,6 @@ public class FormTagTest extends AbstractUITagTest { public void testFormWithActionAttributeContainingBothActionAndMethod() throws Exception { - TestAction testAction = (TestAction) action; - FormTag tag = new FormTag(); tag.setPageContext(pageContext); tag.setName("myForm"); @@ -63,8 +62,6 @@ public void testFormWithActionAttributeContainingBothActionAndMethodAndNamespace() throws Exception { - TestAction testAction = (TestAction) action; - FormTag tag = new FormTag(); tag.setPageContext(pageContext); tag.setName("myForm"); Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java Sun Sep 3 02:22:46 2006 @@ -17,8 +17,8 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.struts2.views.jsp.AbstractUITagTest; import org.apache.struts2.components.Head; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** * Unit test for [EMAIL PROTECTED] HeadTag}. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java Sun Sep 3 02:22:46 2006 @@ -17,11 +17,11 @@ */ package org.apache.struts2.views.jsp.ui; +import java.util.HashMap; +import java.util.Map; + import org.apache.struts2.TestAction; import org.apache.struts2.views.jsp.AbstractUITagTest; - -import java.util.Map; -import java.util.HashMap; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java Sun Sep 3 02:22:46 2006 @@ -17,14 +17,15 @@ */ package org.apache.struts2.views.jsp.ui; -import com.mockobjects.dynamic.C; -import com.mockobjects.dynamic.Mock; -import org.apache.struts2.TestAction; -import org.apache.struts2.views.jsp.AbstractUITagTest; - import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; + +import com.mockobjects.dynamic.C; +import com.mockobjects.dynamic.Mock; /** * JspTemplateTest Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java Sun Sep 3 02:22:46 2006 @@ -17,11 +17,11 @@ */ package org.apache.struts2.views.jsp.ui; +import java.util.HashMap; +import java.util.Map; + import org.apache.struts2.TestAction; import org.apache.struts2.views.jsp.AbstractUITagTest; - -import java.util.Map; -import java.util.HashMap; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java Sun Sep 3 02:22:46 2006 @@ -17,11 +17,12 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.jsp.tagext.BodyTagSupport; import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Map; + +import javax.servlet.jsp.tagext.BodyTagSupport; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java Sun Sep 3 02:22:46 2006 @@ -17,11 +17,11 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.struts2.TestAction; -import org.apache.struts2.views.jsp.AbstractUITagTest; - import java.util.HashMap; import java.util.LinkedHashMap; + +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java Sun Sep 3 02:22:46 2006 @@ -17,11 +17,11 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.struts2.TestAction; -import org.apache.struts2.views.jsp.AbstractUITagTest; - import java.util.HashMap; import java.util.Map; + +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** * Reset Component Test. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java Sun Sep 3 02:22:46 2006 @@ -17,13 +17,13 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.struts2.TestAction; -import org.apache.struts2.views.jsp.AbstractUITagTest; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; import java.util.List; + +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java Sun Sep 3 02:22:46 2006 @@ -17,12 +17,13 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.BodyContent; import java.io.IOException; import java.io.Reader; import java.io.StringReader; import java.io.Writer; + +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.tagext.BodyContent; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java Sun Sep 3 02:22:46 2006 @@ -18,8 +18,6 @@ package org.apache.struts2.views.jsp.ui; import org.apache.struts2.views.jsp.AbstractUITagTest; -import org.apache.struts2.views.jsp.ui.AnchorTest; -import org.apache.struts2.views.jsp.ui.SubmitTag; /** * Test Submit component in "ajax" theme. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java Sun Sep 3 02:22:46 2006 @@ -17,11 +17,11 @@ */ package org.apache.struts2.views.jsp.ui; +import java.util.HashMap; +import java.util.Map; + import org.apache.struts2.TestAction; import org.apache.struts2.views.jsp.AbstractUITagTest; - -import java.util.Map; -import java.util.HashMap; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java Sun Sep 3 02:22:46 2006 @@ -17,10 +17,10 @@ */ package org.apache.struts2.views.jsp.ui; +import java.util.Map; + import org.apache.struts2.TestAction; import org.apache.struts2.views.jsp.AbstractUITagTest; - -import java.util.Map; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java Sun Sep 3 02:22:46 2006 @@ -17,13 +17,14 @@ */ package org.apache.struts2.views.jsp.ui; +import java.util.HashMap; +import java.util.Map; + import org.apache.struts2.TestAction; import org.apache.struts2.views.freemarker.tags.TextFieldModel; import org.apache.struts2.views.jsp.AbstractUITagTest; -import freemarker.template.TransformControl; -import java.util.HashMap; -import java.util.Map; +import freemarker.template.TransformControl; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java Sun Sep 3 02:22:46 2006 @@ -17,10 +17,10 @@ */ package org.apache.struts2.views.jsp.ui; +import javax.servlet.jsp.JspException; + import org.apache.struts2.util.TokenHelper; import org.apache.struts2.views.jsp.AbstractUITagTest; - -import javax.servlet.jsp.JspException; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java Sun Sep 3 02:22:46 2006 @@ -17,11 +17,12 @@ */ package org.apache.struts2.views.jsp.ui; -import com.mockobjects.servlet.MockJspWriter; import org.apache.struts2.TestConfigurationProvider; import org.apache.struts2.views.jsp.AbstractUITagTest; import org.apache.struts2.views.jsp.ParamTag; import org.apache.struts2.views.jsp.StrutsMockBodyContent; + +import com.mockobjects.servlet.MockJspWriter; /** * UI components Tooltip test case. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java Sun Sep 3 02:22:46 2006 @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.struts2.views.jsp.AbstractUITagTest; + import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionSupport; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java Sun Sep 3 02:22:46 2006 @@ -17,10 +17,12 @@ */ package org.apache.struts2.views.util; -import org.apache.struts2.config.Settings; +import junit.framework.TestCase; + import org.apache.struts2.StrutsConstants; +import org.apache.struts2.config.Settings; + import com.opensymphony.xwork2.util.OgnlValueStack; -import junit.framework.TestCase; /** * Test case for ContextUtil Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java Sun Sep 3 02:22:46 2006 @@ -20,10 +20,11 @@ * <code>ResourceUtilTest</code> * */ +import javax.servlet.http.HttpServletRequest; + import junit.framework.TestCase; -import org.easymock.MockControl; -import javax.servlet.http.HttpServletRequest; +import org.easymock.MockControl; public class ResourceUtilTest extends TestCase { Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java Sun Sep 3 02:22:46 2006 @@ -17,19 +17,19 @@ */ package org.apache.struts2.views.util; -import com.mockobjects.dynamic.Mock; -import org.apache.struts2.StrutsTestCase; -import org.apache.struts2.StrutsConstants; -import org.apache.struts2.config.Settings; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.TreeMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.TreeMap; -import java.util.HashMap; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.config.Settings; + +import com.mockobjects.dynamic.Mock; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java?rev=439747&r1=439746&r2=439747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java Sun Sep 3 02:22:46 2006 @@ -17,21 +17,22 @@ */ package org.apache.struts2.views.xslt; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.transform.TransformerException; + import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsTestCase; -import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.mock.MockActionInvocation; -import com.opensymphony.xwork2.util.OgnlValueStack; -import junit.framework.TestCase; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockServletContext; -import javax.xml.transform.TransformerException; -import java.util.List; -import java.util.ArrayList; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.mock.MockActionInvocation; +import com.opensymphony.xwork2.util.OgnlValueStack; /** * Unit test for [EMAIL PROTECTED] XSLTResult}.
