Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/com/mockobjects/helpers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31359/src/j2ee/1.3/com/mockobjects/helpers
Modified Files:
AbstractServletTestHelper.java TagTestHelper.java
Log Message:
Allow a request object to passed into the tag helper
Index: AbstractServletTestHelper.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/com/mockobjects/helpers/AbstractServletTestHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractServletTestHelper.java 22 Jul 2003 10:25:00 -0000 1.5
+++ AbstractServletTestHelper.java 18 May 2004 13:44:15 -0000 1.6
@@ -7,7 +7,7 @@
* $Revision$
*/
public abstract class AbstractServletTestHelper extends MockObject{
- protected final MockHttpServletRequest request = new MockHttpServletRequest();
+ protected final MockHttpServletRequest request;
protected final MockHttpServletResponse response = new MockHttpServletResponse();
protected final MockHttpSession httpSession = new MockHttpSession();
protected final MockRequestDispatcher requestDispatcher = new MockRequestDispatcher();
@@ -15,6 +15,11 @@
protected final MockServletConfig servletConfig = new MockServletConfig();
public AbstractServletTestHelper() {
+ this(new MockHttpServletRequest());
+ }
+
+ public AbstractServletTestHelper(MockHttpServletRequest request) {
+ this.request = request;
request.setSession(httpSession);
servletContext.setupGetRequestDispatcher(requestDispatcher);
request.setupGetRequestDispatcher(requestDispatcher);
Index: TagTestHelper.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/com/mockobjects/helpers/TagTestHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TagTestHelper.java 19 Aug 2003 15:50:20 -0000 1.4
+++ TagTestHelper.java 18 May 2004 13:44:15 -0000 1.5
@@ -1,6 +1,7 @@
package com.mockobjects.helpers;
import com.mockobjects.servlet.MockBodyContent;
+import com.mockobjects.servlet.MockHttpServletRequest;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import com.mockobjects.servlet.CommonMockPageContext;
@@ -48,8 +49,10 @@
/**
* @param testSubject The Tag to be tested
+ * @param request Request object used for testing
*/
- public TagTestHelper(Tag testSubject) {
+ public TagTestHelper(Tag testSubject, MockHttpServletRequest request) {
+ super(request);
this.testSubject = testSubject;
pageContext.setRequest(getRequest());
@@ -60,6 +63,13 @@
}
/**
+ * @param testSubject The Tag to be tested
+ */
+ public TagTestHelper(Tag testSubject) {
+ this(testSubject, new MockHttpServletRequest());
+ }
+
+ /**
* @return The writer use when making calls to PageContext.getOut
*/
public MockJspWriter getOutWriter() {
|
