Author: nlebas
Date: Fri Dec 16 00:28:29 2011
New Revision: 1215003
URL: http://svn.apache.org/viewvc?rev=1215003&view=rev
Log:
removed the obsolete getRequestObjects method
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java
Fri Dec 16 00:28:29 2011
@@ -55,12 +55,4 @@ public interface WebRequest extends Requ
* @since 2.2.0
*/
void setContentType(String contentType);
-
- /**
- * Returns the original request objects used to create this request.
- *
- * @return The request objects.
- * @since 2.1.2
- */
- Object[] getRequestObjects();
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java
Fri Dec 16 00:28:29 2011
@@ -148,9 +148,4 @@ public class WebRequestWrapper extends A
public boolean isUserInRole(String role) {
return context.isUserInRole(role);
}
-
- /** {@inheritDoc} */
- public Object[] getRequestObjects() {
- return context.getRequestObjects();
- }
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java
Fri Dec 16 00:28:29 2011
@@ -20,11 +20,9 @@
*/
package org.apache.tiles.request.util;
-import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createMock;
import static org.easymock.classextension.EasyMock.replay;
import static org.easymock.classextension.EasyMock.verify;
-import static org.junit.Assert.assertArrayEquals;
import java.io.IOException;
@@ -97,21 +95,4 @@ public class WebRequestWrapperTest exten
request.setContentType("text/html");
verify(wrappedRequest);
}
-
- /**
- * Test method for {@link
org.apache.tiles.request.util.WebRequestWrapper#getRequestObjects()}.
- */
- @Test
- public void testGetRequestObjects() {
- WebRequest wrappedRequest = createMockRequest();
- String[] param = new String[] {"one", "two", "three"};
-
- expect(wrappedRequest.getRequestObjects()).andReturn(param);
-
- replay(wrappedRequest);
- WebRequestWrapper request = createRequestWrapper(wrappedRequest);
- assertArrayEquals(param, request.getRequestObjects());
- verify(wrappedRequest);
- }
-
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
Fri Dec 16 00:28:29 2011
@@ -61,11 +61,6 @@ public class FreemarkerRequest extends A
private Map<String, Object> pageScope;
/**
- * The request objects.
- */
- private transient Object[] requestObjects;
-
- /**
* Creates a new Freemarker request.
*
* @param applicationContext The application context.
@@ -145,14 +140,4 @@ public class FreemarkerRequest extends A
public Writer getWriter() {
return env.getOut();
}
-
- /** {@inheritDoc} */
- @Override
- public Object[] getRequestObjects() {
- if (requestObjects == null) {
- requestObjects = new Object[1];
- requestObjects[0] = env;
- }
- return requestObjects;
- }
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
Fri Dec 16 00:28:29 2011
@@ -260,18 +260,4 @@ public class FreemarkerRequestTest {
assertNotNull(context.getWriter());
verify(enclosedRequest);
}
- /**
- * Tests {@link FreemarkerRequest#getRequestObjects()}.
- */
- @Test
- public void testGetRequestObjects() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
-
- replay(enclosedRequest);
- context = new FreemarkerRequest(enclosedRequest, env);
- Object[] requestObjects = context.getRequestObjects();
- assertEquals(1, requestObjects.length);
- assertEquals(env, requestObjects[0]);
- verify(enclosedRequest);
- }
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
Fri Dec 16 00:28:29 2011
@@ -58,11 +58,6 @@ public class JspRequest extends Abstract
private PageContext pageContext;
/**
- * The request objects, lazily initialized.
- */
- private Object[] requestObjects;
-
- /**
* <p>The lazily instantiated <code>Map</code> of page scope
* attributes.</p>
*/
@@ -191,16 +186,6 @@ public class JspRequest extends Abstract
return (applicationScope);
}
- /** {@inheritDoc} */
- @Override
- public Object[] getRequestObjects() {
- if (requestObjects == null) {
- requestObjects = new Object[1];
- requestObjects[0] = pageContext;
- }
- return requestObjects;
- }
-
/**
* Returns the page context that originated the request.
*
Modified:
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
Fri Dec 16 00:28:29 2011
@@ -112,16 +112,6 @@ public class JspRequestTest {
}
/**
- * Test method for {@link
org.apache.tiles.request.jsp.JspRequest#getRequestObjects()}.
- */
- @Test
- public void testGetRequestObjects() {
- replay(context, enclosedRequest);
- assertArrayEquals(new Object[] { context },
request.getRequestObjects());
- verify(context, enclosedRequest);
- }
-
- /**
* Test method for {@link
org.apache.tiles.request.jsp.JspRequest#doInclude(java.lang.String)}.
* @throws IOException If something goes wrong.
* @throws ServletException If something goes wrong.
Modified:
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
Fri Dec 16 00:28:29 2011
@@ -104,11 +104,6 @@ public class PortletRequest extends Abst
/**
- * The request objects, lazily initialized.
- */
- private Object[] requestObjects;
-
- /**
* <p>The lazily instantiated <code>Map</code> of session scope
* attributes.</p>
*/
@@ -220,16 +215,6 @@ public class PortletRequest extends Abst
}
/** {@inheritDoc} */
- public Object[] getRequestObjects() {
- if (requestObjects == null) {
- requestObjects = new Object[2];
- requestObjects[0] = request;
- requestObjects[1] = response;
- }
- return requestObjects;
- }
-
- /** {@inheritDoc} */
public Locale getRequestLocale() {
return request.getLocale();
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
Fri Dec 16 00:28:29 2011
@@ -395,13 +395,6 @@ public class PortletRequestTest {
/**
* Test method for {@link
org.apache.tiles.request.portlet.PortletRequest#getRequestObjects()}.
*/
- @Test
- public void testGetRequestObjects() {
- replay(applicationContext, request, response, portletContext,
requestDelegate, responseDelegate);
- assertArrayEquals(new Object[] {request, response},
req.getRequestObjects());
- verify(applicationContext, request, response, portletContext,
requestDelegate, responseDelegate);
- }
-
/**
* Test method for {@link
org.apache.tiles.request.portlet.PortletRequest#getRequest()}.
*/
Modified:
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
Fri Dec 16 00:28:29 2011
@@ -66,11 +66,6 @@ public class ServletRequest extends Abst
private HttpServletResponse response;
/**
- * The request objects, lazily initialized.
- */
- private Object[] requestObjects;
-
- /**
* The response output stream, lazily initialized.
*/
private OutputStream outputStream;
@@ -282,16 +277,6 @@ public class ServletRequest extends Abst
}
/** {@inheritDoc} */
- public Object[] getRequestObjects() {
- if (requestObjects == null) {
- requestObjects = new Object[2];
- requestObjects[0] = request;
- requestObjects[1] = response;
- }
- return requestObjects;
- }
-
- /** {@inheritDoc} */
public HttpServletRequest getRequest() {
return request;
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
Fri Dec 16 00:28:29 2011
@@ -357,16 +357,6 @@ public class ServletRequestTest {
}
/**
- * Test method for {@link
org.apache.tiles.request.servlet.ServletRequest#getRequestObjects()}.
- */
- @Test
- public void testGetRequestObjects() {
- replay(applicationContext, request, response);
- assertArrayEquals(new Object[] {request, response},
req.getRequestObjects());
- verify(applicationContext, request, response);
- }
-
- /**
* Test method for {@link
org.apache.tiles.request.servlet.ServletRequest#getRequest()}.
*/
@Test
Modified:
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
Fri Dec 16 00:28:29 2011
@@ -58,11 +58,6 @@ public class VelocityRequest extends Abs
private final Context ctx;
/**
- * The request objects.
- */
- private Object[] requestObjects;
-
- /**
* The writer to use to render the response. It may be null, if not
necessary.
*/
private Writer writer;
@@ -115,9 +110,9 @@ public class VelocityRequest extends Abs
/** {@inheritDoc} */
@Override
protected void doInclude(String path) throws IOException {
- Object[] requestObjects = super.getRequestObjects();
- HttpServletRequest request = (HttpServletRequest) requestObjects[0];
- HttpServletResponse response = (HttpServletResponse) requestObjects[1];
+ ServletRequest servletRequest =
org.apache.tiles.request.servlet.ServletUtil.getServletRequest(this);
+ HttpServletRequest request = servletRequest.getRequest();
+ HttpServletResponse response = servletRequest.getResponse();
RequestDispatcher rd = request.getRequestDispatcher(path);
if (rd == null) {
@@ -158,27 +153,6 @@ public class VelocityRequest extends Abs
return writer;
}
- /** {@inheritDoc} */
- @Override
- public Object[] getRequestObjects() {
- if (requestObjects == null) {
- Object[] parentRequestObjects = super.getRequestObjects();
- if (writer == null) {
- requestObjects = new Object[parentRequestObjects.length + 1];
- } else {
- requestObjects = new Object[parentRequestObjects.length + 2];
- }
- requestObjects[0] = ctx;
- for (int i = 0; i < parentRequestObjects.length; i++) {
- requestObjects[i + 1] = parentRequestObjects[i];
- }
- if (writer != null) {
- requestObjects[parentRequestObjects.length + 1] = writer;
- }
- }
- return requestObjects;
- }
-
/**
* Returns the page scope.
*
Modified:
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java?rev=1215003&r1=1215002&r2=1215003&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
Fri Dec 16 00:28:29 2011
@@ -111,7 +111,7 @@ public class VelocityRequestTest {
@Test
public void testDoInclude() throws IOException, ServletException {
String path = "this way";
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ ServletRequest enclosedRequest = createMock(ServletRequest.class);
HttpServletRequest servletRequest =
createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
RequestDispatcher dispatcher = createMock(RequestDispatcher.class);
@@ -119,9 +119,9 @@ public class VelocityRequestTest {
expect(servletRequest.getRequestDispatcher("this
way")).andReturn(dispatcher);
dispatcher.include(eq(servletRequest),
isA(ExternalWriterHttpServletResponse.class));
replay(servletRequest, response, dispatcher);
- Object[] requestItems = new Object[] {servletRequest, response};
- expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
+ expect(enclosedRequest.getRequest()).andReturn(servletRequest);
+ expect(enclosedRequest.getResponse()).andReturn(response);
replay(velocityContext, enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext,
writer);
@@ -137,15 +137,15 @@ public class VelocityRequestTest {
@Test(expected = IOException.class)
public void testDoIncludeNoRequestDispatcher() throws IOException {
String path = "this way";
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ ServletRequest enclosedRequest = createMock(ServletRequest.class);
HttpServletRequest servletRequest =
createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
expect(servletRequest.getRequestDispatcher("this
way")).andReturn(null);
replay(servletRequest, response);
- Object[] requestItems = new Object[] {servletRequest, response};
- expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
+ expect(enclosedRequest.getRequest()).andReturn(servletRequest);
+ expect(enclosedRequest.getResponse()).andReturn(response);
replay(velocityContext, enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext,
writer);
@@ -162,7 +162,7 @@ public class VelocityRequestTest {
@Test(expected = IOException.class)
public void testDoIncludeServletException() throws IOException,
ServletException {
String path = "this way";
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ ServletRequest enclosedRequest = createMock(ServletRequest.class);
HttpServletRequest servletRequest =
createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
RequestDispatcher dispatcher = createMock(RequestDispatcher.class);
@@ -171,9 +171,9 @@ public class VelocityRequestTest {
dispatcher.include(eq(servletRequest),
isA(ExternalWriterHttpServletResponse.class));
expectLastCall().andThrow(new ServletException());
replay(servletRequest, response, dispatcher);
- Object[] requestItems = new Object[] {servletRequest, response};
- expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
+ expect(enclosedRequest.getRequest()).andReturn(servletRequest);
+ expect(enclosedRequest.getResponse()).andReturn(response);
replay(velocityContext, enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext,
writer);
@@ -248,48 +248,6 @@ public class VelocityRequestTest {
}
/**
- * Tests {@link VelocityRequest#getRequestObjects()}.
- */
- @Test
- public void testGetRequestObjects() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
- HttpServletRequest servletRequest =
createMock(HttpServletRequest.class);
- HttpServletResponse response = createMock(HttpServletResponse.class);
-
- replay(servletRequest, response);
- Object[] requestItems = new Object[] {servletRequest, response};
-
- expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
-
- replay(velocityContext, enclosedRequest);
- context = new VelocityRequest(enclosedRequest, velocityContext,
writer);
- assertArrayEquals(new Object[] { velocityContext, servletRequest,
- response, writer }, context.getRequestObjects());
- verify(velocityContext, enclosedRequest, servletRequest, response);
- }
-
- /**
- * Tests {@link VelocityRequest#getRequestObjects()}.
- */
- @Test
- public void testGetRequestObjectsNoWriter() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
- HttpServletRequest servletRequest =
createMock(HttpServletRequest.class);
- HttpServletResponse response = createMock(HttpServletResponse.class);
-
- replay(servletRequest, response);
- Object[] requestItems = new Object[] {servletRequest, response};
-
- expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
-
- replay(velocityContext, enclosedRequest);
- context = new VelocityRequest(enclosedRequest, velocityContext, null);
- assertArrayEquals(new Object[] { velocityContext, servletRequest,
- response}, context.getRequestObjects());
- verify(velocityContext, enclosedRequest, servletRequest, response);
- }
-
- /**
* Tests {@link VelocityRequest#getPageScope()}.
*/
@Test
