[jboss-cvs] jboss-seam/src/main/org/jboss/seam/mock ...
Gavin King
gavin.king at jboss.com
Sun Feb 4 15:26:15 EST 2007
User: gavin
Date: 07/02/04 15:26:15
Modified: src/main/org/jboss/seam/mock MockExternalContext.java
MockHttpServletRequest.java MockViewHandler.java
Added: src/main/org/jboss/seam/mock
MockHttpServletResponse.java
Log:
fix tests
Revision Changes Path
1.12 +5 -1 jboss-seam/src/main/org/jboss/seam/mock/MockExternalContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MockExternalContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockExternalContext.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- MockExternalContext.java 4 Feb 2007 02:30:48 -0000 1.11
+++ MockExternalContext.java 4 Feb 2007 20:26:14 -0000 1.12
@@ -29,7 +29,7 @@
/**
* @author Gavin King
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class MockExternalContext extends ExternalContext
{
@@ -42,24 +42,28 @@
{
this.context = new MockServletContext();
this.request = new MockHttpServletRequest( new MockHttpSession(context) );
+ this.response = new MockHttpServletResponse();
}
public MockExternalContext(ServletContext context)
{
this.context = context;
this.request = new MockHttpServletRequest( new MockHttpSession(context) );
+ this.response = new MockHttpServletResponse();
}
public MockExternalContext(ServletContext context, HttpSession session)
{
this.context = context;
this.request = new MockHttpServletRequest(session);
+ this.response = new MockHttpServletResponse();
}
public MockExternalContext(ServletContext context, HttpServletRequest request)
{
this.context = context;
this.request = request;
+ this.response = new MockHttpServletResponse();
}
public MockExternalContext(ServletContext context, HttpServletRequest request, HttpServletResponse response)
1.11 +3 -5 jboss-seam/src/main/org/jboss/seam/mock/MockHttpServletRequest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MockHttpServletRequest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockHttpServletRequest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- MockHttpServletRequest.java 16 Nov 2006 00:56:56 -0000 1.10
+++ MockHttpServletRequest.java 4 Feb 2007 20:26:14 -0000 1.11
@@ -26,7 +26,7 @@
/**
* @author Gavin King
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class MockHttpServletRequest implements HttpServletRequest
{
@@ -118,8 +118,7 @@
public String getContextPath()
{
- //TODO
- return null;
+ return "/project";
}
public String getQueryString()
@@ -169,8 +168,7 @@
public String getServletPath()
{
- //TODO
- return null;
+ return "/page.seam";
}
public HttpSession getSession(boolean create)
1.6 +1 -1 jboss-seam/src/main/org/jboss/seam/mock/MockViewHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MockViewHandler.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockViewHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- MockViewHandler.java 4 Feb 2007 02:30:48 -0000 1.5
+++ MockViewHandler.java 4 Feb 2007 20:26:14 -0000 1.6
@@ -36,7 +36,7 @@
String contextPath = ctx.getExternalContext().getRequestContextPath();
String pathInfo = ctx.getExternalContext().getRequestPathInfo();
String servletPath = ctx.getExternalContext().getRequestServletPath();
- if ( Strings.isEmpty( pathInfo ) )
+ if ( Strings.isEmpty(pathInfo) )
{
return contextPath + viewId.substring( 0, viewId.lastIndexOf('.') ) +
servletPath.substring( servletPath.lastIndexOf('.') );
1.1 date: 2007/02/04 20:26:14; author: gavin; state: Exp;jboss-seam/src/main/org/jboss/seam/mock/MockHttpServletResponse.java
Index: MockHttpServletResponse.java
===================================================================
package org.jboss.seam.mock;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
public class MockHttpServletResponse implements HttpServletResponse
{
public void addCookie(Cookie arg0)
{
// TODO Auto-generated method stub
}
public void addDateHeader(String arg0, long arg1)
{
// TODO Auto-generated method stub
}
public void addHeader(String arg0, String arg1)
{
// TODO Auto-generated method stub
}
public void addIntHeader(String arg0, int arg1)
{
// TODO Auto-generated method stub
}
public boolean containsHeader(String arg0)
{
// TODO Auto-generated method stub
return false;
}
public String encodeRedirectURL(String arg0)
{
// TODO Auto-generated method stub
return null;
}
public String encodeRedirectUrl(String arg0)
{
// TODO Auto-generated method stub
return null;
}
public String encodeURL(String arg0)
{
// TODO Auto-generated method stub
return null;
}
public String encodeUrl(String arg0)
{
// TODO Auto-generated method stub
return null;
}
public void sendError(int arg0) throws IOException
{
// TODO Auto-generated method stub
}
public void sendError(int arg0, String arg1) throws IOException
{
// TODO Auto-generated method stub
}
public void sendRedirect(String arg0) throws IOException
{
// TODO Auto-generated method stub
}
public void setDateHeader(String arg0, long arg1)
{
// TODO Auto-generated method stub
}
public void setHeader(String arg0, String arg1)
{
// TODO Auto-generated method stub
}
public void setIntHeader(String arg0, int arg1)
{
// TODO Auto-generated method stub
}
public void setStatus(int arg0)
{
// TODO Auto-generated method stub
}
public void setStatus(int arg0, String arg1)
{
// TODO Auto-generated method stub
}
public void flushBuffer() throws IOException
{
// TODO Auto-generated method stub
}
public int getBufferSize()
{
// TODO Auto-generated method stub
return 0;
}
public String getCharacterEncoding()
{
// TODO Auto-generated method stub
return null;
}
public String getContentType()
{
// TODO Auto-generated method stub
return null;
}
public Locale getLocale()
{
// TODO Auto-generated method stub
return null;
}
public ServletOutputStream getOutputStream() throws IOException
{
// TODO Auto-generated method stub
return null;
}
public PrintWriter getWriter() throws IOException
{
// TODO Auto-generated method stub
return null;
}
public boolean isCommitted()
{
// TODO Auto-generated method stub
return false;
}
public void reset()
{
// TODO Auto-generated method stub
}
public void resetBuffer()
{
// TODO Auto-generated method stub
}
public void setBufferSize(int arg0)
{
// TODO Auto-generated method stub
}
public void setCharacterEncoding(String arg0)
{
// TODO Auto-generated method stub
}
public void setContentLength(int arg0)
{
// TODO Auto-generated method stub
}
public void setContentType(String arg0)
{
// TODO Auto-generated method stub
}
public void setLocale(Locale arg0)
{
// TODO Auto-generated method stub
}
}
More information about the jboss-cvs-commits
mailing list