[jboss-svn-commits] JBoss Portal SVN: r5569 - in trunk/portlet/src/main/org/jboss/portal/test: framework/portlet framework/portlet/actions framework/portlet/basictests framework/portlet/basictests/classes framework/portlet/components portlet/ha/session portlet/jsr168/api/actionrequest portlet/jsr168/api/actionresponse portlet/jsr168/api/portalcontext portlet/jsr168/api/portletconfig portlet/jsr168/api/portletcontext portlet/jsr168/api/portletmode portlet/jsr168/api/portletpreferences portlet/jsr168/api/portletsession portlet/jsr168/api/portletsessionutil portlet/jsr168/api/portleturl portlet/jsr168/api/renderrequest portlet/jsr168/api/renderresponse portlet/jsr168/api/windowstate portlet/jsr168/ext/dispatcher portlet/jsr168/ext/portletconfig portlet/jsr168/ext/portletmode portlet/jsr168/ext/portletrequests portlet/jsr168/ext/portletresponses portlet/jsr168/ext/preferences portlet/jsr168/ext/session portlet/jsr168/misc/log4j portlet/jsr168/tck/dispatcher portlet/jsr168/tck/portletconfi! g portlet/jsr168/tck/portletcontext portlet/jsr168/tck/portletinterface portlet/jsr168/tck/portletmode portlet/jsr168/tck/portletrequests portlet/jsr168/tck/portletresponses portlet/jsr168/tck/portletsession portlet/jsr168/tck/portleturl portlet/jsr168/tck/preferences portlet/jsr168/tck/windowstates
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 2 18:39:15 EST 2006
Author: julien at jboss.com
Date: 2006-11-02 18:38:33 -0500 (Thu, 02 Nov 2006)
New Revision: 5569
Added:
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java
Modified:
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java
Log:
proxy the httptestcontext with portlettestcontext in portlet tests in order to define the interface for portlet tests and make easier refactorings of httptestcontext (separate services and state)
Added: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -0,0 +1,65 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.framework.portlet;
+
+import org.jboss.portal.common.test.driver.DriverResponse;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.server.NodeId;
+
+import java.net.MalformedURLException;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class PortletTestContext
+{
+
+ /** . */
+ final HttpTestContext httpTestContext;
+
+ public PortletTestContext(HttpTestContext httpTestContext)
+ {
+ this.httpTestContext = httpTestContext;
+ }
+
+ public String getTestName()
+ {
+ return httpTestContext.getTestName();
+ }
+
+ public void setResponse(DriverResponse response)
+ {
+ httpTestContext.setResponse(response);
+ }
+
+ public int getRequestCount()
+ {
+ return httpTestContext.getRequestCount();
+ }
+
+ public String rewriteURLForNode(String url, NodeId nodeId) throws MalformedURLException
+ {
+ return httpTestContext.rewriteURLForNode(url, nodeId);
+ }
+}
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -22,16 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.framework.portlet;
-import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestDriverServer;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.server.HttpTestDriverRegistry;
-import org.jboss.portal.common.test.info.TestItemInfo;
-import org.jboss.portal.common.test.info.TestInfo;
-import org.jboss.portal.common.test.driver.DriverResponse;
-import org.jboss.portal.common.test.driver.DriverCommand;
-import org.jboss.portal.common.test.driver.TestDriverException;
-import org.jboss.portal.common.test.driver.command.StartTestCommand;
import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
@@ -45,7 +36,7 @@
private HttpTestDriverRegistry testDriverRegistry;
/** . */
- public static HttpTestContext context;
+ public static PortletTestContext context;
/** . */
private static PortletTestDriver instance;
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -116,11 +116,11 @@
public void updateContext(String testId, HttpTestContext ctx)
{
- PortletTestDriver.context = ctx;
+ PortletTestDriver.context = new PortletTestContext(ctx);
}
public HttpTestContext retrieveContext(String testId)
{
- return PortletTestDriver.context;
+ return PortletTestDriver.context.httpTestContext;
}
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -25,7 +25,7 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.response.FailureResponse;
import org.jboss.portal.test.framework.portlet.TestAction;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -42,7 +42,7 @@
public abstract class PortletActionTestAction extends TestAction
{
- public DriverResponse execute(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws PortletException, IOException
+ public DriverResponse execute(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException
{
try
{
@@ -55,6 +55,6 @@
}
}
- protected abstract void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws PortletException, IOException;
+ protected abstract void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException;
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -25,7 +25,7 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.response.FailureResponse;
import org.jboss.portal.test.framework.portlet.TestAction;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import javax.portlet.Portlet;
import javax.portlet.PortletException;
@@ -42,7 +42,7 @@
public abstract class PortletRenderTestAction extends TestAction
{
- public DriverResponse execute(Portlet servlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletException, IOException
+ public DriverResponse execute(Portlet servlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException
{
try
{
@@ -54,5 +54,5 @@
}
}
- protected abstract DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletException, IOException;
+ protected abstract DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException;
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,7 +24,7 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.TestAction;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
@@ -38,9 +38,9 @@
*/
public abstract class ServletServiceTestAction extends TestAction
{
- protected abstract DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException;
+ protected abstract DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException;
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
try
{
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -25,11 +25,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.response.FailureResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -55,7 +55,7 @@
registry.addSequence("OnePortlet", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -68,7 +68,7 @@
registry.addSequence("FailurePortlet", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new FailureResponse();
}
@@ -81,7 +81,7 @@
registry.addSequence("FailAssertPortlet", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
fail();
return null;
@@ -95,7 +95,7 @@
registry.addSequence("FailAssertInActionPortlet", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -104,7 +104,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
fail();
}
@@ -113,7 +113,7 @@
//this shouldn't be reached
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -126,7 +126,7 @@
registry.addSequence("TwoPortlet", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -135,7 +135,7 @@
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -148,7 +148,7 @@
registry.addSequence("TwoResultPortlet", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -156,7 +156,7 @@
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,12 +24,12 @@
import junit.framework.TestCase;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Joinpoint;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.TestAction;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import javax.portlet.Portlet;
import javax.portlet.RenderRequest;
@@ -47,7 +47,7 @@
Joinpoint joinpoint = new Joinpoint("PortletA", Joinpoint.PORTLET_RENDER);
TestAction action = new PortletRenderTestAction()
{
- public DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ public DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse("http://www.jboss.com");
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -22,8 +22,8 @@
******************************************************************************/
package org.jboss.portal.test.framework.portlet.components;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.portlet.PortletTestDriver;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.response.FailureResponse;
@@ -66,7 +66,7 @@
public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
- HttpTestContext context = PortletTestDriver.context;
+ PortletTestContext context = PortletTestDriver.context;
if (testName.equals(context.getTestName()))
{
DriverResponse response;
@@ -93,7 +93,7 @@
public void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
- HttpTestContext context = PortletTestDriver.context;
+ PortletTestContext context = PortletTestDriver.context;
if (testName.equals(context.getTestName()))
{
DriverResponse response;
@@ -116,7 +116,7 @@
}
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, PortletTestContext context) throws PortletException, IOException
{
throw new PortletException();
}
@@ -131,7 +131,7 @@
* @throws PortletSecurityException
* @throws IOException
*/
- protected void preRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected void preRender(RenderRequest req, RenderResponse resp, PortletTestContext context) throws PortletException, IOException
{
throw new PortletException();
}
@@ -146,7 +146,7 @@
* @throws PortletSecurityException
* @throws IOException
*/
- protected DriverResponse postRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse postRender(RenderRequest req, RenderResponse resp, PortletTestContext context) throws PortletException, IOException
{
return null;
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -22,8 +22,8 @@
******************************************************************************/
package org.jboss.portal.test.framework.portlet.components;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.portlet.PortletTestDriver;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.response.FailureResponse;
import org.jboss.portal.common.test.driver.response.ErrorResponse;
@@ -103,7 +103,7 @@
public final void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
- HttpTestContext context = PortletTestDriver.context;
+ PortletTestContext context = PortletTestDriver.context;
if (testName.equals(context.getTestName()))
{
DriverResponse response;
@@ -130,7 +130,7 @@
public final void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
- HttpTestContext context = PortletTestDriver.context;
+ PortletTestContext context = PortletTestDriver.context;
if (testName.equals(context.getTestName()))
{
DriverResponse response;
@@ -155,12 +155,12 @@
{
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, PortletTestContext context) throws PortletException, IOException
{
throw new PortletException();
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, PortletTestContext context) throws PortletException, IOException
{
throw new PortletException();
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -23,7 +23,6 @@
package org.jboss.portal.test.framework.portlet.components;
import org.apache.log4j.Logger;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.response.FailureResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -33,6 +32,7 @@
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.TestAction;
import org.jboss.portal.test.framework.portlet.PortletTestDriver;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.server.NodeId;
import javax.portlet.ActionRequest;
@@ -135,7 +135,7 @@
*/
public final void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
- HttpTestContext ctx = PortletTestDriver.context;
+ PortletTestContext ctx = PortletTestDriver.context;
//
log.debug("Component '" + getComponentId() + "' processAction() method invoked for '"
@@ -185,7 +185,7 @@
*/
public final void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
- HttpTestContext ctx = PortletTestDriver.context;
+ PortletTestContext ctx = PortletTestDriver.context;
//
log.debug("Component '" + getComponentId() + "' render() method invoked for '"
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -23,7 +23,6 @@
package org.jboss.portal.test.framework.portlet.components;
import org.apache.log4j.Logger;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Joinpoint;
import org.jboss.portal.test.framework.portlet.Sequence;
@@ -31,6 +30,7 @@
import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
import org.jboss.portal.test.framework.portlet.TestAction;
import org.jboss.portal.test.framework.portlet.PortletTestDriver;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.server.NodeId;
import javax.servlet.ServletException;
@@ -94,7 +94,7 @@
*/
protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
- HttpTestContext ctx = PortletTestDriver.context;
+ PortletTestContext ctx = PortletTestDriver.context;
//
log.info("Component '" + getComponentId() + "' service() method invoked for '"
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -22,13 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.ha.session;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.framework.server.NodeId;
@@ -54,7 +54,7 @@
registry.addSequence("ABC", seq);
seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, PortletSecurityException, IOException
{
assertNull(request.getPortletSession(false));
PortletSession session = request.getPortletSession();
@@ -67,7 +67,7 @@
});
seq.addAction(1, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession();
assertNotNull(session);
@@ -83,7 +83,7 @@
registry.addSequence("ABC", seq);
seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
assertNull(request.getPortletSession(false));
PortletSession session = request.getPortletSession();
@@ -98,7 +98,7 @@
});
seq.addAction(1, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession();
assertNotNull(session);
@@ -114,7 +114,7 @@
registry.addSequence("ABC", seq);
seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
assertNull(request.getPortletSession(false));
PortletSession session = request.getPortletSession();
@@ -128,7 +128,7 @@
});
seq.addAction(1, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
PortletSession session = request.getPortletSession();
Object o = session.getAttribute("mutable");
@@ -143,7 +143,7 @@
});
seq.addAction(2, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession();
assertNotNull(session);
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,11 +24,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -60,7 +60,7 @@
registry.addSequence("Constants", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals("javax.portlet.userinfo", ActionRequest.USER_INFO);
@@ -80,7 +80,7 @@
registry.addSequence("Property", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -88,7 +88,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
try
{
@@ -112,7 +112,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
@@ -128,7 +128,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -136,7 +136,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
try
@@ -170,7 +170,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -185,7 +185,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -193,7 +193,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
try
{
@@ -217,7 +217,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,11 +24,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -56,7 +56,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -64,7 +64,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
String val = null;
@@ -188,7 +188,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -207,7 +207,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -215,7 +215,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
try
{
@@ -239,7 +239,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -254,7 +254,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -262,7 +262,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
try
{
@@ -277,7 +277,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,9 +27,9 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.PortletMode;
@@ -53,7 +53,7 @@
registry.addSequence("SupportedPortletModes", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Enumeration modesEnum = request.getPortalContext().getSupportedPortletModes();
@@ -82,7 +82,7 @@
registry.addSequence("SupportedWindowStates", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Enumeration statesEnum = request.getPortalContext().getSupportedWindowStates();
@@ -112,7 +112,7 @@
registry.addSequence("PortalInfo", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
String info = request.getPortalContext().getPortalInfo();
@@ -131,7 +131,7 @@
registry.addSequence("Property", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//assert Exception is thrown
try
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,11 +27,11 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTP2;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.PortletConfig;
@@ -57,7 +57,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
PortletConfig config = aport.getPortletConfig();
@@ -75,7 +75,7 @@
registry.addSequence("PortletContext", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
PortletConfig config = aport.getPortletConfig();
@@ -98,7 +98,7 @@
registry.addSequence("InitParameter", seq);
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
PortletConfig config = aport.getPortletConfig();
@@ -137,7 +137,7 @@
//this portlet has no init params defined
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
PortletConfig config = aport.getPortletConfig();
@@ -156,7 +156,7 @@
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
PortletConfig config = aport.getPortletConfig();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -28,10 +28,10 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
import org.jboss.portal.test.framework.portlet.TestContants;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.RenderRequest;
@@ -53,7 +53,7 @@
registry.addSequence("ServerInfo", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
assertEquals(TestContants.SERVER_INVO, aport.getPortletContext().getServerInfo());
@@ -69,7 +69,7 @@
registry.addSequence("Dispatcher", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
@@ -89,7 +89,7 @@
registry.addSequence("Version", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
@@ -107,7 +107,7 @@
registry.addSequence("MimeType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
assertEquals("text/plain", aport.getPortletContext().getMimeType("/simple_resource.txt"));
@@ -124,7 +124,7 @@
registry.addSequence("ResourcePaths", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
@@ -146,7 +146,7 @@
registry.addSequence("Resource", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
@@ -185,7 +185,7 @@
registry.addSequence("Attribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
@@ -233,7 +233,7 @@
registry.addSequence("InitParameter", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
@@ -262,7 +262,7 @@
registry.addSequence("PortletContextName", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,9 +27,9 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.PortletMode;
@@ -50,7 +50,7 @@
registry.addSequence("Modes", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals("view", "" + PortletMode.VIEW);
assertEquals("edit", "" + PortletMode.EDIT);
@@ -68,7 +68,7 @@
registry.addSequence("Constructor", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals("testmode", "" + new PortletMode("testmode"));
assertEquals("testmode", "" + new PortletMode("TESTMODE"));
@@ -88,7 +88,7 @@
registry.addSequence("Equals", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletMode pm1 = new PortletMode("TestMode");
PortletMode pm2 = new PortletMode("TestMode");
@@ -112,7 +112,7 @@
registry.addSequence("HashCode", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletMode pm1 = new PortletMode("TestMode");
PortletMode pm2 = new PortletMode("TestMode");
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,11 +24,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -59,7 +59,7 @@
registry.addSequence("ReadOnly", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
try
@@ -87,7 +87,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -95,7 +95,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException
{
PortletPreferences prefs = request.getPreferences();
@@ -187,7 +187,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -201,7 +201,7 @@
registry.addSequence("ResetNullKeyThrowsNPE", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws ReadOnlyException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws ReadOnlyException
{
try
{
@@ -226,7 +226,7 @@
registry.addSequence("ZeroLengthArrayValue", seq);
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletPreferences prefs = request.getPreferences();
@@ -242,7 +242,7 @@
});
seq.addAction(1, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
PortletPreferences prefs = request.getPreferences();
@@ -265,7 +265,7 @@
});
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletPreferences prefs = request.getPreferences();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,9 +27,9 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.PortletSession;
@@ -50,7 +50,7 @@
registry.addSequence("Constants", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals(0x01, PortletSession.APPLICATION_SCOPE);
assertEquals(0x02, PortletSession.PORTLET_SCOPE);
@@ -66,7 +66,7 @@
registry.addSequence("GetAttribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession();
@@ -123,7 +123,7 @@
registry.addSequence("AttributeNames", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession();
@@ -165,7 +165,7 @@
registry.addSequence("CreationTime", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession();
@@ -195,7 +195,7 @@
registry.addSequence("Invalidate", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession();
@@ -223,7 +223,7 @@
registry.addSequence("New", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession();
@@ -253,7 +253,7 @@
registry.addSequence("RemoveAttribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession();
@@ -313,7 +313,7 @@
registry.addSequence("SetAttribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,9 +27,9 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.PortletSession;
@@ -49,7 +49,7 @@
registry.addSequence("DecodeAttributeName", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals("name", PortletSessionUtil.decodeAttributeName("name"));
@@ -75,7 +75,7 @@
registry.addSequence("DecodeScope", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals(PortletSession.APPLICATION_SCOPE, PortletSessionUtil.decodeScope("simpleName"));
assertEquals(PortletSession.APPLICATION_SCOPE, PortletSessionUtil.decodeScope("javax.portlet.name"));
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,9 +27,9 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.PortletURL;
@@ -52,7 +52,7 @@
registry.addSequence("Parameter", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createRenderURL();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,9 +27,9 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.RenderRequest;
@@ -55,7 +55,7 @@
registry.addSequence("Constants", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals("javax.portlet.userinfo", RenderRequest.USER_INFO);
@@ -75,7 +75,7 @@
registry.addSequence("Property", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
try
@@ -108,7 +108,7 @@
registry.addSequence("Attribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
try
{
@@ -149,7 +149,7 @@
registry.addSequence("Parameter", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
try
{
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,9 +27,9 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.RenderRequest;
@@ -49,7 +49,7 @@
registry.addSequence("Constants", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals("portlet.expiration-cache", RenderResponse.EXPIRATION_CACHE);
return new EndTestResponse();
@@ -64,7 +64,7 @@
registry.addSequence("ContentType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
try
{
@@ -92,7 +92,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
try
{
@@ -124,7 +124,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
try
{
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,9 +27,9 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.RenderRequest;
@@ -50,7 +50,7 @@
registry.addSequence("States", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals("minimized", "" + WindowState.MINIMIZED);
assertEquals("maximized", "" + WindowState.MAXIMIZED);
@@ -68,7 +68,7 @@
registry.addSequence("Constructor", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals("teststate", "" + new WindowState("teststate"));
assertEquals("teststate", "" + new WindowState("TESTSTATE"));
@@ -88,7 +88,7 @@
registry.addSequence("Equals", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
WindowState ws1 = new WindowState("TestState");
WindowState ws2 = new WindowState("teststate");
@@ -112,7 +112,7 @@
registry.addSequence("HashCode", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
WindowState ws1 = new WindowState("TestState");
WindowState ws2 = new WindowState("teststate");
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -25,11 +25,11 @@
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
@@ -65,7 +65,7 @@
registry.addSequence("GetRequestURI", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA");
response.setContentType("text/html");
@@ -77,7 +77,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
assertEquals(org.jboss.portal.test.portlet.jsr168.ext.dispatcher.DispatcherSequenceBuilder.SERVLET_A_URI, request.getRequestURI());
return new EndTestResponse();
@@ -92,7 +92,7 @@
registry.addSequence("RequestHeaderAccess", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
// Test the value is not there yet
Set propertyNames = Tools.toSet(request.getPropertyNames());
@@ -109,7 +109,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA");
response.setContentType("text/html");
@@ -120,7 +120,7 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context)
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context)
{
// Test the header is here
Set headerNames = Tools.toSet(request.getHeaderNames());
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,9 +27,9 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.GetResourceBundleDuringInitPortlet;
import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundleCascadePortlet;
import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundlePortlet;
@@ -55,7 +55,7 @@
seq.addAction(0, GetResourceBundleDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
ResourceBundle bundle = GetResourceBundleDuringInitPortlet.bundle;
assertNotNull(bundle);
@@ -74,7 +74,7 @@
seq.addAction(0, ResourceBundleCascadePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletConfig cfg = ((AbstractUniversalTestPortlet)portlet).getPortletConfig();
@@ -149,7 +149,7 @@
seq.addAction(0, ResourceBundlePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletConfig cfg = ((AbstractUniversalTestPortlet)portlet).getPortletConfig();
ResourceBundle bundle = cfg.getResourceBundle(Locale.ENGLISH);
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,11 +24,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -55,7 +55,7 @@
registry.addSequence("TestActionWithPortletMode", seq);
seq.addAction(0, TestActionWithPortletModePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletModeException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletModeException
{
PortletURL url = response.createActionURL();
url.setPortletMode(PortletMode.EDIT);
@@ -66,7 +66,7 @@
seq.addAction(1, TestActionWithPortletModePortlet.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
assertEquals(PortletMode.EDIT, request.getPortletMode());
}
@@ -74,7 +74,7 @@
seq.addAction(1, TestActionWithPortletModePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -87,7 +87,7 @@
registry.addSequence("TestDuringAction", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
InvokeGetResponse result = new InvokeGetResponse(url.toString());
@@ -97,7 +97,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws PortletModeException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletModeException
{
// Test we can set null portlet mode
response.setPortletMode(null);
@@ -106,7 +106,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -120,7 +120,7 @@
registry.addSequence("TestDuringRender", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletModeException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletModeException
{
// Test null returns false
assertFalse(request.isPortletModeAllowed(null));
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,10 +27,10 @@
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -72,7 +72,7 @@
registry.addSequence("ActionRequestUseForm", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
InvokePostResponse iur = new InvokePostResponse();
PortletURL url = response.createActionURL();
@@ -92,7 +92,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
assertEquals(new String[]{"g_bar1_1"}, request.getParameterValues("g_foo1"));
assertEquals(new String[]{"g_bar2_1", "g_bar2_2"}, request.getParameterValues("g_foo2"));
@@ -125,7 +125,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -143,7 +143,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
InvokePostResponse iur = new InvokePostResponse();
PortletURL url = response.createActionURL();
@@ -161,7 +161,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
assertEquals(new String[]{"g_bar1_1"}, request.getParameterValues("g_foo1"));
@@ -204,7 +204,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -221,7 +221,7 @@
registry.addSequence("ActionRequestUseReader", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
InvokePostResponse iur = new InvokePostResponse();
PortletURL url = response.createActionURL();
@@ -238,7 +238,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
assertEquals(new String[]{"g_bar1_1"}, request.getParameterValues("g_foo1"));
assertEquals(new String[]{"g_bar2_1", "g_bar2_2"}, request.getParameterValues("g_foo2"));
@@ -280,7 +280,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -297,7 +297,7 @@
registry.addSequence("RequestAttribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
// Take a snapshot of the attribute names
Set snapshot = Tools.toSet(request.getAttributeNames());
@@ -332,7 +332,7 @@
registry.addSequence("RequestAttributeScoping", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertNull(request.getAttribute("foo"));
request.setAttribute("foo", "foo");
@@ -347,7 +347,7 @@
registry.addSequence("RequestParameter", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
url.setParameter("foo1", "bar1");
@@ -359,7 +359,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// The expected map
Map expectedParameterMap = new HashMap();
@@ -387,7 +387,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -402,7 +402,7 @@
registry.addSequence("RequestHeaderAccess", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
// Test the value is not there yet
Set propertyNames = Tools.toSet(request.getPropertyNames());
@@ -419,7 +419,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
// Test the header is here
Set propertyNames = Tools.toSet(request.getPropertyNames());
@@ -439,7 +439,7 @@
seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Test the header is here
Set propertyNames = Tools.toSet(request.getPropertyNames());
@@ -454,7 +454,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,9 +27,9 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.RenderRequest;
@@ -47,7 +47,7 @@
registry.addSequence("ContentType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
String responseContentType = request.getResponseContentType();
response.setContentType(responseContentType);
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -25,10 +25,10 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
@@ -66,7 +66,7 @@
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -80,7 +80,7 @@
seq.addAction(1, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -93,7 +93,7 @@
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -106,7 +106,7 @@
registry.addSequence("StoreMustPersistAllChanges", seq);
seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -115,7 +115,7 @@
seq.addAction(1, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -139,7 +139,7 @@
seq.addAction(1, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -147,7 +147,7 @@
seq.addAction(2, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -162,7 +162,7 @@
seq.addAction(2, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -176,7 +176,7 @@
seq.addAction(0, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -184,7 +184,7 @@
seq.addAction(1, UTP3.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException
{
// Get prefs map
PortletPreferences prefs = request.getPreferences();
@@ -230,7 +230,7 @@
seq.addAction(1, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,11 +24,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
@@ -68,7 +68,7 @@
registry.addSequence("SessionDoesNotExistBeforeItIsRequested", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession(false);
assertNull(session);
@@ -88,7 +88,7 @@
registry.addSequence("ObtainNonNullSessionUsingCreateEqualsFalse", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession();
assertNotNull(session);
@@ -99,7 +99,7 @@
});
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws PortletException, PortletSecurityException, IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, PortletSecurityException, IOException
{
PortletSession session = request.getPortletSession(false);
assertNotNull(session);
@@ -109,7 +109,7 @@
});
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession(false);
assertNotNull(session);
@@ -133,7 +133,7 @@
registry.addSequence("CrossContextSessionAttribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletSession session = request.getPortletSession();
session.setAttribute("key", "value", PortletSession.APPLICATION_SCOPE);
@@ -150,7 +150,7 @@
*/
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
HttpSession session = request.getSession();
assertEquals("value", session.getAttribute("key"));
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -28,8 +28,8 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.RenderRequest;
@@ -47,7 +47,7 @@
registry.addSequence("TestLog4j", seq);
seq.addAction(0, LoggingPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Logger logger = ((LoggingPortlet)portlet).getLogger();
assertNotNull(logger);
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,11 +24,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
@@ -77,7 +77,7 @@
registry.addSequence("ObtainingDispatcher", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
UTP1 p = (UTP1)portlet;
//correct
@@ -131,7 +131,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -139,7 +139,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
//set some render params to test them in dispatcher include (precedense)
response.setRenderParameter("key1", "differentValue");
@@ -149,7 +149,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
String path = "/universalServletA";
path += "?key1=k1value1&key2=k2value1";
@@ -167,7 +167,7 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
assertEquals("k1value1", request.getParameter("key1"));
assertEquals("k2value1", request.getParameter("key2"));
@@ -191,7 +191,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
assertNotNull(dispatcher);
@@ -211,7 +211,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
StringBuffer buffer = request.getRequestURL();
UTP1.local.set(buffer == null ? Boolean.TRUE : Boolean.FALSE);
@@ -232,7 +232,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
assertNotNull(dispatcher);
@@ -248,7 +248,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
if (request.getMethod().equals("GET"))
{
@@ -272,7 +272,7 @@
registry.addSequence("IncludedRequestParameters", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA");
assertNotNull(dispatcher);
@@ -351,7 +351,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
UTP1.local1.set(request.getAttribute("javax.servlet.include.request_uri"));
UTP1.local2.set(request.getAttribute("javax.servlet.include.context_path"));
@@ -374,7 +374,7 @@
registry.addSequence("IncludedRequestAttributes", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA");
assertNotNull(dispatcher);
@@ -416,7 +416,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
UTP1.local1.set(request.getAttribute("javax.portlet.config"));
UTP1.local2.set(request.getAttribute("javax.portlet.request"));
@@ -451,7 +451,7 @@
registry.addSequence("RequestObject", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
//we dispatch to servlet and assertions will be done there
String queryString = "?key1=k1value1&key2=k2value1";
@@ -465,7 +465,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
//we get this object to assert some of it's method compare wieth http request methods
RenderRequest portletRequest = (RenderRequest)request.getAttribute("javax.portlet.request");
@@ -582,7 +582,7 @@
registry.addSequence("ResponseObject", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
//we dispatch to servlet and assertions will be done there
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA");
@@ -595,7 +595,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
//we get this object to assert some of it's method compare wieth http request methods
RenderResponse portletResponse = (RenderResponse)request.getAttribute("javax.portlet.response");
@@ -630,7 +630,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
@@ -651,12 +651,12 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
return null;
}
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
//SPEC:142 - RuntimeException
throw new RuntimeException();
@@ -665,7 +665,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
assertNotNull(dispatcher);
@@ -685,12 +685,12 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
return null;
}
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
//SPEC:142 - checked exception of type IOException
throw new IOException();
@@ -699,7 +699,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
@@ -723,12 +723,12 @@
seq.addAction(2, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
return null;
}
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
//SPEC:143 - ServletException
throw new ServletException();
@@ -737,7 +737,7 @@
seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
/*PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
assertNotNull(dispatcher);
@@ -757,12 +757,12 @@
seq.addAction(3, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
return null;
}
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
//SPEC:143 - 'other' exception
throw new Error();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,9 +27,9 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesNotInResourceBundlePortlet;
import org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesWithNoResourceBundleDefinedPortlet;
@@ -54,7 +54,7 @@
seq.addAction(0, InlineValuesNotInResourceBundlePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletConfig cfg = ((AbstractUniversalTestPortlet)portlet).getPortletConfig();
@@ -80,7 +80,7 @@
seq.addAction(0, InlineValuesWithNoResourceBundleDefinedPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletConfig cfg = ((AbstractUniversalTestPortlet)portlet).getPortletConfig();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -27,13 +27,13 @@
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.portlet.Portlet;
import javax.portlet.PortletException;
@@ -71,7 +71,7 @@
registry.addSequence("InitializationParameters", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
Enumeration enumeration = aport.getPortletContext().getInitParameterNames();
@@ -92,12 +92,12 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
return null;
}
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
AbstractUniversalTestServlet serv = ((AbstractUniversalTestServlet)servlet);
Enumeration portletEnumeration = (Enumeration)serv.getServletContext().getAttribute("initParams");
@@ -120,7 +120,7 @@
registry.addSequence("ContextAttributes", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
aport.getPortletContext().setAttribute("sharedObject", "sharedObjectValue");
@@ -144,7 +144,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
AbstractUniversalTestServlet serv = ((AbstractUniversalTestServlet)servlet);
UTP1.local.set(serv.getServletContext().getAttribute("sharedObject").equals("sharedObjectValue") ? Boolean.TRUE : Boolean.FALSE);
@@ -152,7 +152,7 @@
return null;
}
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
return null;
}
@@ -169,7 +169,7 @@
registry.addSequence("AccessSameSetOfResources", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
//we get resource and pass it to servlet
@@ -200,7 +200,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
AbstractUniversalTestServlet serv = ((AbstractUniversalTestServlet)servlet);
URL portletUrl = (URL)serv.getServletContext().getAttribute("resource");
@@ -223,7 +223,7 @@
return null;
}
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
return null;
}
@@ -241,7 +241,7 @@
registry.addSequence("TempDir", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
File tempDir = (File)aport.getPortletContext().getAttribute("javax.servlet.context.tempdir");
@@ -263,7 +263,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
AbstractUniversalTestServlet serv = ((AbstractUniversalTestServlet)servlet);
String path = (String)serv.getServletContext().getAttribute("tempDirPath");
@@ -275,7 +275,7 @@
return null;
}
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
return null;
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -25,11 +25,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.response.FailureResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
@@ -71,7 +71,7 @@
registry.addSequence("InitializeBeforeHandle", seq);
seq.addAction(0, InitializeBeforeHandlePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertTrue(InitializeBeforeHandlePortlet.init);
return new EndTestResponse();
@@ -95,7 +95,7 @@
//PortletExceptionDuringInitPortlet
seq.addAction(0, PortletExceptionDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletExceptionDuringInitPortlet.rendered = true;
return null;
@@ -105,7 +105,7 @@
//RuntimeExceptionDuringInitPortlet
seq.addAction(0, RuntimeExceptionDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
RuntimeExceptionDuringInitPortlet.rendered = true;
return null;
@@ -115,7 +115,7 @@
//UnavailableExceptionDuringInitPortlet
seq.addAction(0, UnavailableExceptionDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
UnavailableExceptionDuringInitPortlet.rendered = true;
return null;
@@ -125,7 +125,7 @@
//ControllerPortlet
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createRenderURL().toString());
}
@@ -133,7 +133,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createRenderURL().toString());
}
@@ -141,7 +141,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//portlets shouldn't render itself
assertEquals(false, PortletExceptionDuringInitPortlet.rendered);
@@ -170,7 +170,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -178,7 +178,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
UTP1.local.set(Boolean.TRUE);
}
@@ -186,7 +186,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals(Boolean.TRUE, (Boolean)UTP1.local.get());
return new EndTestResponse();
@@ -207,7 +207,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createRenderURL().toString());
}
@@ -215,7 +215,7 @@
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//pass action url
UTP2.holder = response.createActionURL().toString();
@@ -225,7 +225,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//get portlet b action url and invoke
assertNotNull(UTP2.holder);
@@ -235,7 +235,7 @@
seq.addAction(2, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
//mark action phase invokation
UTP2.local.set(Boolean.TRUE);
@@ -244,7 +244,7 @@
seq.addAction(2, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//assert that render is after Portlet B action
assertEquals(Boolean.TRUE, (Boolean)UTP2.local.get());
@@ -254,7 +254,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//assert that render is after Portlet B action
assertEquals(Boolean.TRUE, (Boolean)UTP2.local.get());
@@ -265,7 +265,7 @@
seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -284,7 +284,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createRenderURL().toString());
}
@@ -292,7 +292,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createRenderURL().toString());
}
@@ -300,7 +300,7 @@
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//mark that Portlet B was invoked after portlet A render url
UTP2.holder = Boolean.TRUE;
@@ -310,7 +310,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//assert Portlet B was invoked
assertEquals(Boolean.TRUE, (Object)UTP2.holder);
@@ -330,7 +330,7 @@
registry.addSequence("SendRedirectDuringAction", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -338,7 +338,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws PortletException, PortletSecurityException, IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, PortletSecurityException, IOException
{
String path = request.getContextPath() + "/universalServletA";
response.sendRedirect(path);
@@ -347,7 +347,7 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
return new EndTestResponse();
}
@@ -355,7 +355,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//We shouldn't be here
return new FailureResponse("Render wasn't expected to be invoked");
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,11 +24,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec.NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet;
@@ -56,7 +56,7 @@
seq.addAction(0, NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletModeException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletModeException
{
NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.url = response.createRenderURL();
NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.url.setPortletMode(PortletMode.EDIT);
@@ -66,7 +66,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//just repost so other portlet can create url in first render
PortletURL url = response.createRenderURL();
@@ -77,7 +77,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//invoke render url from different portlet to be able to call specific mode for it
//it has Mode set to EDIT
@@ -87,7 +87,7 @@
seq.addAction(2, NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletModeException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletModeException
{
if (request.getPortletMode().equals(PortletMode.EDIT))
{
@@ -100,7 +100,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createRenderURL().toString());
}
@@ -108,7 +108,7 @@
seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//check that other portlet wasn't invoked
assertNull(UTP1.holder);
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,11 +24,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -62,7 +62,7 @@
registry.addSequence("ActionToRequestParametersNotPropagated", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
url.setParameter("key1", "k1value1");
@@ -73,7 +73,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
//assert that we received parameters from render
assertEquals("k1value1", request.getParameter("key1"));
@@ -83,7 +83,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//assert that parameters weren't propagated from Action phase
assertNull(request.getParameter("key1"));
@@ -104,7 +104,7 @@
registry.addSequence("ActionToRenderParameters", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -113,7 +113,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
//set parameters for render phase
response.setRenderParameter("key1", "k1value1");
@@ -123,7 +123,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//assert that we received parameters from action phase
assertEquals("k1value1", request.getParameter("key1"));
@@ -145,7 +145,7 @@
registry.addSequence("ParametersDuringRenderNotTargeted", seq);
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
UTP2.holder = response.createRenderURL();
return null;
@@ -154,7 +154,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//just repost so other portlet can create url in first render
PortletURL url = response.createRenderURL();
@@ -168,7 +168,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//invoke render url from different portlet to be able to pass some params to it
PortletURL url = (PortletURL)UTP2.holder;
@@ -180,7 +180,7 @@
seq.addAction(2, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals("p2k1value1", request.getParameter("portlet2key1"));
assertEquals(new String[]{"p2k2value1", "p2k2value2", "p2k2value3"}, request.getParameterValues("portlet2key2"));
@@ -190,7 +190,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//we test if we have params set during requestCount==0, becouse our portlet
//wasn't targeted in current render request
@@ -211,7 +211,7 @@
seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//second portlet asserted if it received correct parameters during render request
//we simply end test
@@ -233,7 +233,7 @@
registry.addSequence("ParameterAccessMethodst", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
//set some parameters for testing
@@ -245,7 +245,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
assertEquals("k1value1", request.getParameter("key1"));
//assert it returns one element array
@@ -259,7 +259,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -280,7 +280,7 @@
registry.addSequence("ContextPath", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -289,7 +289,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
String path = request.getContextPath();
//empty string is allowed by spec if portlet is based in server root
@@ -305,7 +305,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//and we test the same for RenderRequest
@@ -332,7 +332,7 @@
registry.addSequence("AuthType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -341,7 +341,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
//in current testsuite there is no user authentication
assertNull(request.getAuthType());
@@ -350,7 +350,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//in current testsuite there is no user authentication
assertNull(request.getAuthType());
@@ -372,7 +372,7 @@
registry.addSequence("ContentType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -381,7 +381,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
Enumeration types = request.getResponseContentTypes();
@@ -392,7 +392,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -412,7 +412,7 @@
registry.addSequence("ObtainingInputStreamAndReader", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -421,7 +421,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
request.getPortletInputStream();
try
@@ -439,7 +439,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -448,7 +448,7 @@
seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
request.getReader();
try
@@ -466,7 +466,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -25,11 +25,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.response.FailureResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
@@ -75,7 +75,7 @@
registry.addSequence("SendRedirectWithRelativeURL", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -84,7 +84,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
try
{
@@ -100,7 +100,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -118,7 +118,7 @@
registry.addSequence("SendRedirectAfterChangeStateMethods", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -127,7 +127,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws PortletModeException, IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletModeException, IOException
{
response.setPortletMode(PortletMode.VIEW);
try
@@ -144,7 +144,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -153,7 +153,7 @@
seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException, WindowStateException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException, WindowStateException
{
response.setWindowState(WindowState.NORMAL);
try
@@ -170,7 +170,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -179,7 +179,7 @@
seq.addAction(3, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
response.setRenderParameter("key", "value");
try
@@ -196,7 +196,7 @@
seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -205,7 +205,7 @@
seq.addAction(4, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
Map map = new HashMap();
map.put("key", new String[]{"value"});
@@ -224,7 +224,7 @@
seq.addAction(4, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -242,7 +242,7 @@
registry.addSequence("NotAllowedMode", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -251,7 +251,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
try
{
@@ -267,7 +267,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -285,7 +285,7 @@
registry.addSequence("NotSupportedWindowState", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -294,7 +294,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
try
{
@@ -310,7 +310,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -329,7 +329,7 @@
registry.addSequence("StateChangesAfterRedirectionSend", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -338,7 +338,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException, PortletModeException, WindowStateException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException, PortletModeException, WindowStateException
{
response.sendRedirect(request.getContextPath() + "/universalServletA");
@@ -366,7 +366,7 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
return new EndTestResponse();
}
@@ -374,7 +374,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new FailureResponse("Render wasn't expected to be called");
}
@@ -394,7 +394,7 @@
registry.addSequence("RenderParameters", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -403,7 +403,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
response.setRenderParameter("key1", "some strange value to overwrite");
response.setRenderParameter("key2", "some strange value to overwrite 2");
@@ -414,7 +414,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//we should receive overwrite values
assertEquals("k1value1", request.getParameter("key1"));
@@ -425,7 +425,7 @@
seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Don't set any parameter
}
@@ -433,7 +433,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
// We shouldn't receive anything as no parameters were set during action phase
assertEquals(Collections.EMPTY_MAP, request.getParameterMap());
@@ -454,7 +454,7 @@
registry.addSequence("ParametersSetAfterSendRedirect", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -463,7 +463,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
response.sendRedirect(request.getContextPath() + "/universalServletA");
@@ -493,7 +493,7 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
return new EndTestResponse();
}
@@ -501,7 +501,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new FailureResponse("Render wasn't expected");
}
@@ -520,7 +520,7 @@
registry.addSequence("SetNotSupportedContentType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
try
{
@@ -546,7 +546,7 @@
registry.addSequence("SetContentTypeBeforeOutputStreamOrWriter", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
try
{
@@ -563,7 +563,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
try
{
@@ -589,7 +589,7 @@
registry.addSequence("GetContentType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
try
{
@@ -621,7 +621,7 @@
registry.addSequence("OutputStreamOrWriter", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
response.setContentType("text/html");
response.getWriter();
@@ -640,7 +640,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
//we need this to be able to marshal the result
response.setContentType("text/html");
@@ -682,7 +682,7 @@
registry.addSequence("NamespaceEncoding", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
String namespace = response.getNamespace();
@@ -733,7 +733,7 @@
registry.addSequence("IllegalStateExceptionAfterSendRedirect", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -742,7 +742,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
response.sendRedirect(request.getContextPath() + "/universalServletB");
//this should be propagated to the portlet to not invoke redirection
@@ -752,7 +752,7 @@
seq.addAction(1, UTS2.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
return new FailureResponse("Redirection shouldn't be made");
}
@@ -760,7 +760,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//if redirect wasn't called we should be here. Alternatively we should use other portlet
//with same test id to render the response.
@@ -782,7 +782,7 @@
registry.addSequence("BufferSize", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
// No buffering is defined
assertEquals(0, response.getBufferSize());
@@ -809,7 +809,7 @@
registry.addSequence("BufferReset", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//here we should test if after resetBuffer() response properties were cleared
//but it's rather hard to do this now as there is no getProperty() method.
@@ -819,7 +819,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
response.setContentType("text/html");
PrintWriter writer = response.getWriter();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,11 +24,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
@@ -75,7 +75,7 @@
registry.addSequence("SessionCreate", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//we ensure that session is ceated
UTP1.holder = request.getPortletSession();
@@ -87,7 +87,7 @@
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
UTP2.holder = request.getPortletSession();
return null;
@@ -96,7 +96,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//assert that during same request it was the same object
assertTrue(((PortletSession)UTP1.holder).getId().equals(((PortletSession)UTP2.holder).getId()));
@@ -127,7 +127,7 @@
registry.addSequence("SessionAttributes", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
request.getPortletSession(true).setAttribute("key1", "k1value1", PortletSession.APPLICATION_SCOPE);
request.getPortletSession().setAttribute("key2", "k2value1", PortletSession.PORTLET_SCOPE);
@@ -138,7 +138,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
assertEquals("k1value1", request.getPortletSession().getAttribute("key1", PortletSession.APPLICATION_SCOPE));
assertEquals("k2value1", request.getPortletSession().getAttribute("key2"));
@@ -147,7 +147,7 @@
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//assert that we have access to APLICATION_SCOPE and not to PORTLET_SCOPE attributes
assertEquals("k1value1", request.getPortletSession().getAttribute("key1", PortletSession.APPLICATION_SCOPE));
@@ -158,7 +158,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//in this request count we do an assert in SessionAttributesHelperPortlet
//so just repaint to let it finish
@@ -169,7 +169,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//invoke servlet
String path = request.getContextPath();
@@ -179,7 +179,7 @@
seq.addAction(3, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
//assert that we have access to APLICATION_SCOPE and not to PORTLET_SCOPE attributes
assertEquals("k1value1", request.getSession().getAttribute("key1"));
@@ -225,7 +225,7 @@
registry.addSequence("HttpSessionRelations", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
UTP1.holder = response.createRenderURL().toString();
@@ -238,7 +238,7 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
//assert that we can access attributest stored in PortletSession
assertEquals("k1value1", request.getSession().getAttribute("key1"));
@@ -254,7 +254,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//assert that we can access attributest stored in HttpSession
assertEquals("k2value1", request.getPortletSession().getAttribute("key2", PortletSession.APPLICATION_SCOPE));
@@ -273,7 +273,7 @@
registry.addSequence("HttpSessionInvalidatesPortletSession", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
PortletSession session = request.getPortletSession();
assertNotNull(session);
@@ -318,7 +318,7 @@
registry.addSequence("PortletSessionInvalidatesHttpSession", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
try
{
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,11 +24,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -62,7 +62,7 @@
registry.addSequence("RenderURLNotInvokeAction", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createRenderURL();
return new InvokeGetResponse(url.toString());
@@ -71,7 +71,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
//this shouldn't be invoked
UTP1.local.set(Boolean.TRUE);
@@ -80,7 +80,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertNull(UTP1.local.get());
return new EndTestResponse();
@@ -103,7 +103,7 @@
registry.addSequence("PortletURLParameters", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
@@ -120,7 +120,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
assertEquals("k1value1", request.getParameter("key1"));
assertEquals(new String[]{"k2value1", "k2value2", "k2value3"}, request.getParameterValues("key2"));
@@ -129,7 +129,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createActionURL();
@@ -149,7 +149,7 @@
seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
//what was in previous request
assertNull(request.getParameter("key1"));
@@ -163,7 +163,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createRenderURL();
@@ -181,7 +181,7 @@
seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//what was in previous request
assertNull(request.getParameter("key1"));
@@ -209,7 +209,7 @@
registry.addSequence("PortletURLWithNotSupportedMode", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createRenderURL();
try
@@ -238,7 +238,7 @@
registry.addSequence("PortletURLWithNotSupportedState", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
PortletURL url = response.createRenderURL();
try
@@ -266,7 +266,7 @@
registry.addSequence("SecurityLevel", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
UTP1.holder = new Boolean(request.isSecure());
PortletURL url = response.createActionURL();
@@ -276,7 +276,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
assertEquals(((Boolean)UTP1.holder).booleanValue(), request.isSecure());
}
@@ -284,7 +284,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals(((Boolean)UTP1.holder).booleanValue(), request.isSecure());
return new EndTestResponse();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -24,11 +24,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -72,7 +72,7 @@
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -80,7 +80,7 @@
seq.addAction(1, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -109,7 +109,7 @@
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -117,7 +117,7 @@
seq.addAction(2, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -130,7 +130,7 @@
seq.addAction(2, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -149,7 +149,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -157,7 +157,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Get prefs map
PortletPreferences prefs = request.getPreferences();
@@ -182,7 +182,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -202,7 +202,7 @@
seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -210,7 +210,7 @@
seq.addAction(1, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -231,7 +231,7 @@
seq.addAction(1, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -239,7 +239,7 @@
seq.addAction(2, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -263,7 +263,7 @@
seq.addAction(2, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -271,7 +271,7 @@
seq.addAction(3, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -283,7 +283,7 @@
seq.addAction(3, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -301,7 +301,7 @@
seq.addAction(0, UTP5.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -309,7 +309,7 @@
seq.addAction(1, UTP5.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -382,7 +382,7 @@
seq.addAction(1, UTP5.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -400,7 +400,7 @@
seq.addAction(0, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -408,7 +408,7 @@
seq.addAction(1, UTP3.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -435,7 +435,7 @@
seq.addAction(1, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -443,7 +443,7 @@
seq.addAction(2, UTP3.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -458,7 +458,7 @@
seq.addAction(2, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -475,7 +475,7 @@
registry.addSequence("StoreCalledDuringRenderThrowsIllegalArgumentException", seq);
seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, ValidatorException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -506,7 +506,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -514,7 +514,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -543,7 +543,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -551,7 +551,7 @@
seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -564,7 +564,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -583,7 +583,7 @@
seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -591,7 +591,7 @@
seq.addAction(1, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -619,7 +619,7 @@
seq.addAction(1, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -627,7 +627,7 @@
seq.addAction(2, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -655,7 +655,7 @@
seq.addAction(2, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -663,7 +663,7 @@
seq.addAction(3, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -676,7 +676,7 @@
seq.addAction(3, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -693,7 +693,7 @@
registry.addSequence("CreateASingleInstanceOfValidator", seq);
seq.addAction(0, UTP6.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
assertEquals(1, CreateASingleInstanceOfValidatorValidator.getCreatedCount());
return new EndTestResponse();
@@ -715,7 +715,7 @@
seq.addAction(0, UTP8.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -723,7 +723,7 @@
seq.addAction(1, UTP8.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -755,7 +755,7 @@
seq.addAction(1, UTP8.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -763,7 +763,7 @@
seq.addAction(2, UTP8.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -776,7 +776,7 @@
seq.addAction(2, UTP8.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
@@ -795,7 +795,7 @@
seq.addAction(0, UTP7.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -803,7 +803,7 @@
seq.addAction(1, UTP7.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -833,7 +833,7 @@
seq.addAction(1, UTP7.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -841,7 +841,7 @@
seq.addAction(2, UTP7.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -855,7 +855,7 @@
seq.addAction(2, UTP7.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java 2006-11-02 23:38:33 UTC (rev 5569)
@@ -25,11 +25,11 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.response.FailureResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTP2;
@@ -58,7 +58,7 @@
registry.addSequence("CustomStateNotMappedNotInvoked", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws WindowStateException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws WindowStateException
{
PortletURL url = response.createRenderURL();
url.setWindowState(new WindowState("UNMAPPED_STATE"));
@@ -68,7 +68,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
//if portlet was invoked we will have failure
return new FailureResponse("Render wasn't expected");
@@ -77,7 +77,7 @@
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
return new EndTestResponse();
}
More information about the jboss-svn-commits
mailing list