struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgra...@apache.org
Subject cvs commit: jakarta-struts/src/test/org/apache/struts/util TestRequestUtils.java
Date Sat, 02 Aug 2003 21:18:46 GMT
dgraham     2003/08/02 14:18:46

  Modified:    src/test/org/apache/struts/util TestRequestUtils.java
  Log:
  Replace RequestUtils calls with ModuleUtils.
  
  Revision  Changes    Path
  1.22      +10 -9     jakarta-struts/src/test/org/apache/struts/util/TestRequestUtils.java
  
  Index: TestRequestUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/util/TestRequestUtils.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- TestRequestUtils.java	26 Jul 2003 04:25:16 -0000	1.21
  +++ TestRequestUtils.java	2 Aug 2003 21:18:46 -0000	1.22
  @@ -68,6 +68,7 @@
   import java.util.Map;
   
   import javax.servlet.jsp.JspException;
  +
   import junit.framework.Test;
   import junit.framework.TestSuite;
   
  @@ -76,8 +77,8 @@
   import org.apache.struts.action.ActionMapping;
   import org.apache.struts.action.DynaActionForm;
   import org.apache.struts.action.RequestProcessor;
  -import org.apache.struts.config.ModuleConfig;
   import org.apache.struts.config.ForwardConfig;
  +import org.apache.struts.config.ModuleConfig;
   import org.apache.struts.mock.MockFormBean;
   import org.apache.struts.mock.MockPrincipal;
   import org.apache.struts.mock.TestMockBase;
  @@ -1489,7 +1490,7 @@
       public void testSelectApplication1a() {
   
           request.setPathElements("/myapp", "/noform.do", null, null);
  -        RequestUtils.selectModule(request, context);
  +        ModuleUtils.getInstance().selectModule(request, context);
           ModuleConfig moduleConfig = (ModuleConfig)
               request.getAttribute(Globals.MODULE_KEY);
           assertNotNull("Selected a module", moduleConfig);
  @@ -1506,7 +1507,7 @@
           context.setAttribute(Globals.MODULE_PREFIXES_KEY, prefixes);    
           request.setPathElements("/myapp", "/2/noform.do", null, null);
           
  -        RequestUtils.selectModule(request, context);
  +        ModuleUtils.getInstance().selectModule(request, context);
           ModuleConfig moduleConfig = (ModuleConfig)
               request.getAttribute(Globals.MODULE_KEY);
           assertNotNull("Selected a module", moduleConfig);
  @@ -1523,7 +1524,7 @@
           request.setPathElements("/myapp", "/2/noform.do", null, null);
           request.setAttribute(RequestProcessor.INCLUDE_SERVLET_PATH,
                                "/noform.do");
  -        RequestUtils.selectModule(request, context);
  +        ModuleUtils.getInstance().selectModule(request, context);
           ModuleConfig moduleConfig = (ModuleConfig)
               request.getAttribute(Globals.MODULE_KEY);
           assertNotNull("Selected an application", moduleConfig);
  @@ -1541,7 +1542,7 @@
           request.setPathElements("/myapp", "/noform.do", null, null);
           request.setAttribute(RequestProcessor.INCLUDE_SERVLET_PATH,
                                "/2/noform.do");
  -        RequestUtils.selectModule(request, context);
  +        ModuleUtils.getInstance().selectModule(request, context);
           ModuleConfig moduleConfig = (ModuleConfig)
               request.getAttribute(Globals.MODULE_KEY);
           assertNotNull("Selected a module", moduleConfig);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org


Mime
View raw message