svn commit: r454571 - in /struts/struts2/trunk/core/src/test/java/org/apache/struts2: components/ComponentTest.java portlet/util/PortletUrlHelperTest.java views/jsp/AbstractTagTest.java

[jmitchell]

Author: jmitchell
Date: Mon Oct  9 17:22:09 2006
New Revision: 454571

URL: http://svn.apache.org/viewvc?view=rev&rev=454571
Log:
WW-1453
 Simple cleanup items
  - remove unused variables
  - change static access to static call


Modified:
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java?view=diff&rev=454571&r1=454570&r2=454571
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
 Mon Oct  9 17:22:09 2006
@@ -19,7 +19,6 @@
 
 import java.util.Iterator;
 import java.util.Locale;
-import java.util.ResourceBundle;
 import java.util.Stack;
 
 import javax.servlet.jsp.tagext.TagSupport;
@@ -436,7 +435,6 @@
                t.setPageContext(pageContext);
                t.setName("textFieldName");
                
-        ResourceBundle bundle = 
ResourceBundle.getBundle("org.apache.struts2.components.tempo");
                
LocalizedTextUtil.addDefaultResourceBundle("org.apache.struts2.components.temp");
                
                I18nTag tag = new I18nTag();

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java?view=diff&rev=454571&r1=454570&r2=454571
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
 Mon Oct  9 17:22:09 2006
@@ -92,7 +92,7 @@
         renderRequestControl.replay();
         renderResponseControl.replay();
         portletUrlControl.replay();
-        String urlStr = PortletUrlHelper.buildUrl("testAction", null,
+        PortletUrlHelper.buildUrl("testAction", null,
                 new HashMap(), null, null, null);
         portletUrlControl.verify();
         renderRequestControl.verify();
@@ -110,7 +110,7 @@
         renderRequestControl.replay();
         renderResponseControl.replay();
         portletUrlControl.replay();
-        String urlStr = PortletUrlHelper.buildUrl("testAction", null,
+        PortletUrlHelper.buildUrl("testAction", null,
                 new HashMap(), null, "edit", null);
         portletUrlControl.verify();
         renderRequestControl.verify();
@@ -128,7 +128,7 @@
         renderRequestControl.replay();
         renderResponseControl.replay();
         portletUrlControl.replay();
-        String urlStr = PortletUrlHelper.buildUrl("testAction", null,
+        PortletUrlHelper.buildUrl("testAction", null,
                 new HashMap(), null, null, "maximized");
         portletUrlControl.verify();
         renderRequestControl.verify();
@@ -146,7 +146,7 @@
         renderRequestControl.replay();
         renderResponseControl.replay();
         portletUrlControl.replay();
-        String urlStr = PortletUrlHelper.buildUrl("testAction", null,
+        PortletUrlHelper.buildUrl("testAction", null,
                 new HashMap(), "action", null, null);
         portletUrlControl.verify();
         renderRequestControl.verify();

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java?view=diff&rev=454571&r1=454570&r2=454571
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
 Mon Oct  9 17:22:09 2006
@@ -100,7 +100,7 @@
         pageContext.setServletContext(servletContext);
 
         Dispatcher du = new Dispatcher(pageContext.getServletContext());
-        du.setInstance(du);
+        Dispatcher.setInstance(du);
         du.setConfigurationManager(configurationManager);
         session = new SessionMap(request);
         Map extraContext = du.createContextMap(new RequestMap(request),