struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r439739 [12/12] - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/ main/java/org/apache/struts2/components/ main/java/org/apache/struts2/components/table/ main/java/org/apache/struts2/components/table/renderer/ main/java/org...
Date Sun, 03 Sep 2006 08:06:13 GMT
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=439739&r1=439738&r2=439739&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 01:05:51 2006
@@ -17,12 +17,11 @@
  */
 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=439739&r1=439738&r2=439739&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 01:05:51 2006
@@ -23,7 +23,6 @@
 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=439739&r1=439738&r2=439739&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 01:05:51 2006
@@ -17,12 +17,10 @@
  */
 package org.apache.struts2.views.util;
 
-import junit.framework.TestCase;
-
-import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.config.Settings;
-
+import org.apache.struts2.StrutsConstants;
 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=439739&r1=439738&r2=439739&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 01:05:51 2006
@@ -20,11 +20,10 @@
  * <code>ResourceUtilTest</code>
  *
  */
-import javax.servlet.http.HttpServletRequest;
-
 import junit.framework.TestCase;
-
 import org.easymock.MockControl;
+
+import javax.servlet.http.HttpServletRequest;
 
 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=439739&r1=439738&r2=439739&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 01:05:51 2006
@@ -17,19 +17,19 @@
  */
 package org.apache.struts2.views.util;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.TreeMap;
+import com.mockobjects.dynamic.Mock;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.config.Settings;
-
-import com.mockobjects.dynamic.Mock;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.HashMap;
 
 
 /**
@@ -281,6 +281,21 @@
     	assertEquals(result.get("bbb"), "bbbval");
     	assertEquals(result.get("ccc"), "");
     }
+    
+    public void testParseEmptyQuery() throws Exception {
+    	Map result = UrlHelper.parseQueryString("");
+    	
+    	assertNotNull(result);
+    	assertEquals(result.size(), 0);
+    }
+    
+    public void testParseNullQuery() throws Exception {
+    	Map result = UrlHelper.parseQueryString(null);
+    	
+    	assertNotNull(result);
+    	assertEquals(result.size(), 0);
+    }
+    
     
     public void testTranslateAndEncode() throws Exception {
     	String defaultI18nEncoding = Settings.get(StrutsConstants.STRUTS_I18N_ENCODING);

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=439739&r1=439738&r2=439739&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 01:05:51 2006
@@ -17,22 +17,21 @@
  */
 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 com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import javax.xml.transform.TransformerException;
+import java.util.List;
+import java.util.ArrayList;
 
 /**
  * Unit test for {@link XSLTResult}.

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl
(original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl
Sun Sep  3 01:05:51 2006
@@ -4,9 +4,9 @@
 </head>
 
 <body>
-<@ww.form action="guess" method="post">
-    <@ww.textfield label="Guess a number" name="guess"/>
-    <@ww.submit value="Guess"/>
-</@ww.form>
+<@s.form action="guess" method="post">
+    <@s.textfield label="Guess a number" name="guess"/>
+    <@s.submit value="Guess"/>
+</@s.form>
 </body>
 </html>

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
(original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
Sun Sep  3 01:05:51 2006
@@ -2,6 +2,3 @@
 <table class="wwFormTable">
 </table>
 </form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript" type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
(original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
Sun Sep  3 01:05:51 2006
@@ -2,6 +2,3 @@
 <table class="wwFormTable">
 </table>
 </form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript" type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
(original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
Sun Sep  3 01:05:51 2006
@@ -28,7 +28,3 @@
 				selectAllOptionsExceptSome(updownselectObj, "key", "");
 			});
 </script>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript" type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
(original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
Sun Sep  3 01:05:51 2006
@@ -29,9 +29,6 @@
 			});
 </script>
 
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript" type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-
 <script>
     function validateForm_myAction() {
         form = document.getElementById("myAction");

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt
(original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt
Sun Sep  3 01:05:51 2006
@@ -2,7 +2,3 @@
 <table class="wwFormTable">
 </table>
 </form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript" type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt
(original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt
Sun Sep  3 01:05:51 2006
@@ -2,7 +2,3 @@
 <table class="wwFormTable">
 </table>
 </form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript" type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt
(original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt
Sun Sep  3 01:05:51 2006
@@ -2,7 +2,3 @@
 <table class="wwFormTable">
 </table>
 </form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript" type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
(original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
Sun Sep  3 01:05:51 2006
@@ -27,7 +27,3 @@
 				selectAllOptionsExceptSome(updownselectObj, "key", "");
 			});
 </script>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript" type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt
(original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt
Sun Sep  3 01:05:51 2006
@@ -2,7 +2,3 @@
 <table class="wwFormTable">
 </table>
 </form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript" type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt
(original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt
Sun Sep  3 01:05:51 2006
@@ -2,7 +2,3 @@
 <table class="wwFormTable">
 </table>
 </form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript" type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt
(original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt
Sun Sep  3 01:05:51 2006
@@ -2,6 +2,3 @@
 <table class="wwFormTable">
 </table>
 </form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript" type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>

Modified: struts/struts2/trunk/core/src/test/resources/template/test/checkbox.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/template/test/checkbox.jsp?rev=439739&r1=439738&r2=439739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/template/test/checkbox.jsp (original)
+++ struts/struts2/trunk/core/src/test/resources/template/test/checkbox.jsp Sun Sep  3 01:05:51
2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="s" uri="/tags" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <input type="checkbox" <s:if test="parameters['nameValue']">checked="checked"</s:if>
    name="<s:property value="parameters['name']"/>"



Mime
View raw message