[MO-java-dev] CVS: mockobjects-java/src/j2ee/common/com/mockobjects/helpers AbstractServletTestHelper.java,NONE,1.1 FilterTestHelper.java,NONE,1.1 ServletTestHelper.java,1.1,1.2 TagTestHelper.java,1.2,1.3

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

Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/helpers
In directory usw-pr-cvs1:/tmp/cvs-serv13480/src/j2ee/common/com/mockobjects/helpers

Modified Files:
	ServletTestHelper.java TagTestHelper.java 
Added Files:
	AbstractServletTestHelper.java FilterTestHelper.java 
Log Message:
Added Servlet filter test helper


--- NEW FILE: AbstractServletTestHelper.java ---
package com.mockobjects.helpers;

import com.mockobjects.servlet.*;

/**
 * $Revision: 1.1 $
 */
public abstract class AbstractServletTestHelper {
    protected final MockHttpServletRequest request = new MockHttpServletRequest();
    protected final MockHttpServletResponse response = new MockHttpServletResponse();
    protected final MockHttpSession httpSession = new MockHttpSession();
    protected final MockRequestDispatcher requestDispatcher = new MockRequestDispatcher();
    protected final MockServletContext servletContext = new MockServletContext();
    protected final MockServletConfig servletConfig = new MockServletConfig();

    public AbstractServletTestHelper() {
        request.setSession(httpSession);
        servletContext.setupGetRequestDispatcher(requestDispatcher);
    }

    public MockHttpServletRequest getRequest() {
        return request;
    }

    public MockHttpSession getHttpSession() {
        return httpSession;
    }

    public MockRequestDispatcher getRequestDispatcher() {
        return requestDispatcher;
    }

    public MockHttpServletResponse getResponse() {
        return response;
    }

    public MockServletContext getServletContext() {
        return servletContext;
    }

    public MockServletConfig getServletConfig() {
        return servletConfig;
    }
}

--- NEW FILE: FilterTestHelper.java ---
package com.mockobjects.helpers;

import com.mockobjects.servlet.MockFilterChain;
import com.mockobjects.servlet.MockFilterConfig;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import java.io.IOException;

/**
 * $Revision: 1.1 $
 */
public class FilterTestHelper extends AbstractServletTestHelper {
    private final Filter filter;
    private final MockFilterChain filterChain = new MockFilterChain();
    private final MockFilterConfig filterConfig = new MockFilterConfig();

    public FilterTestHelper(Filter filter) {
        this.filter = filter;
        filterConfig.setupGetServletContext(servletContext);
    }

    public MockFilterChain getFilterChain() {
        return filterChain;
    }

    public MockFilterConfig getFilterConfig() {
        return filterConfig;
    }

    public void testInit() throws ServletException {
        filter.init(filterConfig);
    }

    public void testDoFilter() throws ServletException, IOException {
        filter.doFilter(request, response, filterChain);
    }
}

Index: ServletTestHelper.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/helpers/ServletTestHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletTestHelper.java	28 Aug 2002 17:36:28 -0000	1.1
+++ ServletTestHelper.java	6 Sep 2002 11:26:48 -0000	1.2
@@ -1,9 +1,7 @@
 package com.mockobjects.helpers;
 
-import com.mockobjects.servlet.*;
-
-import javax.servlet.http.HttpServlet;
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
 import java.io.IOException;
 
 /**
@@ -12,49 +10,12 @@
  * @see com.mockobjects.servlet.MockHttpServletRequest#setSession
  * @see com.mockobjects.servlet.MockServletContext#setupGetRequestDispatcher
  */
-public class ServletTestHelper {
-    protected final MockHttpServletRequest request = new MockHttpServletRequest();
-    protected final MockHttpServletResponse response = new MockHttpServletResponse();
-    protected final MockHttpSession httpSession = new MockHttpSession();
-    protected final MockRequestDispatcher requestDispatcher = new MockRequestDispatcher();
-    protected final MockServletContext servletContext = new MockServletContext();
-    protected final MockServletConfig servletConfig = new MockServletConfig();
+public class ServletTestHelper extends AbstractServletTestHelper {
     private final HttpServlet testSubject;
 
     public ServletTestHelper(HttpServlet testSubject) {
+        super();
         this.testSubject = testSubject;
-        request.setSession(httpSession);
-        servletContext.setupGetRequestDispatcher(requestDispatcher);
-    }
-
-    protected ServletTestHelper(){
-        this.testSubject = null;
-        request.setSession(httpSession);
-        servletContext.setupGetRequestDispatcher(requestDispatcher);
-    }
-
-    public MockHttpServletRequest getRequest() {
-        return request;
-    }
-
-    public MockHttpSession getHttpSession() {
-        return httpSession;
-    }
-
-    public MockRequestDispatcher getRequestDispatcher() {
-        return requestDispatcher;
-    }
-
-    public MockHttpServletResponse getResponse() {
-        return response;
-    }
-
-    public MockServletContext getServletContext() {
-        return servletContext;
-    }
-
-    public MockServletConfig getServletConfig() {
-        return servletConfig;
     }
 
     /**

Index: TagTestHelper.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/helpers/TagTestHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TagTestHelper.java	28 Aug 2002 18:27:36 -0000	1.2
+++ TagTestHelper.java	6 Sep 2002 11:26:48 -0000	1.3
@@ -17,7 +17,7 @@
  * @see MockPageContext#setServletContext();
  * @see MockPageContext#setSession();
  */
-public class TagTestHelper extends ServletTestHelper {
+public class TagTestHelper extends AbstractServletTestHelper {
     private final MockPageContext pageContext = new MockPageContext();
     private final MockBodyContent bodyContent = new MockBodyContent();
     private final MockJspWriter outWriter = new MockJspWriter();