[MO-java-dev] CVS: mockobjects-java/src/j2ee/com/mockobjects/servlet MockFilterChain.java,NONE,1.1 MockFilterConfig.java,NONE,1.1 MockJspWriter.java,NONE,1.1 MockPageContext.java,NONE,1.1 MockServletConfig.java,NONE,1.1 MockServletContext.java,NONE,1.1 MockHttpServletRequest.java,1.1,1.2 MockHttpServletResponse.java,1.1,1.2 MockHttpSession.java,1.1,1.2

[Jeff M. <cus...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/com/mockobjects/servlet
In directory usw-pr-cvs1:/tmp/cvs-serv3825

Modified Files:
	MockHttpServletRequest.java MockHttpServletResponse.java 
	MockHttpSession.java 
Added Files:
	MockFilterChain.java MockFilterConfig.java MockJspWriter.java 
	MockPageContext.java MockServletConfig.java 
	MockServletContext.java 
Log Message:
Added new JSP mock objects
Continued adding support for servlet packages


--- NEW FILE: MockFilterChain.java ---
package com.mockobjects.servlet;

import com.mockobjects.*;
import javax.servlet.*;
import java.io.IOException;

public class MockFilterChain extends MockObject implements FilterChain {

    public void doFilter(ServletRequest request, ServletResponse response)
    throws IOException, ServletException{
    }
}

--- NEW FILE: MockFilterConfig.java ---
package com.mockobjects.servlet;

import com.mockobjects.*;
import java.util.*;
import javax.servlet.*;

public class MockFilterConfig extends MockObject implements FilterConfig {
    private ServletContext servletContext;

    public String getFilterName(){
        return null;
    }

    public void setupGetServletContext(ServletContext servletContext){
        this.servletContext = servletContext;
    }

    public ServletContext getServletContext(){
        return servletContext;
    }

    public String getInitParameter(String name){
        return null;
    }

    public Enumeration getInitParameterNames(){
        return null;
    }

}


--- NEW FILE: MockJspWriter.java ---
package com.mockobjects.servlet;

import javax.servlet.*;
import javax.servlet.http.*;
import javax.servlet.jsp.*;
import junit.framework.*;
import junit.textui.*;
import java.util.*;
import java.io.*;
import java.net.*;
import com.mockobjects.*;

public class MockJspWriter extends JspWriter{
    private ExpectationValue expectedData = new ExpectationValue("data");
    private StringWriter stringWriter = new StringWriter();
    private PrintWriter printWriter = new PrintWriter(stringWriter);

    public MockJspWriter(){
        super(0, true);
    }

    public void setExpectedData(String data){
        expectedData.setExpected(data);
    }

    public void newLine(){
    }

    public void flush() {
    }
    public void print(double d){
    }
    public void println(){
    }
    public void close(){
    }
    public void print(int i){
    }
    public void print(long l){
    }
    public void print(float f){
    }
    public void println(char c){
    }
    public void clear(){
    }
    public void print(boolean b){
    }
    public void print(String s){
        printWriter.print(s);
    }
    public void println(String s){
        printWriter.print(s);
    }
    public void print(char c){
    }
    public void write(char[] c, int i1, int i2) {
    }
    public void println(char[] c){
    }
    public void println(boolean b){
    }
    public void clearBuffer(){
    }
    public void print(Object o){
    }
    public void println(long l){
    }
    public void println(int i){
    }
    public void print(char[] c){
    }
    public void println(float f){
    }
    public void println(double d){
    }
    public int getRemaining(){
        return -1;
    }
    public void println(Object o){
    }

    public void verify(){
        printWriter.flush();
        expectedData.setActual(stringWriter.toString());
        expectedData.verify();
    }
}


--- NEW FILE: MockPageContext.java ---
package com.mockobjects.servlet;

import java.util.*;
import javax.servlet.*;
import javax.servlet.http.*;
import javax.servlet.jsp.*;

public class MockPageContext extends PageContext{
    private JspWriter jspWriter;
    private ServletRequest request;
    private HttpSession httpSession;
    private ServletContext servletContext;

    public void release(){
    }

    public JspWriter getOut(){
        return jspWriter;
    }

    public void setJspWriter(JspWriter jspWriter){
        this.jspWriter = jspWriter;
    }

    public void handlePageException(Exception e){
    }

    public ServletContext getServletContext(){
        return servletContext;
    }

    public void setServletContext(ServletContext servletContext){
        this.servletContext = servletContext;
    }

    public int getAttributesScope(String s){
        return -1;
    }

    public void include(String s){
    }

    public void removeAttribute(String s, int i){
    }

    public Enumeration getAttributeNamesInScope(int i){
        return null;
    }

    public void forward(String s){
    }

    public Object getPage(){
        return null;
    }

    public void handlePageException(Throwable t){
    }

    public void setRequest(ServletRequest servletRequest){
        this.request = servletRequest;
    }

    public ServletRequest getRequest(){
        return request;
    }

    public ServletResponse getResponse(){
        return null;
    }

    public void removeAttribute(String s){
    }

    public Object getAttribute(String s, int i){
        return null;
    }

    public ServletConfig getServletConfig(){
        return null;
    }

    public void initialize(Servlet servlet, ServletRequest servletRequest, ServletResponse servletResponse, String s, boolean b, int i, boolean b2){
    }

    public Object findAttribute(String s) {
        return null;
    }

    public HttpSession getSession() {
        return httpSession;
    }

    public void setSession(HttpSession httpSession) {
        this.httpSession = httpSession;
    }

    public void setAttribute(String s, Object o){
    }

    public void setAttribute(String s, Object o, int i) {
    }

    public Object getAttribute(String s) {
        return null;
    }

    public Exception getException() {
            return null;
    }

    public void verify(){
    }
}

--- NEW FILE: MockServletConfig.java ---
package com.mockobjects.servlet;

import javax.servlet.*;
import junit.framework.*;
import junit.textui.*;
import java.util.*;
import java.io.*;
import java.net.*;
import com.mockobjects.*;

/**
 * @version $Revision: 1.1 $
 */
public class MockServletConfig extends MockObject implements ServletConfig {
    private Dictionary myParameters = new Hashtable();
    private ServletContext servletContext;

    public String getInitParameter(String paramName) {
        return (String)myParameters.get(paramName);
    }

    public void setInitParameter(String paramName, String paramValue) {
        myParameters.put(paramName, paramValue);
    }

    public java.util.Enumeration getInitParameterNames() {
        return myParameters.keys();
    }

    public void setupAddInitParameter(String paramName, String value) {
        myParameters.put(paramName, value);
    }

    public void setupNoParameters() {
        myParameters = new Hashtable();
    }

    public void setServletContext(ServletContext servletContext){
        this.servletContext = servletContext;
    }

    public ServletContext getServletContext(){
        return servletContext;
    }
    public String getServletName(){
        return null;
    }
}


--- NEW FILE: MockServletContext.java ---
package com.mockobjects.servlet;

import java.io.*;
import java.net.*;
import java.util.*;
import javax.servlet.*;
import com.mockobjects.*;

public class MockServletContext extends MockObject implements ServletContext{
    private HashMap attributes = new HashMap();
    private Set resourcePaths;
    private List realPaths = new ArrayList();
    private URL resource;
    private HashMap initParameters = new HashMap();
    private ExpectationValue expectedLogValue = new ExpectationValue("log");
    private ExpectationValue expectedLogThrowable =
        new ExpectationValue("log throwable");
    private ExpectationValue requestDispatcherURI =
        new ExpectationValue("RequestDispatcher URI");
    private RequestDispatcher requestDispatcher;

    public Enumeration getServlets(){
        return null;
    }

    public void log(String string){
        expectedLogValue.setActual(string);
    }

    public void setExpectedLog(String string){
        expectedLogValue.setExpected(string);
    }

    public void setupGetResource(URL resource){
        this.resource = resource;
    }

    public URL getResource(String string){
        return resource;
    }
    
    public void setupGetResourcePaths(Set resourcePaths){
        this.resourcePaths = resourcePaths;
    }

    public Set getResourcePaths(String string){
        return resourcePaths;
    }

    public ServletContext getContext(String string){
        return null;
    }

    public int getMinorVersion(){
        return -1;
    }

    public void removeAttribute(String string){
    }
    
    public void log(String string, Throwable t){
        log(string);
        expectedLogThrowable.setActual(t);
    }
    public void setExpectedLogThrowable(Throwable throwable){
        expectedLogThrowable.setExpected(throwable);
    }

    public void addRealPath(String realPath){
        this.realPaths.add(realPath);
    }

    public String getRealPath(String string){
        return realPaths.remove(0).toString();
    }

    public Enumeration getServletNames(){
        return null;
    }

    public Servlet getServlet(String string){
        return null;
    }

    public void log(Exception exception, String string){
    }

    public String getServerInfo(){
        return null;
    }

    public void setExpectedRequestDispatcherURI(String uri){
        this.requestDispatcherURI.setExpected(uri);
    }

    public void setupGetRequestDispatcher(
        RequestDispatcher requestDispatcher){

        this.requestDispatcher = requestDispatcher;
    }

    public RequestDispatcher getRequestDispatcher(String uri){
        requestDispatcherURI.setActual(uri);
        return requestDispatcher;
    }
    
    public int getMajorVersion(){
        return -1;
    }

    public Set getResourcePaths(){
        return null;
    }

    public void setAttribute(String string, Object object){
        attributes.put(string, object);
    }

    public String getMimeType(String string){
        return null;
    }

    public RequestDispatcher getNamedDispatcher(String string){
        return null;
    }

    public String getInitParameter(String paramName){
        return (String)initParameters.get(paramName);
    }

    public void setInitParameter(String paramName, String paramValue){
        initParameters.put(paramName,paramValue);
    }

    public Object getAttribute(String string){
        return attributes.get(string);
    }

    public Enumeration getAttributeNames(){
        return null;
    }

    public String getServletContextName() {
        return null;
    }
    
    public InputStream getResourceAsStream(String string){
        return null;
    }
    
    public Enumeration getInitParameterNames(){
        return null;
    }
}

Index: MockHttpServletRequest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/com/mockobjects/servlet/MockHttpServletRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockHttpServletRequest.java	2001/11/22 00:05:42	1.1
+++ MockHttpServletRequest.java	2002/02/04 10:42:53	1.2
@@ -1,13 +1,29 @@
 package com.mockobjects.servlet;
 
-import java.util.*;
+import javax.servlet.*;
 import javax.servlet.http.*;
+import javax.servlet.jsp.*;
+import junit.framework.*;
+import junit.textui.*;
+import java.util.*;
+import java.io.*;
+import java.net.*;
 import com.mockobjects.*;
 
-public class MockHttpServletRequest implements HttpServletRequest {
+/**
+ * @version $Revision$
+ */
+public class MockHttpServletRequest extends MockObject implements HttpServletRequest {
     private Dictionary myParameters = new Hashtable();
-
+    private HttpSession httpSession;
+    private String contentType;
     private String myPathInfo;
+    private String remoteAddress;
+    private java.security.Principal userPrincipal;
+    private ExpectationSet mySetAttributes =
+        new ExpectationSet(MockHttpServletRequest.class.getName() + 
+            ".setAttribute");
+
 
     public MockHttpServletRequest() {
         super();
@@ -68,7 +84,12 @@
     public String getContentType() {
         return null;
     }
-
+    /**
+     * getContentType method comment.
+     */
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
     /**
      * getContextPath method comment.
      */
@@ -149,7 +170,10 @@
 
     public String getParameter(String paramName) {
         String[] values = getParameterValues(paramName);
-        return (values == null ? null : values[0]);
+        if (values == null)
+            return null;
+
+        return values[0];
     }
 
     public java.util.Enumeration getParameterNames() {
@@ -199,11 +223,15 @@
         return null;
     }
 
+    public void setupGetRemoteAddr(String remoteAddress){
+        this.remoteAddress = remoteAddress;
+    }
+
     /**
      * getRemoteAddr method comment.
      */
     public String getRemoteAddr() {
-        return null;
+        return remoteAddress;
     }
 
     /**
@@ -273,22 +301,30 @@
     /**
      * getSession method comment.
      */
-    public javax.servlet.http.HttpSession getSession() {
-        return null;
+    public HttpSession getSession() {
+        return httpSession;
     }
 
+    public void setSession(HttpSession httpSession) {
+        this.httpSession = httpSession;
+    }
+
     /**
      * getSession method comment.
      */
-    public javax.servlet.http.HttpSession getSession(boolean arg1) {
+    public HttpSession getSession(boolean arg1) {
         return null;
     }
 
+    public void setupGetUserPrincipal(java.security.Principal userPrincipal){
+        this.userPrincipal = userPrincipal;
+    }
+
     /**
      * getUserPrincipal method comment.
      */
     public java.security.Principal getUserPrincipal() {
-        return null;
+        return userPrincipal;
     }
 
     /**
@@ -339,10 +375,18 @@
     public void removeAttribute(java.lang.String arg1) {
     }
 
+    public void addExpectedSetAttribute(String attributeName,
+        Object attributeValue) {
+        mySetAttributes.addExpected(
+            new MapEntry(attributeName, attributeValue));
+    }
+
     /**
      * setAttribute method comment.
      */
-    public void setAttribute(String arg1, Object arg2) {
+    public void setAttribute(String attributeName, Object attributeValue) {
+        mySetAttributes.addActual(
+            new MapEntry(attributeName, attributeValue));
     }
 
     /**
@@ -367,4 +411,13 @@
     public void setupPathInfo(String pathInfo) {
         myPathInfo = pathInfo;
     }
+    public StringBuffer getRequestURL(){
+        return null;
+    }
+    public void setCharacterEncoding(String s){
+    }
+    public Map getParameterMap(){
+        return null;
+    }
 }
+

Index: MockHttpServletResponse.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/com/mockobjects/servlet/MockHttpServletResponse.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockHttpServletResponse.java	2001/11/22 00:05:42	1.1
+++ MockHttpServletResponse.java	2002/02/04 10:42:53	1.2
@@ -12,6 +12,8 @@
     private ExpectationCounter mySetStatusCalls = new ExpectationCounter("MockHttpServletResponse.setStatus");
     private ExpectationList myRedirects = new ExpectationList("MockHttpServletResponse.sendRedirect");
     private ServletOutputStream myOutputStream = new MockServletOutputStream();
+    private ExpectationValue myErrorCode = new ExpectationValue("MockHttpServletResponse.sendError");
+    private ExpectationValue myErrorMessage = new ExpectationValue("MockHttpServletResponse.sendError");
 
     /**
      * MockHttpServletResponse constructor comment.
@@ -118,12 +120,31 @@
     public void reset() {
     }
 
-    public void sendError(int arg1) throws java.io.IOException {
-        fail("Not implemented");
+    public void resetBuffer(){
     }
 
-    public void sendError(int arg1, String arg2) throws java.io.IOException {
-        fail("Not implemented");
+    public void setExpectedError(int anErrorCode){
+        myErrorCode.setExpected(anErrorCode);
+    }
+
+    public void setExpectedError(int anErrorCode, String anErrorMessage){
+        setExpectedError(anErrorCode);
+        myErrorMessage.setExpected(anErrorMessage);
+    }
+
+    public void setExpectedErrorNothing(){
+        myErrorCode.setExpectNothing();
+        myErrorMessage.setExpectNothing();
+    }
+
+    public void sendError(int anErrorCode) throws java.io.IOException {
+        myErrorCode.setActual(anErrorCode);
+    }
+
+    public void sendError(int anErrorCode, String anErrorMessage)
+    throws IOException {
+        sendError(anErrorCode);
+        myErrorMessage.setActual(anErrorMessage);
     }
 
     public void sendRedirect(String aURL) throws java.io.IOException {

Index: MockHttpSession.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/com/mockobjects/servlet/MockHttpSession.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockHttpSession.java	2001/11/22 00:05:42	1.1
+++ MockHttpSession.java	2002/02/04 10:42:53	1.2
@@ -1,21 +1,22 @@
 package com.mockobjects.servlet;
 
+import javax.servlet.*;
+import javax.servlet.http.*;
 import java.util.*;
-import javax.servlet.http.HttpSessionContext;
-import javax.servlet.http.HttpSession;
-
 import com.mockobjects.*;
 
 public class MockHttpSession extends MockObject implements HttpSession, Verifiable {
     public ExpectationSet myAttributes = new ExpectationSet("session attributes");
+    public HashMap attributes = new HashMap();
+
+    private ServletContext servletContext;
 
     public MockHttpSession() {
         super();
     }
 
     public Object getAttribute(String arg1) {
-        notImplemented();
-        return null;
+        return attributes.get(arg1);
     }
 
     public Enumeration getAttributeNames() {
@@ -45,6 +46,14 @@
         return null;
     }
 
+    public void setupServletContext(ServletContext servletContext){
+        this.servletContext = servletContext;
+    }
+
+    public ServletContext getServletContext(){
+        return servletContext;
+    }
+
     public Object getValue(String arg1) {
         notImplemented();
         return null;
@@ -72,6 +81,7 @@
     }
 
     public void setAttribute(String aKey, Object aValue) {
+        attributes.put(aKey, aValue);
         myAttributes.addActual(new MapEntry(aKey, aValue));
     }