[jboss-svn-commits] JBoss Portal SVN: r5568 - in trunk: cms/src/main/org/jboss/portal/test/cms/clustering common common/src/main/org/jboss/portal/common/test/driver/command common/src/main/org/jboss/portal/common/test/info common/src/main/org/jboss/portal/common/test/junit common/src/main/org/jboss/portal/test/common/test portlet portlet/src/main/org/jboss/portal/portlet/test portlet/src/main/org/jboss/portal/test/framework/portlet portlet/src/main/org/jboss/portal/test/framework/portlet/actions portlet/src/main/org/jboss/portal/test/framework/portlet/basictests portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes portlet/src/main/org/jboss/portal/test/framework/portlet/components portlet/src/main/org/jboss/portal/test/framework/portlet/universal portlet/src/main/org/jboss/portal/test/portlet portlet/src/main/org/jboss/portal/test/portlet/framework portlet/src/main/org/jboss/portal/test/portlet/ha/session portlet/src/main/org/jboss/portal/test/portlet/info portl! et/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate portlet/src/main/org/jboss/portal/test/portlet/jsr! 168/ext/dispatcher portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses portlet/src/main
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 2 18:05:40 EST 2006
Author: julien at jboss.com
Date: 2006-11-02 18:02:12 -0500 (Thu, 02 Nov 2006)
New Revision: 5568
Added:
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP1.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP10.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP2.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP3.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP4.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP5.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP6.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP7.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP8.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP9.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS1.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS2.java
Removed:
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java
Modified:
trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java
trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java
trunk/common/build.xml
trunk/common/src/main/org/jboss/portal/common/test/driver/command/StartTestCommand.java
trunk/common/src/main/org/jboss/portal/common/test/info/TestContainerInfo.java
trunk/common/src/main/org/jboss/portal/common/test/info/TestInfo.java
trunk/common/src/main/org/jboss/portal/common/test/info/TestItemInfo.java
trunk/common/src/main/org/jboss/portal/common/test/junit/JUnitAdapter.java
trunk/common/src/main/org/jboss/portal/common/test/junit/POJOJUnitTest.java
trunk/common/src/main/org/jboss/portal/test/common/test/InfoTestCase.java
trunk/portlet/build.xml
trunk/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java
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/SequenceRegistryBuilder.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/SequenceRegistryBuilderTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.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/info/CacheInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.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/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.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/portletmode/spec/RequestDispatchingDependingOnModePortlet.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
trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml
trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml
trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml
trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml
trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml
trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml
trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml
trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml
trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml
trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml
trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java
trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistry.java
trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistryService.java
trunk/server/src/main/org/jboss/portal/test/server/TestRequestController.java
trunk/server/src/main/org/jboss/portal/test/server/charset/GetTest.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java
trunk/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java
trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java
trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java
trunk/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java
trunk/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java
trunk/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java
trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/AbstractHttpTestDriverServerService.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java
trunk/test/src/resources/portal-test-sar/META-INF/jboss-service.xml
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java
Log:
- changed the id management strategy in the test framework to be more flexible
- remove lot of static usage of HttpTestContext that is unnecessary and error prone
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -75,7 +75,7 @@
this.service = service;
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
try
{
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -39,10 +39,7 @@
import org.jboss.portal.test.framework.server.NodeId;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.server.AbstractServerURL;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
-import javax.management.MBeanServer;
import java.util.Locale;
import java.net.MalformedURLException;
@@ -78,7 +75,7 @@
this.service = service;
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
try
{
Modified: trunk/common/build.xml
===================================================================
--- trunk/common/build.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/common/build.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -202,8 +202,10 @@
<x-test>
<test todir="${test.reports}" name="org.jboss.portal.test.common.test.InfoTestCase"/>
+<!--
<test todir="${test.reports}" name="org.jboss.portal.test.common.test.TestParameterValueTestCase"/>
<test todir="${test.reports}" name="org.jboss.portal.test.common.test.TestParametrizationTestCase"/>
+-->
<!--
<test todir="${test.reports}" name="org.jboss.portal.test.common.AbstractInvocationContextTestCase"/>
<test todir="${test.reports}" name="org.jboss.portal.test.common.LocaleInfoTestCase"/>
Modified: trunk/common/src/main/org/jboss/portal/common/test/driver/command/StartTestCommand.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/test/driver/command/StartTestCommand.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/common/src/main/org/jboss/portal/common/test/driver/command/StartTestCommand.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -35,19 +35,19 @@
{
/** . */
- private String testName;
+ private String testId;
/** . */
private TestParametrization parametrization;
/**
- * @param testName the test name
+ * @param testId the test id
* @param parametrization the test parametrization
* @throws IllegalArgumentException if the test name or the parametrization is null
*/
- public StartTestCommand(String testName, TestParametrization parametrization) throws IllegalArgumentException
+ public StartTestCommand(String testId, TestParametrization parametrization) throws IllegalArgumentException
{
- if (testName == null)
+ if (testId == null)
{
throw new IllegalArgumentException();
}
@@ -55,18 +55,18 @@
{
throw new IllegalArgumentException();
}
- this.testName = testName;
+ this.testId = testId;
this.parametrization = parametrization;
}
/**
- * Return the test name.
+ * Return the test id.
*
- * @return the test name
+ * @return the test id
*/
- public String getTestName()
+ public String getTestId()
{
- return testName;
+ return testId;
}
/**
Modified: trunk/common/src/main/org/jboss/portal/common/test/info/TestContainerInfo.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/test/info/TestContainerInfo.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/common/src/main/org/jboss/portal/common/test/info/TestContainerInfo.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -117,12 +117,37 @@
{
throw new IllegalArgumentException("Duplicate child " + child.getName());
}
+ if (child.parent != null)
+ {
+ throw new IllegalArgumentException("Child is already attached");
+ }
// Perform attachment
children.put(child.getName(), child);
+ child.parent = this;
}
/**
+ * Remove a child from this container.
+ *
+ * @param childName the name of the child to remove
+ * @throws IllegalArgumentException if the child name is null or the child does not exist
+ */
+ public void removeChild(String childName) throws IllegalArgumentException
+ {
+ if (childName == null)
+ {
+ throw new IllegalArgumentException("No null child name accepted");
+ }
+ TestItemInfo child = (TestItemInfo)children.remove(childName);
+ if (child == null)
+ {
+ throw new IllegalArgumentException("No such child " + childName);
+ }
+ child.parent = null;
+ }
+
+ /**
* Retrieve a specified child
*
* @param childName the child name to retrieve
@@ -148,23 +173,25 @@
return children.keySet();
}
- public TestItemInfo findItem(String itemName)
+ public TestItemInfo findItem(String itemId)
{
- if (itemName == null)
+ if (itemId == null)
{
throw new IllegalArgumentException("No null item name");
}
- if (getName().equals(itemName))
+ if (itemId.length() == 0)
{
return this;
}
+ int index = itemId.indexOf('/');
+ String name = index != -1 ? itemId.substring(0, index) : itemId;
+ String next = index != -1 ? itemId.substring(index + 1) : "";
for (Iterator i = children.values().iterator();i.hasNext();)
{
TestItemInfo child = (TestItemInfo)i.next();
- TestItemInfo item = child.findItem(itemName);
- if (item != null)
+ if (name.equals(child.getName()))
{
- return item;
+ return child.findItem(next);
}
}
return null;
Modified: trunk/common/src/main/org/jboss/portal/common/test/info/TestInfo.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/test/info/TestInfo.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/common/src/main/org/jboss/portal/common/test/info/TestInfo.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -124,13 +124,13 @@
return (TestParameterInfo)parameters.get(parameterName);
}
- public TestItemInfo findItem(String itemName)
+ public TestItemInfo findItem(String itemId)
{
- if (itemName == null)
+ if (itemId == null)
{
- throw new IllegalArgumentException("No null item name");
+ throw new IllegalArgumentException("No null item id");
}
- return getName().equals(itemName) ? this : null;
+ return itemId.length() == 0 ? this : null;
}
protected void internalVisit(Visitor visitor)
Modified: trunk/common/src/main/org/jboss/portal/common/test/info/TestItemInfo.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/test/info/TestItemInfo.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/common/src/main/org/jboss/portal/common/test/info/TestItemInfo.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -36,11 +36,14 @@
{
/** The test name. */
- private final String name;
+ protected final String name;
/** The optional test description. */
- private final String description;
+ protected final String description;
+ /** The optional parent. */
+ protected TestContainerInfo parent;
+
/**
* Clone constructor.
*
@@ -106,13 +109,83 @@
}
/**
+ * Return the parent or null if it does not exist.
+ *
+ * @return the parent
+ */
+ public TestContainerInfo getParent()
+ {
+ return parent;
+ }
+
+ /**
+ * Return the id relative to a parent context.
+ *
+ * @return the id relative
+ */
+ public String getId(TestItemInfo context)
+ {
+ if (context != null)
+ {
+ StringBuffer buffer = internalGetId(context);
+ return buffer.toString();
+ }
+ else
+ {
+ StringBuffer buffer = internalGetId();
+ return buffer.toString();
+ }
+ }
+
+ protected StringBuffer internalGetId(TestItemInfo context)
+ {
+ if (this == context)
+ {
+ return new StringBuffer("");
+ }
+ else if (parent == null)
+ {
+ throw new IllegalArgumentException("Context is not an ancestor of the item");
+ }
+ else if (parent == context)
+ {
+ return new StringBuffer(name);
+ }
+ else
+ {
+ StringBuffer buffer = parent.internalGetId(context);
+ return buffer.append('/').append(name);
+ }
+ }
+
+ protected StringBuffer internalGetId()
+ {
+ if (parent == null)
+ {
+ return new StringBuffer("/");
+ }
+ else
+ {
+ StringBuffer buffer = parent.internalGetId();
+ if (buffer.length() > 1)
+ {
+ return buffer.append('/').append(name);
+ }
+ else
+ {
+ return buffer.append(name);
+ }
+ }
+ }
+
+ /**
* Find an item within the scope of the current item.
*
- * @param itemName the item name to find
+ * @param itemId the item id to find
* @return the item or null if not found
- * @throws IllegalArgumentException if the name is null
+ * @throws IllegalArgumentException if the id is null
*/
- public abstract TestItemInfo findItem(String itemName) throws IllegalArgumentException;
+ public abstract TestItemInfo findItem(String itemId) throws IllegalArgumentException;
/**
* Create a deep clone of the current item in a detyped manner.
Modified: trunk/common/src/main/org/jboss/portal/common/test/junit/JUnitAdapter.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/test/junit/JUnitAdapter.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/common/src/main/org/jboss/portal/common/test/junit/JUnitAdapter.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -116,7 +116,8 @@
{
public void runBare() throws Throwable
{
- StartTestCommand st = new StartTestCommand(testInfo.getName(), parametrization);
+ String testId = testInfo.getId(info);
+ StartTestCommand st = new StartTestCommand(testId, parametrization);
DriverResponse resp = driver.invoke(st);
if (resp instanceof FailureResponse)
{
Modified: trunk/common/src/main/org/jboss/portal/common/test/junit/POJOJUnitTest.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/test/junit/POJOJUnitTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/common/src/main/org/jboss/portal/common/test/junit/POJOJUnitTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -125,7 +125,7 @@
}
// Get corresponding test info
- TestInfo testInfo = (TestInfo)containerInfo.getChild(start.getTestName());
+ TestInfo testInfo = (TestInfo)containerInfo.findItem(start.getTestId());
// Contextualize
TestParametrization parametrization = start.getParametrization();
@@ -160,7 +160,7 @@
}
// Invoke test joinpoint
- Method method = (Method)testMap.get(start.getTestName());
+ Method method = (Method)testMap.get(start.getTestId());
method.invoke(test, new Object[0]);
return new EndTestResponse();
}
Modified: trunk/common/src/main/org/jboss/portal/test/common/test/InfoTestCase.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/test/common/test/InfoTestCase.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/common/src/main/org/jboss/portal/test/common/test/InfoTestCase.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -162,6 +162,43 @@
assertEquals(new CollectionBuilder().add("p1").add("p2").toHashSet(), test.getParameterNames());
}
+ public void testId()
+ {
+ TestContainerInfo root = new TestContainerInfo("root");
+ assertEquals("/", root.getId(null));
+ assertEquals("", root.getId(root));
+ try
+ {
+ root.getId(new TestContainerInfo("tmp"));
+ fail();
+ }
+ catch (IllegalArgumentException expected)
+ {
+ }
+
+ //
+ TestInfo a = new TestInfo("a");
+ root.addChild(a);
+ assertEquals("/a", a.getId(null));
+ assertEquals("a", a.getId(root));
+ assertEquals("", a.getId(a));
+
+ //
+ TestContainerInfo b = new TestContainerInfo("b");
+ root.addChild(b);
+ assertEquals("/b", b.getId(null));
+ assertEquals("b", b.getId(root));
+ assertEquals("", b.getId(b));
+
+ //
+ TestInfo c = new TestInfo("c");
+ b.addChild(c);
+ assertEquals("/b/c", c.getId(null));
+ assertEquals("b/c", c.getId(root));
+ assertEquals("c", c.getId(b));
+ assertEquals("", c.getId(c));
+ }
+
public void testClone()
{
@@ -174,6 +211,22 @@
public void testFind()
{
-
+ TestContainerInfo root = new TestContainerInfo("root");
+ TestInfo a = new TestInfo("a");
+ root.addChild(a);
+ TestContainerInfo b = new TestContainerInfo("b");
+ root.addChild(b);
+ TestInfo c = new TestInfo("c");
+ b.addChild(c);
+
+ //
+ assertEquals(root, root.findItem(""));
+ assertEquals(a, a.findItem(""));
+ assertEquals(a, root.findItem("a"));
+ assertEquals(b, b.findItem(""));
+ assertEquals(b, root.findItem("b"));
+ assertEquals(c, c.findItem(""));
+ assertEquals(c, b.findItem("c"));
+ assertEquals(c, root.findItem("b/c"));
}
}
Modified: trunk/portlet/build.xml
===================================================================
--- trunk/portlet/build.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/build.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -224,7 +224,7 @@
<mkdir dir="${build.resources}/test/jsr168/misc/@{test}-war/WEB-INF/classes"/>
<copy todir="${build.resources}/test/jsr168/misc/@{test}-war/WEB-INF/classes">
<fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/jsr168/misc/@{test}/**"/>
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/framework/**"/>
</copy>
<mkdir dir="${build.resources}/test/jsr168/misc/@{test}-war/WEB-INF/lib"/>
<jar jarfile="${build.lib}/test-jsr168-misc-@{test}.war">
@@ -239,7 +239,7 @@
<mkdir dir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/classes"/>
<copy todir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/classes">
<fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/jsr168/ext/@{test}/**"/>
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/framework/**"/>
</copy>
<mkdir dir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/lib"/>
<jar jarfile="${build.lib}/test-jsr168-ext-@{test}.war">
@@ -254,7 +254,7 @@
<mkdir dir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/classes"/>
<copy todir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/classes">
<fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/jsr168/tck/@{test}/**"/>
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/framework/**"/>
</copy>
<mkdir dir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/lib"/>
<jar jarfile="${build.lib}/test-jsr168-@{test}.war">
@@ -269,7 +269,7 @@
<mkdir dir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/classes"/>
<copy todir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/classes">
<fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/jsr168/api/@{test}/**"/>
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/framework/**"/>
</copy>
<mkdir dir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/lib"/>
<jar jarfile="${build.lib}/test-jsr168-api-@{test}.war">
@@ -314,6 +314,7 @@
<fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/>
<fileset dir="${junit.junit.lib}" includes="junit.jar"/>
<fileset dir="${build.lib}" includes="portal-portlet-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-portlet-test-lib.jar"/>
<fileset dir="${build.lib}" includes="test.war"/>
</copy>
<jar jarfile="${build.lib}/test.sar">
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -72,7 +72,6 @@
import org.jboss.portal.server.impl.MapAttributeResolver;
import org.jboss.portal.server.request.URLFormat;
import org.jboss.portal.server.util.HTTPStreamInfo;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -123,10 +122,10 @@
public void handle(ServerInvocation invocation) throws ServerException
{
//
- if (HttpTestContext.isCurrentRequestCount(0))
- {
- invocation.getServerContext().getClientRequest().getSession().invalidate();
- }
+// if (HttpTestContext.isCurrentRequestCount(0))
+// {
+// invocation.getServerContext().getClientRequest().getSession().invalidate();
+// }
try
{
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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -23,29 +23,33 @@
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.TestContainerInfo;
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.TestDriver;
import org.jboss.portal.common.test.driver.command.StartTestCommand;
import org.jboss.portal.jems.as.system.AbstractJBossService;
-import java.util.Iterator;
-
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class PortletTestDriver extends AbstractJBossService implements TestDriver
+public class PortletTestDriver extends AbstractJBossService
{
/** . */
private HttpTestDriverRegistry testDriverRegistry;
+ /** . */
+ public static HttpTestContext context;
+
+ /** . */
+ private static PortletTestDriver instance;
+
public HttpTestDriverRegistry getTestDriverRegistry()
{
return testDriverRegistry;
@@ -58,32 +62,24 @@
protected void startService() throws Exception
{
- testDriverRegistry.register(this);
+ if (instance != null)
+ {
+ throw new IllegalStateException("A sequence registry already exist");
+ }
+ instance = this;
}
protected void stopService() throws Exception
{
- testDriverRegistry.unregister(this);
+ instance = null;
}
- public TestItemInfo getInfo()
+ public static PortletTestDriver getInstance() throws IllegalStateException
{
- TestContainerInfo container = new TestContainerInfo("Portlet");
- SequenceRegistry registry = SequenceRegistryBuilder.getRegistry();
- for (Iterator i = registry.getTestNames().iterator(); i.hasNext();)
+ if (instance == null)
{
- String testName = (String)i.next();
- TestInfo test = new TestInfo(testName);
- container.addChild(test);
+ throw new IllegalStateException("No existing instance");
}
- return container;
+ return instance;
}
-
- public DriverResponse invoke(DriverCommand command) throws TestDriverException
- {
- StartTestCommand start = (StartTestCommand)command;
- String testName = start.getTestName();
- TestInfo info = (TestInfo)getInfo().findItem(testName);
- return new InvokeGetResponse("/test/" + info.getName());
- }
}
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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -22,11 +22,20 @@
******************************************************************************/
package org.jboss.portal.test.framework.portlet;
+import org.jboss.portal.common.test.info.TestInfo;
+import org.jboss.portal.common.test.info.TestContainerInfo;
+import org.jboss.portal.common.test.info.TestItemInfo;
+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.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 java.util.HashMap;
import java.util.Map;
import java.util.Collections;
-import java.util.Set;
/**
* Registry of action sequences. Every sequence is binded with test id
@@ -34,52 +43,84 @@
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision$
*/
-public class SequenceRegistry
+public class SequenceRegistry implements HttpTestDriverServer
{
/** . */
- private Map registry = null;
+ private final Map entries;
- public SequenceRegistry()
- {
- registry = Collections.synchronizedMap(new HashMap());
- }
+ /** . */
+ protected final TestContainerInfo container;
- public Map getRegistry()
+ public SequenceRegistry(String name)
{
- return registry;
+ entries = Collections.synchronizedMap(new HashMap());
+ container = new TestContainerInfo(name);
}
/**
* Adding sequence to registry. Sequence can be null as this will clear the binding
*
- * @param testId
+ * @param testName
* @param sequence
*/
- public void addSequence(String testId, Sequence sequence)
+ public void addSequence(String testName, Sequence sequence)
{
- if (testId == null)
+ if (testName == null)
{
- throw new IllegalArgumentException("Test id must be provided");
+ throw new IllegalArgumentException("Test name must be provided");
}
if (sequence == null)
{
throw new IllegalArgumentException("Sequence can't be null");
}
- registry.put(testId, sequence);
+ if (entries.containsKey(testName))
+ {
+ throw new IllegalArgumentException("Sequence cannot be bound twice");
+ }
+
+ //
+ TestInfo test = new TestInfo(testName);
+
+ //
+ entries.put(testName, sequence);
+ container.addChild(test);
}
- public Sequence getSequence(String testId)
+ public void removeSequence(String testName)
{
- if (testId == null)
+ container.removeChild(testName);
+ }
+
+ public Sequence getSequence(String testName)
+ {
+ if (testName == null)
{
- throw new IllegalArgumentException("Test ID can't be null");
+ throw new IllegalArgumentException("Test name can't be null");
}
- return (Sequence)registry.get(testId);
+ return (Sequence)entries.get(testName);
}
- public Set getTestNames()
+ public TestItemInfo getInfo()
{
- return registry.keySet();
+ return container;
}
+
+ public DriverResponse invoke(DriverCommand command) throws TestDriverException
+ {
+ StartTestCommand start = (StartTestCommand)command;
+ String testName = start.getTestId();
+ TestInfo info = (TestInfo)getInfo().findItem(testName);
+ return new InvokeGetResponse("/test/" + info.getName());
+ }
+
+ public void updateContext(String testId, HttpTestContext ctx)
+ {
+ PortletTestDriver.context = ctx;
+ }
+
+ public HttpTestContext retrieveContext(String testId)
+ {
+ return PortletTestDriver.context;
+ }
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -23,16 +23,6 @@
package org.jboss.portal.test.framework.portlet;
import org.apache.log4j.Logger;
-import org.jboss.portal.common.test.driver.TestDriver;
-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.common.test.info.TestItemInfo;
-import org.jboss.portal.common.test.info.TestContainerInfo;
-import org.jboss.portal.common.test.info.TestInfo;
-import org.jboss.portal.test.server.HttpTestDriverRegistryService;
-import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
@@ -42,7 +32,6 @@
import java.util.Arrays;
import java.util.List;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.regex.Pattern;
/**
@@ -52,25 +41,21 @@
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision$
*/
-public abstract class SequenceRegistryBuilder implements ServletContextListener, TestDriver
+public abstract class SequenceRegistryBuilder implements ServletContextListener
{
/** . */
- private static SequenceRegistry registry = null;
-
private final Logger log = Logger.getLogger(getClass());
- // Defines pattern for method names like createXXX
+ /** Defines pattern for method names like createXXX. */
public static String METHOD_PATTERN = "create.*";
- public static SequenceRegistry getRegistry()
- {
- return SequenceRegistryBuilder.registry;
- }
+ /** . */
+ private final SequenceRegistry registry;
- private void setRegistry(SequenceRegistry registry)
+ protected SequenceRegistryBuilder()
{
- SequenceRegistryBuilder.registry = registry;
+ this.registry = new SequenceRegistry(getClass().getName());
}
/**
@@ -83,7 +68,6 @@
{
log.info("RegistryBuilder invoked with instance of: '" + this.getClass().getName() + "' class");
- setRegistry(new SequenceRegistry());
// We invoke all createXXX methods to fill seqenceRegistry
List methods = introspectMethods(SequenceRegistryBuilder.METHOD_PATTERN);
@@ -93,7 +77,7 @@
try
{
log.info("Invoking method: '" + m.getName() + "' ");
- m.invoke(this, new Object[]{getRegistry()});
+ m.invoke(this, new Object[]{registry});
}
catch (IllegalAccessException e)
{
@@ -108,36 +92,16 @@
}
//
- HttpTestDriverRegistryService.registerTestDriver(this);
+ sce.getServletContext().setAttribute("SequenceRegistry", registry);
+ PortletTestDriver.getInstance().getTestDriverRegistry().register(registry);
}
- public void contextDestroyed(ServletContextEvent servletContextEvent)
+ public void contextDestroyed(ServletContextEvent sce)
{
- HttpTestDriverRegistryService.unregisterTestDriver(this);
+ sce.getServletContext().removeAttribute("SequenceRegistry");
+ PortletTestDriver.getInstance().getTestDriverRegistry().unregister(registry);
}
-
- public TestItemInfo getInfo()
- {
- TestContainerInfo container = new TestContainerInfo("Portlet");
- SequenceRegistry registry = SequenceRegistryBuilder.getRegistry();
- for (Iterator i = registry.getTestNames().iterator(); i.hasNext();)
- {
- String testName = (String)i.next();
- TestInfo test = new TestInfo(testName);
- container.addChild(test);
- }
- return container;
- }
-
- public DriverResponse invoke(DriverCommand command) throws TestDriverException
- {
- StartTestCommand start = (StartTestCommand)command;
- String testName = start.getTestName();
- TestInfo info = (TestInfo)getInfo().findItem(testName);
- return new InvokeGetResponse("/test/" + info.getName());
- }
-
/**
* Returning List of Method objects matching given name pattern
*
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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -25,6 +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 javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -41,11 +42,11 @@
public abstract class PortletActionTestAction extends TestAction
{
- public DriverResponse execute(Portlet portlet, ActionRequest request, ActionResponse response) throws PortletException, IOException
+ public DriverResponse execute(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws PortletException, IOException
{
try
{
- run(portlet, request, response);
+ run(portlet, request, response, context);
return null;
}
catch (AssertionFailedError t)
@@ -54,6 +55,6 @@
}
}
- protected abstract void run(Portlet portlet, ActionRequest request, ActionResponse response) throws PortletException, IOException;
+ protected abstract void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -25,10 +25,10 @@
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 javax.portlet.Portlet;
import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import java.io.IOException;
@@ -42,11 +42,11 @@
public abstract class PortletRenderTestAction extends TestAction
{
- public DriverResponse execute(Portlet servlet, RenderRequest request, RenderResponse response) throws PortletException, IOException
+ public DriverResponse execute(Portlet servlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletException, IOException
{
try
{
- return run(servlet, request, response);
+ return run(servlet, request, response, context);
}
catch (AssertionFailedError t)
{
@@ -54,5 +54,5 @@
}
}
- protected abstract DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws PortletException, IOException;
+ protected abstract DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,6 +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 javax.servlet.Servlet;
import javax.servlet.ServletException;
@@ -37,13 +38,13 @@
*/
public abstract class ServletServiceTestAction extends TestAction
{
- protected abstract DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException;
+ protected abstract DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException;
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
try
{
- return run(servlet, request, response);
+ return run(servlet, request, response, context);
}
catch (Throwable t)
{
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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -25,14 +25,15 @@
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.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTP2;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP2;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -54,7 +55,7 @@
registry.addSequence("OnePortlet", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -67,7 +68,7 @@
registry.addSequence("FailurePortlet", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new FailureResponse();
}
@@ -80,7 +81,7 @@
registry.addSequence("FailAssertPortlet", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
fail();
return null;
@@ -94,7 +95,7 @@
registry.addSequence("FailAssertInActionPortlet", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -103,7 +104,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
fail();
}
@@ -112,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)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -125,7 +126,7 @@
registry.addSequence("TwoPortlet", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -134,7 +135,7 @@
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -147,7 +148,7 @@
registry.addSequence("TwoResultPortlet", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -155,7 +156,7 @@
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -36,7 +36,7 @@
{
public void testBuilder()
{
- final SequenceRegistry sr = new SequenceRegistry();
+ final SequenceRegistry sr = new SequenceRegistry("toto");
final List invoked = new LinkedList();
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -36,7 +36,7 @@
{
Sequence sequence = new Sequence();
- SequenceRegistry sr = new SequenceRegistry();
+ SequenceRegistry sr = new SequenceRegistry("toto");
sr.addSequence("testA", sequence);
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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,6 +24,7 @@
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;
@@ -46,7 +47,7 @@
Joinpoint joinpoint = new Joinpoint("PortletA", Joinpoint.PORTLET_RENDER);
TestAction action = new PortletRenderTestAction()
{
- public DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ public DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -23,6 +23,7 @@
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.common.util.Tools;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.response.FailureResponse;
@@ -65,12 +66,13 @@
public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentTestName(testName))
+ HttpTestContext context = PortletTestDriver.context;
+ if (testName.equals(context.getTestName()))
{
DriverResponse response;
try
{
- response = doProcessAction(req, resp);
+ response = doProcessAction(req, resp, context);
}
catch (AssertionFailedError e)
{
@@ -80,25 +82,26 @@
//
if (response != null)
{
- HttpTestContext.setCurrentResponse(response);
+ context.setResponse(response);
}
}
else
{
- HttpTestContext.setCurrentResponse(new ErrorResponse());
+ context.setResponse(new ErrorResponse());
}
}
public void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentTestName(testName))
+ HttpTestContext context = PortletTestDriver.context;
+ if (testName.equals(context.getTestName()))
{
DriverResponse response;
try
{
- preRender(req, resp);
+ preRender(req, resp, context);
super.render(req, resp);
- response = postRender(req, resp);
+ response = postRender(req, resp, context);
}
catch (AssertionFailedError e)
{
@@ -108,12 +111,12 @@
//
if (response != null)
{
- HttpTestContext.setCurrentResponse(response);
+ context.setResponse(response);
}
}
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
{
throw new PortletException();
}
@@ -123,11 +126,12 @@
*
* @param req
* @param resp
+ * @param context
* @throws PortletException
* @throws PortletSecurityException
* @throws IOException
*/
- protected void preRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ protected void preRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
{
throw new PortletException();
}
@@ -137,11 +141,12 @@
*
* @param req
* @param resp
+ * @param context
* @throws PortletException
* @throws PortletSecurityException
* @throws IOException
*/
- protected DriverResponse postRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ protected DriverResponse postRender(RenderRequest req, RenderResponse resp, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -23,6 +23,7 @@
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.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.response.FailureResponse;
import org.jboss.portal.common.test.driver.response.ErrorResponse;
@@ -33,7 +34,6 @@
import javax.portlet.PortletConfig;
import javax.portlet.PortletContext;
import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import java.io.IOException;
@@ -101,14 +101,15 @@
return config.getPortletContext();
}
- public final void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
+ public final void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentTestName(testName))
+ HttpTestContext context = PortletTestDriver.context;
+ if (testName.equals(context.getTestName()))
{
DriverResponse response;
try
{
- response = doProcessAction(req, resp);
+ response = doProcessAction(req, resp, context);
}
catch (AssertionFailedError e)
{
@@ -118,23 +119,24 @@
//
if (response != null)
{
- HttpTestContext.setCurrentResponse(response);
+ context.setResponse(response);
}
}
else
{
- HttpTestContext.setCurrentResponse(new ErrorResponse());
+ context.setResponse(new ErrorResponse());
}
}
- public final void render(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ public final void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentTestName(testName))
+ HttpTestContext context = PortletTestDriver.context;
+ if (testName.equals(context.getTestName()))
{
DriverResponse response;
try
{
- response = doRender(req, resp);
+ response = doRender(req, resp, context);
}
catch (AssertionFailedError e)
{
@@ -144,7 +146,7 @@
//
if (response != null)
{
- HttpTestContext.setCurrentResponse(response);
+ context.setResponse(response);
}
}
}
@@ -153,12 +155,12 @@
{
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
{
throw new PortletException();
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,10 +29,10 @@
import org.jboss.portal.test.framework.portlet.Joinpoint;
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.actions.PortletActionTestAction;
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.server.NodeId;
import javax.portlet.ActionRequest;
@@ -133,9 +133,9 @@
* @throws PortletSecurityException
* @throws IOException
*/
- public final void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
+ public final void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
- HttpTestContext ctx = HttpTestContext.getCurrentContext();
+ HttpTestContext ctx = PortletTestDriver.context;
//
log.debug("Component '" + getComponentId() + "' processAction() method invoked for '"
@@ -143,7 +143,7 @@
+ctx.getRequestCount() + "' request count");
//
- Sequence sequence = getSequence();
+ Sequence sequence = getSequence(ctx.getTestName());
//
if (sequence != null)
@@ -165,7 +165,7 @@
log.debug("Found action for jointpoint " + actionJoinpoint + " : " + action);
//
- DriverResponse response = ((PortletActionTestAction)action).execute(this, req, resp);
+ DriverResponse response = ((PortletActionTestAction)action).execute(this, req, resp, ctx);
//
ctx.setResponse(response);
@@ -183,9 +183,9 @@
* @throws PortletSecurityException
* @throws IOException
*/
- public final void render(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ public final void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
- HttpTestContext ctx = HttpTestContext.getCurrentContext();
+ HttpTestContext ctx = PortletTestDriver.context;
//
log.debug("Component '" + getComponentId() + "' render() method invoked for '"
@@ -199,7 +199,7 @@
}
// Get the sequence
- Sequence sequence = getSequence();
+ Sequence sequence = getSequence(ctx.getTestName());
//
if (sequence != null)
@@ -212,7 +212,7 @@
log.debug("Found action for jointpoint " + renderJoinpoint + " : " + action);
// Get the result
- DriverResponse sr = ((PortletRenderTestAction)action).execute(this, req, resp);
+ DriverResponse sr = ((PortletRenderTestAction)action).execute(this, req, resp, ctx);
// If we have one result it is meant to be returned to the client
if (sr != null)
@@ -247,7 +247,7 @@
*/
private SequenceRegistry getSequenceRegistry()
{
- return SequenceRegistryBuilder.getRegistry();
+ return (SequenceRegistry)getPortletContext().getAttribute("SequenceRegistry");
}
/**
@@ -256,7 +256,7 @@
* @return
* @throws PortletException if there is no SequenceRegistry
*/
- private Sequence getSequence() throws PortletException
+ private Sequence getSequence(String testId) throws PortletException
{
SequenceRegistry registry = getSequenceRegistry();
if (registry == null)
@@ -264,7 +264,7 @@
log.error("No SequenceRegistry object found in current context");
throw new PortletException("No SequenceRegistry object found in context");
}
- return registry.getSequence(HttpTestContext.getCurrentTestName());
+ return registry.getSequence(testId);
}
protected String getComponentId()
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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -28,9 +28,9 @@
import org.jboss.portal.test.framework.portlet.Joinpoint;
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.actions.ServletServiceTestAction;
import org.jboss.portal.test.framework.portlet.TestAction;
+import org.jboss.portal.test.framework.portlet.PortletTestDriver;
import org.jboss.portal.test.framework.server.NodeId;
import javax.servlet.ServletException;
@@ -48,24 +48,21 @@
public abstract class AbstractUniversalTestServlet extends HttpServlet
{
+ /** The logger. */
private final Logger log = Logger.getLogger(getClass());
- /** The test id. */
+ /** The component id. */
private String componentId;
-
- /** Jointpoints for service method */
+ /** Jointpoint for service method. */
protected Joinpoint serviceJoinpoint;
-
/** Construct a test servlet with a test id computed with the method <code>getTestId(Class)</code>. */
public AbstractUniversalTestServlet()
{
super();
componentId = createComponentId(getClass());
setServiceJointpoint(new Joinpoint(componentId, Joinpoint.SERVLET_SERVICE));
-
-
}
/**
@@ -97,7 +94,7 @@
*/
protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
- HttpTestContext ctx = HttpTestContext.getCurrentContext();
+ HttpTestContext ctx = PortletTestDriver.context;
//
log.info("Component '" + getComponentId() + "' service() method invoked for '"
@@ -110,14 +107,14 @@
reset();
}
- Sequence sequence = getSequence();
+ Sequence sequence = getSequence(ctx.getTestName());
if (sequence != null)
{
TestAction action = sequence.getAction(ctx.getRequestCount(), NodeId.locate(), getServiceJointpoint());
if (action != null && action instanceof ServletServiceTestAction)
{
log.info("Found Action for this jointpoint");
- DriverResponse dr = ((ServletServiceTestAction)action).execute(this, request, response);
+ DriverResponse dr = ((ServletServiceTestAction)action).execute(this, request, response, ctx);
if (dr != null)
{
ctx.setResponse(dr);
@@ -148,8 +145,7 @@
*/
private SequenceRegistry getSequenceRegistry()
{
- //return (SequenceRegistry)getPortletContext().getAttribute(SequenceRegistry.SEQUENCE_REGISTRY);
- return SequenceRegistryBuilder.getRegistry();
+ return (SequenceRegistry)getServletContext().getAttribute("SequenceRegistry");
}
/**
@@ -158,7 +154,7 @@
* @return
* @throws javax.servlet.ServletException if there is no SequenceRegistry
*/
- protected Sequence getSequence() throws ServletException
+ protected Sequence getSequence(String testId) throws ServletException
{
SequenceRegistry registry = getSequenceRegistry();
if (registry == null)
@@ -166,8 +162,7 @@
log.info("No SequenceRegistry object found in current context");
throw new ServletException("No SequenceRegistry object found in context");
}
- HttpTestContext ctx = HttpTestContext.getCurrentContext();
- return registry.getSequence(ctx.getTestName());
+ return registry.getSequence(testId);
}
protected String getComponentId()
Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -1,74 +0,0 @@
-/******************************************************************************
- * 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.universal;
-
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class UTP1 extends AbstractUniversalTestPortlet
-{
- public static ThreadLocal local = new ThreadLocal();
-
- public static ThreadLocal local1 = new ThreadLocal();
-
- public static ThreadLocal local2 = new ThreadLocal();
-
- public static ThreadLocal local3 = new ThreadLocal();
-
- public static ThreadLocal local4 = new ThreadLocal();
-
- public static ThreadLocal local5 = new ThreadLocal();
-
- public static Object holder;
-
- public static String NAME = "Portlet1";
-
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
-
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
-
- protected String createComponentId()
- {
- return NAME;
- }
-
- /** Resets helper variables */
- public void reset()
- {
- local = new ThreadLocal();
- local1 = new ThreadLocal();
- local2 = new ThreadLocal();
- local3 = new ThreadLocal();
- local4 = new ThreadLocal();
- local5 = new ThreadLocal();
-
- holder = null;
- }
-
-
-}
Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -1,55 +0,0 @@
-/******************************************************************************
- * 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.universal;
-
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class UTP10 extends AbstractUniversalTestPortlet
-{
- public static ThreadLocal local = new ThreadLocal();
-
- public static Object holder;
-
- public static String NAME = "Portlet10";
-
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP10.NAME, Joinpoint.PORTLET_RENDER);
-
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP10.NAME, Joinpoint.PORTLET_ACTION);
-
- protected String createComponentId()
- {
- return UTP10.NAME;
- }
-
- /** Resets helper variables */
- public void reset()
- {
- UTP10.local = new ThreadLocal();
- UTP10.holder = null;
- }
-}
Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -1,55 +0,0 @@
-/******************************************************************************
- * 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.universal;
-
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class UTP2 extends AbstractUniversalTestPortlet
-{
- public static ThreadLocal local = new ThreadLocal();
-
- public static Object holder;
-
- public static String NAME = "Portlet2";
-
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
-
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
-
- protected String createComponentId()
- {
- return NAME;
- }
-
- /** Resets helper variables */
- public void reset()
- {
- local.set(null);
- holder = null;
- }
-}
Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -1,55 +0,0 @@
-/******************************************************************************
- * 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.universal;
-
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class UTP3 extends AbstractUniversalTestPortlet
-{
- public static ThreadLocal local = new ThreadLocal();
-
- public static Object holder;
-
- public static String NAME = "Portlet3";
-
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP3.NAME, Joinpoint.PORTLET_RENDER);
-
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP3.NAME, Joinpoint.PORTLET_ACTION);
-
- protected String createComponentId()
- {
- return UTP3.NAME;
- }
-
- /** Resets helper variables */
- public void reset()
- {
- local = new ThreadLocal();
- holder = null;
- }
-}
Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -1,55 +0,0 @@
-/******************************************************************************
- * 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.universal;
-
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class UTP4 extends AbstractUniversalTestPortlet
-{
- public static ThreadLocal local = new ThreadLocal();
-
- public static Object holder;
-
- public static String NAME = "Portlet4";
-
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP4.NAME, Joinpoint.PORTLET_RENDER);
-
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP4.NAME, Joinpoint.PORTLET_ACTION);
-
- protected String createComponentId()
- {
- return UTP4.NAME;
- }
-
- /** Resets helper variables */
- public void reset()
- {
- UTP4.local = new ThreadLocal();
- UTP4.holder = null;
- }
-}
Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -1,55 +0,0 @@
-/******************************************************************************
- * 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.universal;
-
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class UTP5 extends AbstractUniversalTestPortlet
-{
- public static ThreadLocal local = new ThreadLocal();
-
- public static Object holder;
-
- public static String NAME = "Portlet5";
-
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP5.NAME, Joinpoint.PORTLET_RENDER);
-
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP5.NAME, Joinpoint.PORTLET_ACTION);
-
- protected String createComponentId()
- {
- return UTP5.NAME;
- }
-
- /** Resets helper variables */
- public void reset()
- {
- UTP5.local = new ThreadLocal();
- UTP5.holder = null;
- }
-}
Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -1,55 +0,0 @@
-/******************************************************************************
- * 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.universal;
-
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class UTP6 extends AbstractUniversalTestPortlet
-{
- public static ThreadLocal local = new ThreadLocal();
-
- public static Object holder;
-
- public static String NAME = "Portlet6";
-
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP6.NAME, Joinpoint.PORTLET_RENDER);
-
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP6.NAME, Joinpoint.PORTLET_ACTION);
-
- protected String createComponentId()
- {
- return UTP6.NAME;
- }
-
- /** Resets helper variables */
- public void reset()
- {
- UTP6.local = new ThreadLocal();
- UTP6.holder = null;
- }
-}
Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -1,55 +0,0 @@
-/******************************************************************************
- * 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.universal;
-
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class UTP7 extends AbstractUniversalTestPortlet
-{
- public static ThreadLocal local = new ThreadLocal();
-
- public static Object holder;
-
- public static String NAME = "Portlet7";
-
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP7.NAME, Joinpoint.PORTLET_RENDER);
-
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP7.NAME, Joinpoint.PORTLET_ACTION);
-
- protected String createComponentId()
- {
- return UTP7.NAME;
- }
-
- /** Resets helper variables */
- public void reset()
- {
- UTP7.local = new ThreadLocal();
- UTP7.holder = null;
- }
-}
Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -1,55 +0,0 @@
-/******************************************************************************
- * 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.universal;
-
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class UTP8 extends AbstractUniversalTestPortlet
-{
- public static ThreadLocal local = new ThreadLocal();
-
- public static Object holder;
-
- public static String NAME = "Portlet8";
-
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP8.NAME, Joinpoint.PORTLET_RENDER);
-
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP8.NAME, Joinpoint.PORTLET_ACTION);
-
- protected String createComponentId()
- {
- return UTP8.NAME;
- }
-
- /** Resets helper variables */
- public void reset()
- {
- UTP8.local = new ThreadLocal();
- UTP8.holder = null;
- }
-}
Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -1,55 +0,0 @@
-/******************************************************************************
- * 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.universal;
-
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class UTP9 extends AbstractUniversalTestPortlet
-{
- public static ThreadLocal local = new ThreadLocal();
-
- public static Object holder;
-
- public static String NAME = "Portlet9";
-
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP9.NAME, Joinpoint.PORTLET_RENDER);
-
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP9.NAME, Joinpoint.PORTLET_ACTION);
-
- protected String createComponentId()
- {
- return UTP9.NAME;
- }
-
- /** Resets helper variables */
- public void reset()
- {
- UTP9.local = new ThreadLocal();
- UTP9.holder = null;
- }
-}
Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -1,52 +0,0 @@
-/******************************************************************************
- * 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.universal;
-
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class UTS1 extends AbstractUniversalTestServlet
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 7731715767678536862L;
-
- public static ThreadLocal local = new ThreadLocal();
-
- public static String NAME = "ServletA";
-
- public final static Joinpoint SERVICE_JOINPOINT = new Joinpoint(UTS1.NAME, Joinpoint.SERVLET_SERVICE);
-
- protected String createComponentId(Class clazz)
- {
- return UTS1.NAME;
- }
-
- public void reset()
- {
- local = new ThreadLocal();
- }
-}
Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -1,52 +0,0 @@
-/******************************************************************************
- * 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.universal;
-
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class UTS2 extends AbstractUniversalTestServlet
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = -6331478437141464198L;
-
- public static ThreadLocal local = new ThreadLocal();
-
- public static String NAME = "ServletB";
-
- public final static Joinpoint SERVICE_JOINPOINT = new Joinpoint(UTS2.NAME, Joinpoint.SERVLET_SERVICE);
-
- protected String createComponentId(Class clazz)
- {
- return UTS2.NAME;
- }
-
- public void reset()
- {
- local = new ThreadLocal();
- }
-}
Copied: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP1.java (from rev 5547, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java)
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java 2006-11-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP1.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -0,0 +1,74 @@
+/******************************************************************************
+ * 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.portlet.framework;
+
+import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ */
+public class UTP1 extends AbstractUniversalTestPortlet
+{
+ public static ThreadLocal local = new ThreadLocal();
+
+ public static ThreadLocal local1 = new ThreadLocal();
+
+ public static ThreadLocal local2 = new ThreadLocal();
+
+ public static ThreadLocal local3 = new ThreadLocal();
+
+ public static ThreadLocal local4 = new ThreadLocal();
+
+ public static ThreadLocal local5 = new ThreadLocal();
+
+ public static Object holder;
+
+ public static String NAME = "Portlet1";
+
+ public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+
+ public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+
+ protected String createComponentId()
+ {
+ return NAME;
+ }
+
+ /** Resets helper variables */
+ public void reset()
+ {
+ local = new ThreadLocal();
+ local1 = new ThreadLocal();
+ local2 = new ThreadLocal();
+ local3 = new ThreadLocal();
+ local4 = new ThreadLocal();
+ local5 = new ThreadLocal();
+
+ holder = null;
+ }
+
+
+}
Property changes on: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP1.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP10.java (from rev 5547, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java)
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java 2006-11-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP10.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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.portlet.framework;
+
+import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ */
+public class UTP10 extends AbstractUniversalTestPortlet
+{
+ public static ThreadLocal local = new ThreadLocal();
+
+ public static Object holder;
+
+ public static String NAME = "Portlet10";
+
+ public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP10.NAME, Joinpoint.PORTLET_RENDER);
+
+ public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP10.NAME, Joinpoint.PORTLET_ACTION);
+
+ protected String createComponentId()
+ {
+ return UTP10.NAME;
+ }
+
+ /** Resets helper variables */
+ public void reset()
+ {
+ UTP10.local = new ThreadLocal();
+ UTP10.holder = null;
+ }
+}
Property changes on: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP10.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP2.java (from rev 5547, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java)
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java 2006-11-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP2.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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.portlet.framework;
+
+import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ */
+public class UTP2 extends AbstractUniversalTestPortlet
+{
+ public static ThreadLocal local = new ThreadLocal();
+
+ public static Object holder;
+
+ public static String NAME = "Portlet2";
+
+ public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+
+ public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+
+ protected String createComponentId()
+ {
+ return NAME;
+ }
+
+ /** Resets helper variables */
+ public void reset()
+ {
+ local.set(null);
+ holder = null;
+ }
+}
Property changes on: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP2.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP3.java (from rev 5547, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java)
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java 2006-11-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP3.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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.portlet.framework;
+
+import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ */
+public class UTP3 extends AbstractUniversalTestPortlet
+{
+ public static ThreadLocal local = new ThreadLocal();
+
+ public static Object holder;
+
+ public static String NAME = "Portlet3";
+
+ public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP3.NAME, Joinpoint.PORTLET_RENDER);
+
+ public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP3.NAME, Joinpoint.PORTLET_ACTION);
+
+ protected String createComponentId()
+ {
+ return UTP3.NAME;
+ }
+
+ /** Resets helper variables */
+ public void reset()
+ {
+ local = new ThreadLocal();
+ holder = null;
+ }
+}
Property changes on: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP3.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP4.java (from rev 5547, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java)
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java 2006-11-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP4.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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.portlet.framework;
+
+import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ */
+public class UTP4 extends AbstractUniversalTestPortlet
+{
+ public static ThreadLocal local = new ThreadLocal();
+
+ public static Object holder;
+
+ public static String NAME = "Portlet4";
+
+ public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP4.NAME, Joinpoint.PORTLET_RENDER);
+
+ public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP4.NAME, Joinpoint.PORTLET_ACTION);
+
+ protected String createComponentId()
+ {
+ return UTP4.NAME;
+ }
+
+ /** Resets helper variables */
+ public void reset()
+ {
+ UTP4.local = new ThreadLocal();
+ UTP4.holder = null;
+ }
+}
Property changes on: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP4.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP5.java (from rev 5547, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java)
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java 2006-11-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP5.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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.portlet.framework;
+
+import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ */
+public class UTP5 extends AbstractUniversalTestPortlet
+{
+ public static ThreadLocal local = new ThreadLocal();
+
+ public static Object holder;
+
+ public static String NAME = "Portlet5";
+
+ public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP5.NAME, Joinpoint.PORTLET_RENDER);
+
+ public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP5.NAME, Joinpoint.PORTLET_ACTION);
+
+ protected String createComponentId()
+ {
+ return UTP5.NAME;
+ }
+
+ /** Resets helper variables */
+ public void reset()
+ {
+ UTP5.local = new ThreadLocal();
+ UTP5.holder = null;
+ }
+}
Property changes on: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP5.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP6.java (from rev 5547, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java)
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java 2006-11-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP6.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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.portlet.framework;
+
+import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ */
+public class UTP6 extends AbstractUniversalTestPortlet
+{
+ public static ThreadLocal local = new ThreadLocal();
+
+ public static Object holder;
+
+ public static String NAME = "Portlet6";
+
+ public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP6.NAME, Joinpoint.PORTLET_RENDER);
+
+ public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP6.NAME, Joinpoint.PORTLET_ACTION);
+
+ protected String createComponentId()
+ {
+ return UTP6.NAME;
+ }
+
+ /** Resets helper variables */
+ public void reset()
+ {
+ UTP6.local = new ThreadLocal();
+ UTP6.holder = null;
+ }
+}
Property changes on: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP6.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP7.java (from rev 5547, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java)
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java 2006-11-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP7.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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.portlet.framework;
+
+import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ */
+public class UTP7 extends AbstractUniversalTestPortlet
+{
+ public static ThreadLocal local = new ThreadLocal();
+
+ public static Object holder;
+
+ public static String NAME = "Portlet7";
+
+ public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP7.NAME, Joinpoint.PORTLET_RENDER);
+
+ public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP7.NAME, Joinpoint.PORTLET_ACTION);
+
+ protected String createComponentId()
+ {
+ return UTP7.NAME;
+ }
+
+ /** Resets helper variables */
+ public void reset()
+ {
+ UTP7.local = new ThreadLocal();
+ UTP7.holder = null;
+ }
+}
Property changes on: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP7.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP8.java (from rev 5547, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java)
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java 2006-11-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP8.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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.portlet.framework;
+
+import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ */
+public class UTP8 extends AbstractUniversalTestPortlet
+{
+ public static ThreadLocal local = new ThreadLocal();
+
+ public static Object holder;
+
+ public static String NAME = "Portlet8";
+
+ public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP8.NAME, Joinpoint.PORTLET_RENDER);
+
+ public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP8.NAME, Joinpoint.PORTLET_ACTION);
+
+ protected String createComponentId()
+ {
+ return UTP8.NAME;
+ }
+
+ /** Resets helper variables */
+ public void reset()
+ {
+ UTP8.local = new ThreadLocal();
+ UTP8.holder = null;
+ }
+}
Property changes on: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP8.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP9.java (from rev 5547, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java)
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java 2006-11-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP9.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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.portlet.framework;
+
+import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ */
+public class UTP9 extends AbstractUniversalTestPortlet
+{
+ public static ThreadLocal local = new ThreadLocal();
+
+ public static Object holder;
+
+ public static String NAME = "Portlet9";
+
+ public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP9.NAME, Joinpoint.PORTLET_RENDER);
+
+ public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP9.NAME, Joinpoint.PORTLET_ACTION);
+
+ protected String createComponentId()
+ {
+ return UTP9.NAME;
+ }
+
+ /** Resets helper variables */
+ public void reset()
+ {
+ UTP9.local = new ThreadLocal();
+ UTP9.holder = null;
+ }
+}
Property changes on: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP9.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS1.java (from rev 5547, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java)
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java 2006-11-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS1.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -0,0 +1,52 @@
+/******************************************************************************
+ * 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.portlet.framework;
+
+import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ */
+public class UTS1 extends AbstractUniversalTestServlet
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 7731715767678536862L;
+
+ public static ThreadLocal local = new ThreadLocal();
+
+ public static String NAME = "ServletA";
+
+ public final static Joinpoint SERVICE_JOINPOINT = new Joinpoint(UTS1.NAME, Joinpoint.SERVLET_SERVICE);
+
+ protected String createComponentId(Class clazz)
+ {
+ return UTS1.NAME;
+ }
+
+ public void reset()
+ {
+ local = new ThreadLocal();
+ }
+}
Property changes on: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS1.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS2.java (from rev 5547, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java)
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java 2006-11-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS2.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -0,0 +1,52 @@
+/******************************************************************************
+ * 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.portlet.framework;
+
+import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ */
+public class UTS2 extends AbstractUniversalTestServlet
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -6331478437141464198L;
+
+ public static ThreadLocal local = new ThreadLocal();
+
+ public static String NAME = "ServletB";
+
+ public final static Joinpoint SERVICE_JOINPOINT = new Joinpoint(UTS2.NAME, Joinpoint.SERVLET_SERVICE);
+
+ protected String createComponentId(Class clazz)
+ {
+ return UTS2.NAME;
+ }
+
+ public void reset()
+ {
+ local = new ThreadLocal();
+ }
+}
Property changes on: trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS2.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,7 +30,7 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.framework.server.NodeId;
import javax.portlet.Portlet;
@@ -54,20 +54,20 @@
registry.addSequence("ABC", seq);
seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletException, PortletSecurityException, IOException
{
assertNull(request.getPortletSession(false));
PortletSession session = request.getPortletSession();
assertNotNull(session);
session.setAttribute("immutable", "abcdef");
PortletURL portletURL = response.createRenderURL();
- String url = HttpTestContext.getCurrentContext().rewriteURLForNode(portletURL.toString(), NodeId.PORTS_02);
+ String url = context.rewriteURLForNode(portletURL.toString(), NodeId.PORTS_02);
return new InvokeGetResponse(url);
}
});
seq.addAction(1, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
{
assertNull(request.getPortletSession(false));
PortletSession session = request.getPortletSession();
@@ -92,13 +92,13 @@
session.setAttribute("mutable", value);
value.setString("fedcba");
PortletURL portletURL = response.createRenderURL();
- String url = HttpTestContext.getCurrentContext().rewriteURLForNode(portletURL.toString(), NodeId.PORTS_02);
+ String url = context.rewriteURLForNode(portletURL.toString(), NodeId.PORTS_02);
return new InvokeGetResponse(url);
}
});
seq.addAction(1, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
{
PortletSession session = request.getPortletSession();
Object o = session.getAttribute("mutable");
@@ -137,13 +137,13 @@
MutableValue value = (MutableValue)o;
value.setString("fedcba");
PortletURL portletURL = response.createRenderURL();
- String url = HttpTestContext.getCurrentContext().rewriteURLForNode(portletURL.toString(), NodeId.PORTS_02);
+ String url = context.rewriteURLForNode(portletURL.toString(), NodeId.PORTS_02);
return new InvokeGetResponse(url);
}
});
seq.addAction(2, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletSession session = request.getPortletSession();
assertNotNull(session);
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -31,6 +31,7 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
@@ -56,7 +57,7 @@
this.registry = registry;
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
PortletContainer container = registry.getPortletContainer("/test-info.CachePortlet");
PortletInfo info = container.getInfo();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -36,6 +36,7 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import java.util.HashSet;
import java.util.Iterator;
@@ -67,7 +68,7 @@
this.registry = registry;
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
PortletContainer container = registry.getPortletContainer("/test-info.CapabilitiesPortlet");
PortletInfo info = container.getInfo();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -32,6 +32,7 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import java.util.Locale;
@@ -60,7 +61,7 @@
this.registry = registry;
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
PortletContainer container = registry.getPortletContainer("/test-info.NoBundlePortlet");
PortletInfo info = container.getInfo();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -32,6 +32,7 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import java.util.HashSet;
import java.util.Iterator;
@@ -62,7 +63,7 @@
this.registry = registry;
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
PortletContainer container1 = registry.getPortletContainer("/test-info.ModePortlet1");
PortletContainer container2 = registry.getPortletContainer("/test-info.ModePortlet2");
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,6 +30,7 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -56,7 +57,7 @@
this.registry = registry;
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
//This asserts only .isRemotable() as rest is checked in other tests
PortletContainer container = (PortletContainer)registry.getPortletContainer("/test-info.RemotablePortlet1");
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -32,6 +32,7 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import java.util.Locale;
import java.util.Set;
@@ -61,7 +62,7 @@
this.registry = registry;
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
PortletContainer container = registry.getPortletContainer("/test-info.PreferenceInfoPortlet");
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -32,6 +32,7 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -58,7 +59,7 @@
this.registry = registry;
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
//This asserts only .isRemotable() as rest is checked in other tests
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -31,6 +31,7 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
@@ -57,7 +58,7 @@
this.registry = registry;
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
PortletContainer container = registry.getPortletContainer("/test-info.DistributedPortlet1");
PortletInfo info = container.getInfo();
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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,13 +24,14 @@
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.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP1;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -44,6 +45,7 @@
*/
public class ActionRequestSequenceBuilder extends SequenceRegistryBuilder
{
+
//********************************
//PortletRequest interface Asserts
//********************************
@@ -58,7 +60,7 @@
registry.addSequence("Constants", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertEquals("javax.portlet.userinfo", ActionRequest.USER_INFO);
@@ -78,7 +80,7 @@
registry.addSequence("Property", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -86,7 +88,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
try
{
@@ -110,7 +112,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
@@ -126,7 +128,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -134,7 +136,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
try
@@ -168,7 +170,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -183,7 +185,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -191,7 +193,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
try
{
@@ -215,7 +217,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,13 +24,14 @@
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.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP1;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -55,7 +56,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -63,7 +64,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
String val = null;
@@ -187,7 +188,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -206,7 +207,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -214,7 +215,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
try
{
@@ -238,7 +239,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -253,7 +254,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -261,7 +262,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
try
{
@@ -276,7 +277,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -28,7 +28,8 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+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;
@@ -52,7 +53,7 @@
registry.addSequence("SupportedPortletModes", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
Enumeration modesEnum = request.getPortalContext().getSupportedPortletModes();
@@ -81,7 +82,7 @@
registry.addSequence("SupportedWindowStates", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
Enumeration statesEnum = request.getPortalContext().getSupportedWindowStates();
@@ -111,7 +112,7 @@
registry.addSequence("PortalInfo", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
String info = request.getPortalContext().getPortalInfo();
@@ -130,7 +131,7 @@
registry.addSequence("Property", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,8 +29,9 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTP2;
+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;
@@ -56,7 +57,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
PortletConfig config = aport.getPortletConfig();
@@ -74,16 +75,16 @@
registry.addSequence("PortletContext", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
PortletConfig config = aport.getPortletConfig();
assertNotNull(config);
- PortletContext context = config.getPortletContext();
+ PortletContext portletContext = config.getPortletContext();
- assertNotNull(context);
+ assertNotNull(portletContext);
return new EndTestResponse();
}
@@ -97,7 +98,7 @@
registry.addSequence("InitParameter", seq);
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
PortletConfig config = aport.getPortletConfig();
@@ -136,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)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
PortletConfig config = aport.getPortletConfig();
@@ -155,7 +156,7 @@
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,7 +30,8 @@
import org.jboss.portal.test.framework.portlet.TestContants;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+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;
@@ -52,7 +53,7 @@
registry.addSequence("ServerInfo", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
assertEquals(TestContants.SERVER_INVO, aport.getPortletContext().getServerInfo());
@@ -68,7 +69,7 @@
registry.addSequence("Dispatcher", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
@@ -88,7 +89,7 @@
registry.addSequence("Version", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
@@ -106,7 +107,7 @@
registry.addSequence("MimeType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
assertEquals("text/plain", aport.getPortletContext().getMimeType("/simple_resource.txt"));
@@ -123,7 +124,7 @@
registry.addSequence("ResourcePaths", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
@@ -145,7 +146,7 @@
registry.addSequence("Resource", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
@@ -184,7 +185,7 @@
registry.addSequence("Attribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
@@ -232,7 +233,7 @@
registry.addSequence("InitParameter", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
@@ -261,7 +262,7 @@
registry.addSequence("PortletContextName", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -28,7 +28,8 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+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;
@@ -49,7 +50,7 @@
registry.addSequence("Modes", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertEquals("view", "" + PortletMode.VIEW);
assertEquals("edit", "" + PortletMode.EDIT);
@@ -67,7 +68,7 @@
registry.addSequence("Constructor", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertEquals("testmode", "" + new PortletMode("testmode"));
assertEquals("testmode", "" + new PortletMode("TESTMODE"));
@@ -87,7 +88,7 @@
registry.addSequence("Equals", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletMode pm1 = new PortletMode("TestMode");
PortletMode pm2 = new PortletMode("TestMode");
@@ -111,7 +112,7 @@
registry.addSequence("HashCode", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,14 +24,15 @@
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.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTP2;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP2;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -58,7 +59,7 @@
registry.addSequence("ReadOnly", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
try
@@ -86,7 +87,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -94,7 +95,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException
{
PortletPreferences prefs = request.getPreferences();
@@ -186,7 +187,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -200,7 +201,7 @@
registry.addSequence("ResetNullKeyThrowsNPE", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws ReadOnlyException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws ReadOnlyException
{
try
{
@@ -225,7 +226,7 @@
registry.addSequence("ZeroLengthArrayValue", seq);
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletPreferences prefs = request.getPreferences();
@@ -241,7 +242,7 @@
});
seq.addAction(1, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
PortletPreferences prefs = request.getPreferences();
@@ -264,7 +265,7 @@
});
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -28,7 +28,8 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+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 +50,7 @@
registry.addSequence("Constants", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertEquals(0x01, PortletSession.APPLICATION_SCOPE);
assertEquals(0x02, PortletSession.PORTLET_SCOPE);
@@ -65,7 +66,7 @@
registry.addSequence("GetAttribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletSession session = request.getPortletSession();
@@ -122,7 +123,7 @@
registry.addSequence("AttributeNames", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletSession session = request.getPortletSession();
@@ -164,7 +165,7 @@
registry.addSequence("CreationTime", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletSession session = request.getPortletSession();
@@ -194,7 +195,7 @@
registry.addSequence("Invalidate", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletSession session = request.getPortletSession();
@@ -222,7 +223,7 @@
registry.addSequence("New", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletSession session = request.getPortletSession();
@@ -252,7 +253,7 @@
registry.addSequence("RemoveAttribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletSession session = request.getPortletSession();
@@ -312,7 +313,7 @@
registry.addSequence("SetAttribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -28,7 +28,8 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+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;
@@ -48,7 +49,7 @@
registry.addSequence("DecodeAttributeName", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertEquals("name", PortletSessionUtil.decodeAttributeName("name"));
@@ -74,7 +75,7 @@
registry.addSequence("DecodeScope", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -28,7 +28,8 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+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;
@@ -51,7 +52,7 @@
registry.addSequence("Parameter", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -28,7 +28,8 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+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;
@@ -54,7 +55,7 @@
registry.addSequence("Constants", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertEquals("javax.portlet.userinfo", RenderRequest.USER_INFO);
@@ -74,7 +75,7 @@
registry.addSequence("Property", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
try
@@ -107,7 +108,7 @@
registry.addSequence("Attribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
try
{
@@ -148,7 +149,7 @@
registry.addSequence("Parameter", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -28,7 +28,8 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+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;
@@ -48,7 +49,7 @@
registry.addSequence("Constants", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertEquals("portlet.expiration-cache", RenderResponse.EXPIRATION_CACHE);
return new EndTestResponse();
@@ -63,7 +64,7 @@
registry.addSequence("ContentType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
try
{
@@ -91,7 +92,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
try
{
@@ -123,7 +124,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -28,7 +28,8 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+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 +50,7 @@
registry.addSequence("States", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertEquals("minimized", "" + WindowState.MINIMIZED);
assertEquals("maximized", "" + WindowState.MAXIMIZED);
@@ -67,7 +68,7 @@
registry.addSequence("Constructor", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertEquals("teststate", "" + new WindowState("teststate"));
assertEquals("teststate", "" + new WindowState("TESTSTATE"));
@@ -87,7 +88,7 @@
registry.addSequence("Equals", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
WindowState ws1 = new WindowState("TestState");
WindowState ws2 = new WindowState("teststate");
@@ -111,7 +112,7 @@
registry.addSequence("HashCode", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -25,6 +25,7 @@
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;
@@ -32,8 +33,8 @@
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.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTS1;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTS1;
import javax.portlet.Portlet;
import javax.portlet.PortletException;
@@ -64,7 +65,7 @@
registry.addSequence("GetRequestURI", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA");
response.setContentType("text/html");
@@ -76,7 +77,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
assertEquals(org.jboss.portal.test.portlet.jsr168.ext.dispatcher.DispatcherSequenceBuilder.SERVLET_A_URI, request.getRequestURI());
return new EndTestResponse();
@@ -91,7 +92,7 @@
registry.addSequence("RequestHeaderAccess", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
// Test the value is not there yet
Set propertyNames = Tools.toSet(request.getPropertyNames());
@@ -108,7 +109,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA");
response.setContentType("text/html");
@@ -119,7 +120,7 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response)
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,6 +29,7 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
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;
@@ -54,7 +55,7 @@
seq.addAction(0, GetResourceBundleDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
ResourceBundle bundle = GetResourceBundleDuringInitPortlet.bundle;
assertNotNull(bundle);
@@ -73,7 +74,7 @@
seq.addAction(0, ResourceBundleCascadePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletConfig cfg = ((AbstractUniversalTestPortlet)portlet).getPortletConfig();
@@ -148,7 +149,7 @@
seq.addAction(0, ResourceBundlePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,13 +24,14 @@
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.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended.TestActionWithPortletModePortlet;
import javax.portlet.ActionRequest;
@@ -54,7 +55,7 @@
registry.addSequence("TestActionWithPortletMode", seq);
seq.addAction(0, TestActionWithPortletModePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws PortletModeException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletModeException
{
PortletURL url = response.createActionURL();
url.setPortletMode(PortletMode.EDIT);
@@ -65,7 +66,7 @@
seq.addAction(1, TestActionWithPortletModePortlet.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
assertEquals(PortletMode.EDIT, request.getPortletMode());
}
@@ -73,7 +74,7 @@
seq.addAction(1, TestActionWithPortletModePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -86,7 +87,7 @@
registry.addSequence("TestDuringAction", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
InvokeGetResponse result = new InvokeGetResponse(url.toString());
@@ -96,7 +97,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws PortletModeException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws PortletModeException
{
// Test we can set null portlet mode
response.setPortletMode(null);
@@ -105,7 +106,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -119,7 +120,7 @@
registry.addSequence("TestDuringRender", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws PortletModeException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -27,12 +27,13 @@
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.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP1;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -71,7 +72,7 @@
registry.addSequence("ActionRequestUseForm", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
InvokePostResponse iur = new InvokePostResponse();
PortletURL url = response.createActionURL();
@@ -91,7 +92,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext 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"));
@@ -124,7 +125,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -142,7 +143,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
InvokePostResponse iur = new InvokePostResponse();
PortletURL url = response.createActionURL();
@@ -160,7 +161,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
{
assertEquals(new String[]{"g_bar1_1"}, request.getParameterValues("g_foo1"));
@@ -203,7 +204,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -220,7 +221,7 @@
registry.addSequence("ActionRequestUseReader", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
InvokePostResponse iur = new InvokePostResponse();
PortletURL url = response.createActionURL();
@@ -237,7 +238,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext 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"));
@@ -279,7 +280,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -296,7 +297,7 @@
registry.addSequence("RequestAttribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
// Take a snapshot of the attribute names
Set snapshot = Tools.toSet(request.getAttributeNames());
@@ -331,7 +332,7 @@
registry.addSequence("RequestAttributeScoping", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertNull(request.getAttribute("foo"));
request.setAttribute("foo", "foo");
@@ -346,7 +347,7 @@
registry.addSequence("RequestParameter", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
url.setParameter("foo1", "bar1");
@@ -358,7 +359,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// The expected map
Map expectedParameterMap = new HashMap();
@@ -386,7 +387,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -401,7 +402,7 @@
registry.addSequence("RequestHeaderAccess", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
// Test the value is not there yet
Set propertyNames = Tools.toSet(request.getPropertyNames());
@@ -418,7 +419,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
// Test the header is here
Set propertyNames = Tools.toSet(request.getPropertyNames());
@@ -438,7 +439,7 @@
seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Test the header is here
Set propertyNames = Tools.toSet(request.getPropertyNames());
@@ -453,7 +454,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -28,7 +28,8 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+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;
@@ -46,7 +47,7 @@
registry.addSequence("ContentType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -25,14 +25,15 @@
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.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP2;
-import org.jboss.portal.test.framework.portlet.universal.UTP3;
-import org.jboss.portal.test.framework.portlet.universal.UTP4;
+import org.jboss.portal.test.portlet.framework.UTP2;
+import org.jboss.portal.test.portlet.framework.UTP4;
+import org.jboss.portal.test.portlet.framework.UTP3;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -65,7 +66,7 @@
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -79,7 +80,7 @@
seq.addAction(1, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -92,7 +93,7 @@
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -105,7 +106,7 @@
registry.addSequence("StoreMustPersistAllChanges", seq);
seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -114,7 +115,7 @@
seq.addAction(1, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -138,7 +139,7 @@
seq.addAction(1, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -146,7 +147,7 @@
seq.addAction(2, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -161,7 +162,7 @@
seq.addAction(2, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -175,7 +176,7 @@
seq.addAction(0, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -183,7 +184,7 @@
seq.addAction(1, UTP3.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException
{
// Get prefs map
PortletPreferences prefs = request.getPreferences();
@@ -229,7 +230,7 @@
seq.addAction(1, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,6 +24,7 @@
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;
@@ -31,8 +32,8 @@
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;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTS1;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTS1;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -67,7 +68,7 @@
registry.addSequence("SessionDoesNotExistBeforeItIsRequested", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletSession session = request.getPortletSession(false);
assertNull(session);
@@ -87,7 +88,7 @@
registry.addSequence("ObtainNonNullSessionUsingCreateEqualsFalse", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletSession session = request.getPortletSession();
assertNotNull(session);
@@ -98,7 +99,7 @@
});
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws PortletException, PortletSecurityException, IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws PortletException, PortletSecurityException, IOException
{
PortletSession session = request.getPortletSession(false);
assertNotNull(session);
@@ -108,7 +109,7 @@
});
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletSession session = request.getPortletSession(false);
assertNotNull(session);
@@ -132,7 +133,7 @@
registry.addSequence("CrossContextSessionAttribute", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletSession session = request.getPortletSession();
session.setAttribute("key", "value", PortletSession.APPLICATION_SCOPE);
@@ -149,7 +150,7 @@
*/
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,6 +29,7 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
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;
@@ -46,7 +47,7 @@
registry.addSequence("TestLog4j", seq);
seq.addAction(0, LoggingPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,6 +24,7 @@
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;
@@ -32,8 +33,8 @@
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.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTS1;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTS1;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -76,7 +77,7 @@
registry.addSequence("ObtainingDispatcher", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
UTP1 p = (UTP1)portlet;
//correct
@@ -130,7 +131,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -138,7 +139,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
//set some render params to test them in dispatcher include (precedense)
response.setRenderParameter("key1", "differentValue");
@@ -148,7 +149,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
String path = "/universalServletA";
path += "?key1=k1value1&key2=k2value1";
@@ -166,7 +167,7 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
assertEquals("k1value1", request.getParameter("key1"));
assertEquals("k2value1", request.getParameter("key2"));
@@ -190,7 +191,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
assertNotNull(dispatcher);
@@ -210,7 +211,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
StringBuffer buffer = request.getRequestURL();
UTP1.local.set(buffer == null ? Boolean.TRUE : Boolean.FALSE);
@@ -231,7 +232,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
assertNotNull(dispatcher);
@@ -247,7 +248,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
if (request.getMethod().equals("GET"))
{
@@ -271,7 +272,7 @@
registry.addSequence("IncludedRequestParameters", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA");
assertNotNull(dispatcher);
@@ -350,7 +351,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
UTP1.local1.set(request.getAttribute("javax.servlet.include.request_uri"));
UTP1.local2.set(request.getAttribute("javax.servlet.include.context_path"));
@@ -373,7 +374,7 @@
registry.addSequence("IncludedRequestAttributes", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA");
assertNotNull(dispatcher);
@@ -415,7 +416,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
UTP1.local1.set(request.getAttribute("javax.portlet.config"));
UTP1.local2.set(request.getAttribute("javax.portlet.request"));
@@ -450,7 +451,7 @@
registry.addSequence("RequestObject", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
//we dispatch to servlet and assertions will be done there
String queryString = "?key1=k1value1&key2=k2value1";
@@ -464,7 +465,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext 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");
@@ -581,7 +582,7 @@
registry.addSequence("ResponseObject", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
//we dispatch to servlet and assertions will be done there
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA");
@@ -594,7 +595,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext 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");
@@ -629,7 +630,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
@@ -650,12 +651,12 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
return null;
}
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
//SPEC:142 - RuntimeException
throw new RuntimeException();
@@ -664,7 +665,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
assertNotNull(dispatcher);
@@ -684,12 +685,12 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
return null;
}
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
//SPEC:142 - checked exception of type IOException
throw new IOException();
@@ -698,7 +699,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
{
PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
@@ -722,12 +723,12 @@
seq.addAction(2, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
return null;
}
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
//SPEC:143 - ServletException
throw new ServletException();
@@ -736,7 +737,7 @@
seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
{
/*PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
assertNotNull(dispatcher);
@@ -756,12 +757,12 @@
seq.addAction(3, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
return null;
}
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,6 +29,7 @@
import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
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;
@@ -53,7 +54,7 @@
seq.addAction(0, InlineValuesNotInResourceBundlePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletConfig cfg = ((AbstractUniversalTestPortlet)portlet).getPortletConfig();
@@ -79,7 +80,7 @@
seq.addAction(0, InlineValuesWithNoResourceBundleDefinedPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -31,8 +31,9 @@
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.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTS1;
+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;
@@ -70,7 +71,7 @@
registry.addSequence("InitializationParameters", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
Enumeration enumeration = aport.getPortletContext().getInitParameterNames();
@@ -91,12 +92,12 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
return null;
}
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
AbstractUniversalTestServlet serv = ((AbstractUniversalTestServlet)servlet);
Enumeration portletEnumeration = (Enumeration)serv.getServletContext().getAttribute("initParams");
@@ -119,7 +120,7 @@
registry.addSequence("ContextAttributes", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
aport.getPortletContext().setAttribute("sharedObject", "sharedObjectValue");
@@ -143,7 +144,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
AbstractUniversalTestServlet serv = ((AbstractUniversalTestServlet)servlet);
UTP1.local.set(serv.getServletContext().getAttribute("sharedObject").equals("sharedObjectValue") ? Boolean.TRUE : Boolean.FALSE);
@@ -151,7 +152,7 @@
return null;
}
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
return null;
}
@@ -168,7 +169,7 @@
registry.addSequence("AccessSameSetOfResources", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
//we get resource and pass it to servlet
@@ -199,7 +200,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
AbstractUniversalTestServlet serv = ((AbstractUniversalTestServlet)servlet);
URL portletUrl = (URL)serv.getServletContext().getAttribute("resource");
@@ -222,7 +223,7 @@
return null;
}
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
return null;
}
@@ -240,7 +241,7 @@
registry.addSequence("TempDir", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
File tempDir = (File)aport.getPortletContext().getAttribute("javax.servlet.context.tempdir");
@@ -262,7 +263,7 @@
seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
AbstractUniversalTestServlet serv = ((AbstractUniversalTestServlet)servlet);
String path = (String)serv.getServletContext().getAttribute("tempDirPath");
@@ -274,7 +275,7 @@
return null;
}
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -25,6 +25,7 @@
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;
@@ -32,9 +33,9 @@
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;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTP2;
-import org.jboss.portal.test.framework.portlet.universal.UTS1;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP2;
+import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.InitializeBeforeHandlePortlet;
import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.PortletExceptionDuringInitPortlet;
import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.RuntimeExceptionDuringInitPortlet;
@@ -70,7 +71,7 @@
registry.addSequence("InitializeBeforeHandle", seq);
seq.addAction(0, InitializeBeforeHandlePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertTrue(InitializeBeforeHandlePortlet.init);
return new EndTestResponse();
@@ -94,7 +95,7 @@
//PortletExceptionDuringInitPortlet
seq.addAction(0, PortletExceptionDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletExceptionDuringInitPortlet.rendered = true;
return null;
@@ -104,7 +105,7 @@
//RuntimeExceptionDuringInitPortlet
seq.addAction(0, RuntimeExceptionDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
RuntimeExceptionDuringInitPortlet.rendered = true;
return null;
@@ -114,7 +115,7 @@
//UnavailableExceptionDuringInitPortlet
seq.addAction(0, UnavailableExceptionDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
UnavailableExceptionDuringInitPortlet.rendered = true;
return null;
@@ -124,7 +125,7 @@
//ControllerPortlet
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createRenderURL().toString());
}
@@ -132,7 +133,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createRenderURL().toString());
}
@@ -140,7 +141,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//portlets shouldn't render itself
assertEquals(false, PortletExceptionDuringInitPortlet.rendered);
@@ -169,7 +170,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -177,7 +178,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
UTP1.local.set(Boolean.TRUE);
}
@@ -185,7 +186,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertEquals(Boolean.TRUE, (Boolean)UTP1.local.get());
return new EndTestResponse();
@@ -206,7 +207,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createRenderURL().toString());
}
@@ -214,7 +215,7 @@
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//pass action url
UTP2.holder = response.createActionURL().toString();
@@ -224,7 +225,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//get portlet b action url and invoke
assertNotNull(UTP2.holder);
@@ -234,7 +235,7 @@
seq.addAction(2, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
//mark action phase invokation
UTP2.local.set(Boolean.TRUE);
@@ -243,7 +244,7 @@
seq.addAction(2, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//assert that render is after Portlet B action
assertEquals(Boolean.TRUE, (Boolean)UTP2.local.get());
@@ -253,7 +254,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//assert that render is after Portlet B action
assertEquals(Boolean.TRUE, (Boolean)UTP2.local.get());
@@ -264,7 +265,7 @@
seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -283,7 +284,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createRenderURL().toString());
}
@@ -291,7 +292,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createRenderURL().toString());
}
@@ -299,7 +300,7 @@
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//mark that Portlet B was invoked after portlet A render url
UTP2.holder = Boolean.TRUE;
@@ -309,7 +310,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//assert Portlet B was invoked
assertEquals(Boolean.TRUE, (Object)UTP2.holder);
@@ -329,7 +330,7 @@
registry.addSequence("SendRedirectDuringAction", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -337,7 +338,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws PortletException, PortletSecurityException, IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws PortletException, PortletSecurityException, IOException
{
String path = request.getContextPath() + "/universalServletA";
response.sendRedirect(path);
@@ -346,7 +347,7 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
return new EndTestResponse();
}
@@ -354,7 +355,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -59,30 +59,30 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, PortletSecurityException, IOException
{
- if (HttpTestContext.getCurrentRequestCount() == 0)
+ if (context.getRequestCount() == 0)
{
//Just repaint
PortletURL url = resp.createRenderURL();
return new InvokeGetResponse(url.toString());
}
- else if (HttpTestContext.getCurrentRequestCount() == 1)
+ else if (context.getRequestCount() == 1)
{
//Invoke PortletExceptionDuringRequestHandlingPortlet action
return new InvokeGetResponse(PortletExceptionDuringRequestHandlingPortlet.actionURL);
}
- else if (HttpTestContext.getCurrentRequestCount() == 2)
+ else if (context.getRequestCount() == 2)
{
//Invoke RuntimeExceptionDuringRequestHandlingPortlet action
return new InvokeGetResponse(RuntimeExceptionDuringRequestHandlingPortlet.actionURL);
}
- else if (HttpTestContext.getCurrentRequestCount() == 3)
+ else if (context.getRequestCount() == 3)
{
//Invoke UnavailableExceptionDuringProcessActionPortlet action
return new InvokeGetResponse(UnavailableExceptionDuringProcessActionPortlet.actionURL);
}
- else if (HttpTestContext.getCurrentRequestCount() == 4)
+ else if (context.getRequestCount() == 4)
{
//Just repaint
PortletURL url = resp.createRenderURL();
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -23,7 +23,6 @@
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
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.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
@@ -67,14 +66,14 @@
rendered = "doHelp";
}
- protected void preRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ protected void preRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
{
rendered = null;
}
- protected DriverResponse postRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ protected DriverResponse postRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (context.isRequestCount(0))
{
// Invoking VIEW mode
PortletURL url = resp.createRenderURL();
@@ -82,7 +81,7 @@
url.setWindowState(WindowState.MINIMIZED);
return new InvokeGetResponse(url.toString());
}
- else if (HttpTestContext.isCurrentRequestCount(1))
+ else if (context.isRequestCount(1))
{
ExtendedAssert.assertNull(rendered);
@@ -92,7 +91,7 @@
url.setWindowState(WindowState.MINIMIZED);
return new InvokeGetResponse(url.toString());
}
- else if (HttpTestContext.isCurrentRequestCount(2))
+ else if (context.isRequestCount(2))
{
ExtendedAssert.assertNull(rendered);
@@ -102,7 +101,7 @@
url.setWindowState(WindowState.MINIMIZED);
return new InvokeGetResponse(url.toString());
}
- else if (HttpTestContext.isCurrentRequestCount(3))
+ else if (context.isRequestCount(3))
{
ExtendedAssert.assertNull(rendered);
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -57,23 +57,23 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(2))
+ if (context.isRequestCount(2))
{
throw new PortletException();
}
return null;
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (context.isRequestCount(0))
{
PortletURL url = resp.createActionURL();
actionURL = url.toString();
}
- else if (HttpTestContext.isCurrentRequestCount(2))
+ else if (context.isRequestCount(2))
{
PortletExceptionDuringRequestHandlingPortlet.rendered = true;
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -59,23 +59,23 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(3))
+ if (context.isRequestCount(3))
{
//throw new RuntimeException();
}
return null;
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (context.isRequestCount(0))
{
PortletURL url = resp.createActionURL();
actionURL = url.toString();
}
- if (HttpTestContext.isCurrentRequestCount(3))
+ if (context.isRequestCount(3))
{
RuntimeExceptionDuringRequestHandlingPortlet.rendered = true;
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -57,23 +57,23 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(4))
+ if (context.isRequestCount(4))
{
//throw new UnavailableException("UnavailableException thrown during action phase for testing purposes");
}
return null;
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (context.isRequestCount(0))
{
PortletURL url = resp.createActionURL();
actionURL = url.toString();
}
- if (HttpTestContext.isCurrentRequestCount(4))
+ if (context.isRequestCount(4))
{
UnavailableExceptionDuringProcessActionPortlet.rendered = true;
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -52,9 +52,9 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (context.isRequestCount(0))
{
throw new UnavailableException("UnavailableException thrown during render phase for testing purposes");
}
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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,12 +24,13 @@
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.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec.NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet;
import javax.portlet.Portlet;
@@ -55,7 +56,7 @@
seq.addAction(0, NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws PortletModeException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletModeException
{
NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.url = response.createRenderURL();
NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.url.setPortletMode(PortletMode.EDIT);
@@ -65,7 +66,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//just repost so other portlet can create url in first render
PortletURL url = response.createRenderURL();
@@ -76,7 +77,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//invoke render url from different portlet to be able to call specific mode for it
//it has Mode set to EDIT
@@ -86,7 +87,7 @@
seq.addAction(2, NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws PortletModeException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws PortletModeException
{
if (request.getPortletMode().equals(PortletMode.EDIT))
{
@@ -99,7 +100,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createRenderURL().toString());
}
@@ -107,7 +108,7 @@
seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//check that other portlet wasn't invoked
assertNull(UTP1.holder);
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -49,9 +49,11 @@
/** . */
private String methodCall;
+ private HttpTestContext context;
+
protected void doView(final RenderRequest request, RenderResponse response) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(1))
+ if (context.isRequestCount(1))
{
methodCall = "doView";
}
@@ -59,7 +61,7 @@
protected void doEdit(final RenderRequest request, RenderResponse response) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(2))
+ if (context.isRequestCount(2))
{
methodCall = "doEdit";
}
@@ -67,54 +69,63 @@
protected void doHelp(final RenderRequest request, RenderResponse response) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(3))
+ if (context.isRequestCount(3))
{
methodCall = "doHelp";
}
}
- protected void preRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ protected void preRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
{
- methodCall = null;
+ this.context = context;
+ this.methodCall = null;
}
- protected DriverResponse postRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ protected DriverResponse postRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ try
{
- // Invoking VIEW mode
- PortletURL url = resp.createRenderURL();
- url.setPortletMode(PortletMode.VIEW);
- return new InvokeGetResponse(url.toString());
- }
- else if (HttpTestContext.isCurrentRequestCount(1))
- {
- ExtendedAssert.assertEquals("doView", methodCall);
+ if (context.isRequestCount(0))
+ {
+ // Invoking VIEW mode
+ PortletURL url = resp.createRenderURL();
+ url.setPortletMode(PortletMode.VIEW);
+ return new InvokeGetResponse(url.toString());
+ }
+ else if (context.isRequestCount(1))
+ {
+ ExtendedAssert.assertEquals("doView", methodCall);
- // Invoking EDIT mode
- PortletURL url = resp.createRenderURL();
- url.setPortletMode(PortletMode.EDIT);
- return new InvokeGetResponse(url.toString());
- }
- else if (HttpTestContext.isCurrentRequestCount(2))
- {
- ExtendedAssert.assertEquals("doEdit", methodCall);
+ // Invoking EDIT mode
+ PortletURL url = resp.createRenderURL();
+ url.setPortletMode(PortletMode.EDIT);
+ return new InvokeGetResponse(url.toString());
+ }
+ else if (context.isRequestCount(2))
+ {
+ ExtendedAssert.assertEquals("doEdit", methodCall);
- // Invoking HELP mode
- PortletURL url = resp.createRenderURL();
- url.setPortletMode(PortletMode.HELP);
- return new InvokeGetResponse(url.toString());
- }
- else if (HttpTestContext.isCurrentRequestCount(3))
- {
- ExtendedAssert.assertEquals("doHelp", methodCall);
+ // Invoking HELP mode
+ PortletURL url = resp.createRenderURL();
+ url.setPortletMode(PortletMode.HELP);
+ return new InvokeGetResponse(url.toString());
+ }
+ else if (context.isRequestCount(3))
+ {
+ ExtendedAssert.assertEquals("doHelp", methodCall);
- //
- return new EndTestResponse();
+ //
+ return new EndTestResponse();
+ }
+ else
+ {
+ return new EndTestResponse();
+ }
}
- else
+ finally
{
- return new EndTestResponse();
+ this.context = null;
+ this.methodCall = null;
}
}
}
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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,14 +24,15 @@
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.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTP2;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP2;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -61,7 +62,7 @@
registry.addSequence("ActionToRequestParametersNotPropagated", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
url.setParameter("key1", "k1value1");
@@ -72,7 +73,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
//assert that we received parameters from render
assertEquals("k1value1", request.getParameter("key1"));
@@ -82,7 +83,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//assert that parameters weren't propagated from Action phase
assertNull(request.getParameter("key1"));
@@ -103,7 +104,7 @@
registry.addSequence("ActionToRenderParameters", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -112,7 +113,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
//set parameters for render phase
response.setRenderParameter("key1", "k1value1");
@@ -122,7 +123,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//assert that we received parameters from action phase
assertEquals("k1value1", request.getParameter("key1"));
@@ -144,7 +145,7 @@
registry.addSequence("ParametersDuringRenderNotTargeted", seq);
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
UTP2.holder = response.createRenderURL();
return null;
@@ -153,7 +154,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//just repost so other portlet can create url in first render
PortletURL url = response.createRenderURL();
@@ -167,7 +168,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//invoke render url from different portlet to be able to pass some params to it
PortletURL url = (PortletURL)UTP2.holder;
@@ -179,7 +180,7 @@
seq.addAction(2, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertEquals("p2k1value1", request.getParameter("portlet2key1"));
assertEquals(new String[]{"p2k2value1", "p2k2value2", "p2k2value3"}, request.getParameterValues("portlet2key2"));
@@ -189,7 +190,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//we test if we have params set during requestCount==0, becouse our portlet
//wasn't targeted in current render request
@@ -210,7 +211,7 @@
seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//second portlet asserted if it received correct parameters during render request
//we simply end test
@@ -232,7 +233,7 @@
registry.addSequence("ParameterAccessMethodst", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
//set some parameters for testing
@@ -244,7 +245,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
assertEquals("k1value1", request.getParameter("key1"));
//assert it returns one element array
@@ -258,7 +259,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -279,7 +280,7 @@
registry.addSequence("ContextPath", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -288,7 +289,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
String path = request.getContextPath();
//empty string is allowed by spec if portlet is based in server root
@@ -304,7 +305,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//and we test the same for RenderRequest
@@ -331,7 +332,7 @@
registry.addSequence("AuthType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -340,7 +341,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
//in current testsuite there is no user authentication
assertNull(request.getAuthType());
@@ -349,7 +350,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//in current testsuite there is no user authentication
assertNull(request.getAuthType());
@@ -371,7 +372,7 @@
registry.addSequence("ContentType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -380,7 +381,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
Enumeration types = request.getResponseContentTypes();
@@ -391,7 +392,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -411,7 +412,7 @@
registry.addSequence("ObtainingInputStreamAndReader", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -420,7 +421,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
{
request.getPortletInputStream();
try
@@ -438,7 +439,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -447,7 +448,7 @@
seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
{
request.getReader();
try
@@ -465,7 +466,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -25,6 +25,7 @@
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;
@@ -32,9 +33,9 @@
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;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTS1;
-import org.jboss.portal.test.framework.portlet.universal.UTS2;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTS1;
+import org.jboss.portal.test.portlet.framework.UTS2;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -74,7 +75,7 @@
registry.addSequence("SendRedirectWithRelativeURL", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -83,7 +84,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
{
try
{
@@ -99,7 +100,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -117,7 +118,7 @@
registry.addSequence("SendRedirectAfterChangeStateMethods", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -126,7 +127,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws PortletModeException, IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws PortletModeException, IOException
{
response.setPortletMode(PortletMode.VIEW);
try
@@ -143,7 +144,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -152,7 +153,7 @@
seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws IOException, WindowStateException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException, WindowStateException
{
response.setWindowState(WindowState.NORMAL);
try
@@ -169,7 +170,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -178,7 +179,7 @@
seq.addAction(3, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
{
response.setRenderParameter("key", "value");
try
@@ -195,7 +196,7 @@
seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -204,7 +205,7 @@
seq.addAction(4, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
{
Map map = new HashMap();
map.put("key", new String[]{"value"});
@@ -223,7 +224,7 @@
seq.addAction(4, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -241,7 +242,7 @@
registry.addSequence("NotAllowedMode", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -250,7 +251,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
try
{
@@ -266,7 +267,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -284,7 +285,7 @@
registry.addSequence("NotSupportedWindowState", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -293,7 +294,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
try
{
@@ -309,7 +310,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -328,7 +329,7 @@
registry.addSequence("StateChangesAfterRedirectionSend", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -337,7 +338,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws IOException, PortletModeException, WindowStateException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException, PortletModeException, WindowStateException
{
response.sendRedirect(request.getContextPath() + "/universalServletA");
@@ -365,7 +366,7 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
return new EndTestResponse();
}
@@ -373,7 +374,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new FailureResponse("Render wasn't expected to be called");
}
@@ -393,7 +394,7 @@
registry.addSequence("RenderParameters", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -402,7 +403,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
response.setRenderParameter("key1", "some strange value to overwrite");
response.setRenderParameter("key2", "some strange value to overwrite 2");
@@ -413,7 +414,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//we should receive overwrite values
assertEquals("k1value1", request.getParameter("key1"));
@@ -424,7 +425,7 @@
seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Don't set any parameter
}
@@ -432,7 +433,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
// We shouldn't receive anything as no parameters were set during action phase
assertEquals(Collections.EMPTY_MAP, request.getParameterMap());
@@ -453,7 +454,7 @@
registry.addSequence("ParametersSetAfterSendRedirect", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -462,7 +463,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
{
response.sendRedirect(request.getContextPath() + "/universalServletA");
@@ -492,7 +493,7 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
return new EndTestResponse();
}
@@ -500,7 +501,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new FailureResponse("Render wasn't expected");
}
@@ -519,7 +520,7 @@
registry.addSequence("SetNotSupportedContentType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
try
{
@@ -545,7 +546,7 @@
registry.addSequence("SetContentTypeBeforeOutputStreamOrWriter", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
{
try
{
@@ -562,7 +563,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
{
try
{
@@ -588,7 +589,7 @@
registry.addSequence("GetContentType", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
try
{
@@ -620,7 +621,7 @@
registry.addSequence("OutputStreamOrWriter", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
{
response.setContentType("text/html");
response.getWriter();
@@ -639,7 +640,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException
{
//we need this to be able to marshal the result
response.setContentType("text/html");
@@ -681,7 +682,7 @@
registry.addSequence("NamespaceEncoding", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
String namespace = response.getNamespace();
@@ -732,7 +733,7 @@
registry.addSequence("IllegalStateExceptionAfterSendRedirect", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
return new InvokeGetResponse(url.toString());
@@ -741,7 +742,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws IOException
{
response.sendRedirect(request.getContextPath() + "/universalServletB");
//this should be propagated to the portlet to not invoke redirection
@@ -751,7 +752,7 @@
seq.addAction(1, UTS2.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
return new FailureResponse("Redirection shouldn't be made");
}
@@ -759,7 +760,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//if redirect wasn't called we should be here. Alternatively we should use other portlet
//with same test id to render the response.
@@ -781,7 +782,7 @@
registry.addSequence("BufferSize", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
// No buffering is defined
assertEquals(0, response.getBufferSize());
@@ -808,7 +809,7 @@
registry.addSequence("BufferReset", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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.
@@ -818,7 +819,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,6 +24,7 @@
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;
@@ -32,9 +33,9 @@
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.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTP2;
-import org.jboss.portal.test.framework.portlet.universal.UTS1;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP2;
+import org.jboss.portal.test.portlet.framework.UTS1;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -74,7 +75,7 @@
registry.addSequence("SessionCreate", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//we ensure that session is ceated
UTP1.holder = request.getPortletSession();
@@ -86,7 +87,7 @@
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
UTP2.holder = request.getPortletSession();
return null;
@@ -95,7 +96,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//assert that during same request it was the same object
assertTrue(((PortletSession)UTP1.holder).getId().equals(((PortletSession)UTP2.holder).getId()));
@@ -126,7 +127,7 @@
registry.addSequence("SessionAttributes", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
request.getPortletSession(true).setAttribute("key1", "k1value1", PortletSession.APPLICATION_SCOPE);
request.getPortletSession().setAttribute("key2", "k2value1", PortletSession.PORTLET_SCOPE);
@@ -137,7 +138,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
assertEquals("k1value1", request.getPortletSession().getAttribute("key1", PortletSession.APPLICATION_SCOPE));
assertEquals("k2value1", request.getPortletSession().getAttribute("key2"));
@@ -146,7 +147,7 @@
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//assert that we have access to APLICATION_SCOPE and not to PORTLET_SCOPE attributes
assertEquals("k1value1", request.getPortletSession().getAttribute("key1", PortletSession.APPLICATION_SCOPE));
@@ -157,7 +158,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//in this request count we do an assert in SessionAttributesHelperPortlet
//so just repaint to let it finish
@@ -168,7 +169,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//invoke servlet
String path = request.getContextPath();
@@ -178,7 +179,7 @@
seq.addAction(3, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
//assert that we have access to APLICATION_SCOPE and not to PORTLET_SCOPE attributes
assertEquals("k1value1", request.getSession().getAttribute("key1"));
@@ -224,7 +225,7 @@
registry.addSequence("HttpSessionRelations", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
UTP1.holder = response.createRenderURL().toString();
@@ -237,7 +238,7 @@
seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
{
- protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, HttpTestContext context) throws ServletException, IOException
{
//assert that we can access attributest stored in PortletSession
assertEquals("k1value1", request.getSession().getAttribute("key1"));
@@ -253,7 +254,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//assert that we can access attributest stored in HttpSession
assertEquals("k2value1", request.getPortletSession().getAttribute("key2", PortletSession.APPLICATION_SCOPE));
@@ -272,7 +273,7 @@
registry.addSequence("HttpSessionInvalidatesPortletSession", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, PortletException
{
PortletSession session = request.getPortletSession();
assertNotNull(session);
@@ -317,7 +318,7 @@
registry.addSequence("PortletSessionInvalidatesHttpSession", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, PortletException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,13 +24,14 @@
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.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP1;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -61,7 +62,7 @@
registry.addSequence("RenderURLNotInvokeAction", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createRenderURL();
return new InvokeGetResponse(url.toString());
@@ -70,7 +71,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
//this shouldn't be invoked
UTP1.local.set(Boolean.TRUE);
@@ -79,7 +80,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertNull(UTP1.local.get());
return new EndTestResponse();
@@ -102,7 +103,7 @@
registry.addSequence("PortletURLParameters", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
@@ -119,7 +120,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
assertEquals("k1value1", request.getParameter("key1"));
assertEquals(new String[]{"k2value1", "k2value2", "k2value3"}, request.getParameterValues("key2"));
@@ -128,7 +129,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createActionURL();
@@ -148,7 +149,7 @@
seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
//what was in previous request
assertNull(request.getParameter("key1"));
@@ -162,7 +163,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createRenderURL();
@@ -180,7 +181,7 @@
seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//what was in previous request
assertNull(request.getParameter("key1"));
@@ -208,7 +209,7 @@
registry.addSequence("PortletURLWithNotSupportedMode", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createRenderURL();
try
@@ -237,7 +238,7 @@
registry.addSequence("PortletURLWithNotSupportedState", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
PortletURL url = response.createRenderURL();
try
@@ -265,7 +266,7 @@
registry.addSequence("SecurityLevel", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
UTP1.holder = new Boolean(request.isSecure());
PortletURL url = response.createActionURL();
@@ -275,7 +276,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
assertEquals(((Boolean)UTP1.holder).booleanValue(), request.isSecure());
}
@@ -283,7 +284,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -24,20 +24,21 @@
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.actions.PortletActionTestAction;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTP2;
-import org.jboss.portal.test.framework.portlet.universal.UTP3;
-import org.jboss.portal.test.framework.portlet.universal.UTP4;
-import org.jboss.portal.test.framework.portlet.universal.UTP5;
-import org.jboss.portal.test.framework.portlet.universal.UTP6;
-import org.jboss.portal.test.framework.portlet.universal.UTP7;
-import org.jboss.portal.test.framework.portlet.universal.UTP8;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP2;
+import org.jboss.portal.test.portlet.framework.UTP3;
+import org.jboss.portal.test.portlet.framework.UTP4;
+import org.jboss.portal.test.portlet.framework.UTP5;
+import org.jboss.portal.test.portlet.framework.UTP6;
+import org.jboss.portal.test.portlet.framework.UTP7;
+import org.jboss.portal.test.portlet.framework.UTP8;
import org.jboss.portal.test.portlet.jsr168.tck.preferences.spec.CreateASingleInstanceOfValidatorValidator;
import org.jboss.portal.test.portlet.jsr168.tck.preferences.spec.ValidationStoresValidator;
@@ -71,7 +72,7 @@
seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -79,7 +80,7 @@
seq.addAction(1, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -108,7 +109,7 @@
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -116,7 +117,7 @@
seq.addAction(2, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -129,7 +130,7 @@
seq.addAction(2, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -148,7 +149,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -156,7 +157,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Get prefs map
PortletPreferences prefs = request.getPreferences();
@@ -181,7 +182,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -201,7 +202,7 @@
seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -209,7 +210,7 @@
seq.addAction(1, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -230,7 +231,7 @@
seq.addAction(1, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -238,7 +239,7 @@
seq.addAction(2, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -262,7 +263,7 @@
seq.addAction(2, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -270,7 +271,7 @@
seq.addAction(3, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -282,7 +283,7 @@
seq.addAction(3, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -300,7 +301,7 @@
seq.addAction(0, UTP5.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -308,7 +309,7 @@
seq.addAction(1, UTP5.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -381,7 +382,7 @@
seq.addAction(1, UTP5.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -399,7 +400,7 @@
seq.addAction(0, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -407,7 +408,7 @@
seq.addAction(1, UTP3.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -434,7 +435,7 @@
seq.addAction(1, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -442,7 +443,7 @@
seq.addAction(2, UTP3.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -457,7 +458,7 @@
seq.addAction(2, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -474,7 +475,7 @@
registry.addSequence("StoreCalledDuringRenderThrowsIllegalArgumentException", seq);
seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException, ValidatorException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -505,7 +506,7 @@
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -513,7 +514,7 @@
seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -542,7 +543,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -550,7 +551,7 @@
seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -563,7 +564,7 @@
seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -582,7 +583,7 @@
seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -590,7 +591,7 @@
seq.addAction(1, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -618,7 +619,7 @@
seq.addAction(1, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -626,7 +627,7 @@
seq.addAction(2, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -654,7 +655,7 @@
seq.addAction(2, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -662,7 +663,7 @@
seq.addAction(3, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -675,7 +676,7 @@
seq.addAction(3, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -692,7 +693,7 @@
registry.addSequence("CreateASingleInstanceOfValidator", seq);
seq.addAction(0, UTP6.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
assertEquals(1, CreateASingleInstanceOfValidatorValidator.getCreatedCount());
return new EndTestResponse();
@@ -714,7 +715,7 @@
seq.addAction(0, UTP8.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -722,7 +723,7 @@
seq.addAction(1, UTP8.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException, IOException, ValidatorException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -754,7 +755,7 @@
seq.addAction(1, UTP8.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -762,7 +763,7 @@
seq.addAction(2, UTP8.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -775,7 +776,7 @@
seq.addAction(2, UTP8.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
@@ -794,7 +795,7 @@
seq.addAction(0, UTP7.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -802,7 +803,7 @@
seq.addAction(1, UTP7.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response) throws ReadOnlyException, IOException
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context) throws ReadOnlyException, IOException
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -832,7 +833,7 @@
seq.addAction(1, UTP7.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new InvokeGetResponse(response.createActionURL().toString());
}
@@ -840,7 +841,7 @@
seq.addAction(2, UTP7.ACTION_JOINPOINT, new PortletActionTestAction()
{
- protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, HttpTestContext context)
{
// Get prefs
PortletPreferences prefs = request.getPreferences();
@@ -854,7 +855,7 @@
seq.addAction(2, UTP7.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext 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 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -25,13 +25,14 @@
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.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTP2;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP2;
import javax.portlet.Portlet;
import javax.portlet.PortletURL;
@@ -57,7 +58,7 @@
registry.addSequence("CustomStateNotMappedNotInvoked", seq);
seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response) throws WindowStateException
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context) throws WindowStateException
{
PortletURL url = response.createRenderURL();
url.setWindowState(new WindowState("UNMAPPED_STATE"));
@@ -67,7 +68,7 @@
seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
//if portlet was invoked we will have failure
return new FailureResponse("Render wasn't expected");
@@ -76,7 +77,7 @@
seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
{
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response)
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, HttpTestContext context)
{
return new EndTestResponse();
}
Modified: trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>UniversalTestPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -120,9 +120,8 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
-
<mbean
code="org.jboss.portal.test.portlet.info.PreferenceInfoTest"
name="portal:test=PreferenceInfo"
@@ -130,9 +129,8 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
-
<mbean
code="org.jboss.portal.test.portlet.info.CapabilitiesInfoTest"
name="portal:test=CapabilitiesInfo"
@@ -140,9 +138,8 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
-
<mbean
code="org.jboss.portal.test.portlet.info.CacheInfoTest"
name="portal:test=CacheInfo"
@@ -150,9 +147,8 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
-
<mbean
code="org.jboss.portal.test.portlet.info.ModeInfoTest"
name="portal:test=ModeInfo"
@@ -160,9 +156,8 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
-
<mbean
code="org.jboss.portal.test.portlet.info.PortletInfoTest"
name="portal:test=PortletInfo"
@@ -170,9 +165,8 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
-
<mbean
code="org.jboss.portal.test.portlet.info.SessionInfoTest"
name="portal:test=SessionInfo"
@@ -180,9 +174,8 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
-
<mbean
code="org.jboss.portal.test.portlet.info.SecurityInfoTest"
name="portal:test=SecurityInfo"
@@ -190,6 +183,6 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
</server>
\ No newline at end of file
Modified: trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -40,7 +40,7 @@
<portlet>
<portlet-name>TestUniversalPortletB</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP2</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP2</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -40,7 +40,7 @@
<portlet>
<portlet-name>TestUniversalPortletB</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP2</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP2</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,7 +30,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -33,7 +33,7 @@
<servlet>
<servlet-name>UniversalServletA</servlet-name>
- <servlet-class>org.jboss.portal.test.framework.portlet.universal.UTS1</servlet-class>
+ <servlet-class>org.jboss.portal.test.portlet.framework.UTS1</servlet-class>
</servlet>
<servlet-mapping>
Modified: trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,7 +30,7 @@
<portlet>
<portlet-name>UniversalTestPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,7 +30,7 @@
<portlet>
<portlet-name>UniversalTestPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,7 +30,7 @@
<portlet>
<portlet-name>UniversalTestPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>UniversalTestPortletB</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP2</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP2</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -52,7 +52,7 @@
<portlet>
<portlet-name>UniversalTestPortlet3</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP3</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP3</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -73,7 +73,7 @@
</portlet>
<portlet>
<portlet-name>UniversalTestPortlet4</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP4</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP4</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>UniversalTestPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -33,7 +33,7 @@
<servlet>
<servlet-name>UniversalServletA</servlet-name>
- <servlet-class>org.jboss.portal.test.framework.portlet.universal.UTS1</servlet-class>
+ <servlet-class>org.jboss.portal.test.portlet.framework.UTS1</servlet-class>
</servlet>
<servlet-mapping>
Modified: trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,7 +30,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -33,12 +33,12 @@
<servlet>
<servlet-name>UniversalServletA</servlet-name>
- <servlet-class>org.jboss.portal.test.framework.portlet.universal.UTS1</servlet-class>
+ <servlet-class>org.jboss.portal.test.portlet.framework.UTS1</servlet-class>
</servlet>
<servlet>
<servlet-name>UniversalServletB</servlet-name>
- <servlet-class>org.jboss.portal.test.framework.portlet.universal.UTS2</servlet-class>
+ <servlet-class>org.jboss.portal.test.portlet.framework.UTS2</servlet-class>
</servlet>
<servlet-mapping>
Modified: trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -33,7 +33,7 @@
<servlet>
<servlet-name>UniversalServletA</servlet-name>
- <servlet-class>org.jboss.portal.test.framework.portlet.universal.UTS1</servlet-class>
+ <servlet-class>org.jboss.portal.test.portlet.framework.UTS1</servlet-class>
</servlet>
<servlet-mapping>
Modified: trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>UniversalTestPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -40,7 +40,7 @@
<portlet>
<portlet-name>UniversalTestPortletB</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP2</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP2</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -33,7 +33,7 @@
<servlet>
<servlet-name>universalServletA</servlet-name>
- <servlet-class>org.jboss.portal.test.framework.portlet.universal.UTS1</servlet-class>
+ <servlet-class>org.jboss.portal.test.portlet.framework.UTS1</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>universalServletA</servlet-name>
Modified: trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,7 +30,7 @@
<portlet>
<portlet-name>UniversalTestPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -41,7 +41,7 @@
<portlet>
<portlet-name>UniversalTestPortletB</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP2</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP2</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,7 +30,7 @@
<portlet>
<portlet-name>UniversalTestPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -41,7 +41,7 @@
<portlet>
<portlet-name>UniversalTestPortletB</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP2</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP2</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -33,12 +33,12 @@
<servlet>
<servlet-name>UniversalServletA</servlet-name>
- <servlet-class>org.jboss.portal.test.framework.portlet.universal.UTS1</servlet-class>
+ <servlet-class>org.jboss.portal.test.portlet.framework.UTS1</servlet-class>
</servlet>
<servlet>
<servlet-name>UniversalServletB</servlet-name>
- <servlet-class>org.jboss.portal.test.framework.portlet.universal.UTS2</servlet-class>
+ <servlet-class>org.jboss.portal.test.portlet.framework.UTS2</servlet-class>
</servlet>
<servlet-mapping>
Modified: trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>UniversalTestPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -40,7 +40,7 @@
<portlet>
<portlet-name>UniversalTestPortletB</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP2</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP2</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -37,7 +37,7 @@
<servlet>
<servlet-name>UniversalServletA</servlet-name>
- <servlet-class>org.jboss.portal.test.framework.portlet.universal.UTS1</servlet-class>
+ <servlet-class>org.jboss.portal.test.portlet.framework.UTS1</servlet-class>
</servlet>
<servlet>
Modified: trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,7 +30,7 @@
<portlet>
<portlet-name>UniversalTestPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,7 +30,7 @@
<portlet>
<portlet-name>UniversalTestPortlet1</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -52,7 +52,7 @@
<portlet>
<portlet-name>UniversalTestPortlet2</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP2</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP2</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -83,7 +83,7 @@
<portlet>
<portlet-name>UniversalTestPortlet3</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP3</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP3</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -105,7 +105,7 @@
<portlet>
<portlet-name>UniversalTestPortlet4</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP4</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP4</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -116,7 +116,7 @@
<portlet>
<portlet-name>UniversalTestPortlet5</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP5</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP5</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -140,7 +140,7 @@
<portlet>
<portlet-name>UniversalTestPortlet6</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP6</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP6</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -154,7 +154,7 @@
<portlet>
<portlet-name>UniversalTestPortlet7</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP7</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP7</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -177,7 +177,7 @@
<portlet>
<portlet-name>UniversalTestPortlet8</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP8</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP8</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -30,7 +30,7 @@
<portlet>
<portlet-name>UniversalTestPortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP1</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -45,7 +45,7 @@
<portlet>
<portlet-name>UniversalTestPortletB</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP2</portlet-class>
+ <portlet-class>org.jboss.portal.test.portlet.framework.UTP2</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -44,6 +44,16 @@
<attribute name="ExportedInterfaces">org.jboss.portal.test.framework.driver.http.HttpTestDriverServer</attribute>
</mbean>
+ <!-- -->
+ <mbean
+ code="org.jboss.portal.test.framework.portlet.PortletTestDriver"
+ name="portal:service=PortletTestDriver"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ </mbean>
+
<!-- Server stack -->
<mbean
code="org.jboss.portal.portlet.test.UserInterceptor"
Modified: trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -25,19 +25,20 @@
import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.common.test.driver.DriverResponse;
-import org.jboss.portal.common.test.driver.TestDriver;
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.common.test.info.TestItemInfo;
import org.jboss.portal.common.test.info.TestInfo;
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.driver.http.HttpTestDriverServer;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public abstract class AbstractTest extends AbstractJBossService implements TestDriver
+public abstract class AbstractTest extends AbstractJBossService implements HttpTestDriverServer
{
/** The test id. */
@@ -49,11 +50,16 @@
/** The controller. */
private HttpTestDriverRegistry testDriverRegistry;
+ /** The test info. */
+ private TestInfo testInfo;
+
+ /** The test info. */
+ private HttpTestContext context;
+
public DriverResponse invoke(DriverCommand cmd) throws TestDriverException
{
if (cmd instanceof StartTestCommand)
{
- StartTestCommand stc = (StartTestCommand)cmd;
return new InvokeGetResponse(path);
}
else
@@ -64,7 +70,7 @@
public TestItemInfo getInfo()
{
- return new TestInfo(testCaseId);
+ return testInfo;
}
public AbstractTest(String testCaseId, String path)
@@ -81,6 +87,7 @@
//
this.testCaseId = testCaseId;
this.path = path;
+ this.testInfo = new TestInfo(testCaseId);
}
public HttpTestDriverRegistry getTestDriverRegistry()
@@ -103,21 +110,40 @@
return path;
}
- public void createService()
+ protected void createService()
{
testDriverRegistry.register(this);
}
- public void destroyService()
+ protected void destroyService()
{
testDriverRegistry.unregister(this);
}
+ public void updateContext(String testId, HttpTestContext ctx)
+ {
+ this.context = ctx;
+ }
+
+ public HttpTestContext retrieveContext(String testId)
+ {
+ return context;
+ }
+
/**
*
*/
- public abstract DriverResponse execute(ServerInvocation invocation);
+ public void execute(ServerInvocation invocation)
+ {
+ DriverResponse response = execute(invocation, context);
+ context.setResponse(response);
+ }
+ /**
+ *
+ */
+ public abstract DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext);
+
/** Get the test id from the class name. It can be overriden. */
protected String createCaseTestId(Class clazz)
{
Modified: trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistry.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistry.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistry.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.test.server;
-import org.jboss.portal.server.RequestController;
import org.jboss.portal.common.test.driver.TestDriver;
import org.jboss.portal.test.framework.driver.http.HttpTestDriverServer;
@@ -32,9 +31,28 @@
*/
public interface HttpTestDriverRegistry extends HttpTestDriverServer
{
- void register(TestDriver test);
+ /**
+ * Regisgter a driver.
+ *
+ * @param driver
+ * @throws IllegalArgumentException if the driver is null or already registered
+ */
+ void register(TestDriver driver) throws IllegalArgumentException;
- void unregister(TestDriver test);
+ /**
+ * Unregister a driver.
+ *
+ * @param driver
+ * @throws IllegalArgumentException if the driver is null or does not exist
+ */
+ void unregister(TestDriver driver) throws IllegalArgumentException;
- TestDriver getDriver(String testName);
+ /**
+ * Return a driver that is able to understand the specified id.
+ *
+ * @param itemId
+ * @return
+ * @throws IllegalArgumentException
+ */
+ TestDriver getDriver(String itemId) throws IllegalArgumentException;
}
Modified: trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistryService.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistryService.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistryService.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -23,6 +23,8 @@
package org.jboss.portal.test.server;
import org.jboss.portal.test.framework.driver.http.AbstractHttpTestDriverServerService;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HttpTestDriverServer;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.TestDriverException;
import org.jboss.portal.common.test.driver.TestDriver;
@@ -33,7 +35,6 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.Iterator;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -43,10 +44,10 @@
{
/** . */
- private static Map _entries;
+ private Map _entries;
/** . */
- private static TestContainerInfo _container;
+ private TestContainerInfo _container;
public HttpTestDriverRegistryService()
{
@@ -54,7 +55,7 @@
_container = new TestContainerInfo("Main");
}
- public synchronized static void registerTestDriver(TestDriver test)
+ public synchronized void registerTestDriver(TestDriver test) throws IllegalArgumentException
{
if (test == null)
{
@@ -68,11 +69,11 @@
}
//
- _container.addChild(itemInfo.createClone());
+ _container.addChild(itemInfo);
_entries.put(entryKey, test);
}
- public static synchronized void unregisterTestDriver(TestDriver test)
+ public synchronized void unregisterTestDriver(TestDriver test) throws IllegalArgumentException
{
if (test == null)
{
@@ -85,45 +86,50 @@
}
//
- TestContainerInfo container = new TestContainerInfo("Main");
- for (Iterator i = _container.getChildNames().iterator();i.hasNext();)
- {
- String itemName = (String)i.next();
- TestItemInfo item = _container.getChild(itemName);
- if (item.getName().equals(entryKey) == false)
- {
- HttpTestDriverRegistryService._container.addChild(item.createClone());
- }
- }
-
- //
_entries.remove(entryKey);
- _container = container;
+ _container.removeChild(entryKey);
}
- public synchronized void register(TestDriver test)
+ public synchronized void register(TestDriver driver)
{
- registerTestDriver(test);
+ registerTestDriver(driver);
}
- public synchronized void unregister(TestDriver test)
+ public synchronized void unregister(TestDriver driver)
{
- unregisterTestDriver(test);
+ unregisterTestDriver(driver);
}
- public TestDriver getDriver(String testName)
+ public TestDriver getDriver(String itemId)
{
- for (Iterator i = _entries.keySet().iterator();i.hasNext();)
+ TestItemInfo itemInfo = _container.findItem(itemId);
+ if (itemInfo == null)
{
- String testDriverName = (String)i.next();
- TestItemInfo testDriverItem = _container.getChild(testDriverName);
- if (testDriverItem.findItem(testName) != null)
+ return null;
+ }
+
+ // Find original parent
+ TestItemInfo currentInfo = itemInfo;
+ while (true)
+ {
+ TestContainerInfo parentInfo = currentInfo.getParent();
+ if (parentInfo == null)
{
- TestDriver testDriver = (TestDriver)_entries.get(testDriverName);
- return testDriver;
+ //
+ return null;
}
+ else if (parentInfo == _container)
+ {
+ break;
+ }
+ else
+ {
+ currentInfo = parentInfo;
+ }
}
- return null;
+
+ //
+ return (TestDriver)_entries.get(currentInfo.getName());
}
public DriverResponse invoke(DriverCommand cmd) throws TestDriverException
@@ -131,18 +137,22 @@
if (cmd instanceof StartTestCommand)
{
StartTestCommand stc = (StartTestCommand)cmd;
- String testName = stc.getTestName();
+ String testId = stc.getTestId();
//
- TestItemInfo item = _container.findItem(testName);
+ TestItemInfo item = _container.findItem(testId);
if (item == null)
{
- throw new TestDriverException("Test not found " + testName);
+ throw new TestDriverException("Driver not found for " + testId);
}
// Get associated test driver
- TestDriver driver = getDriver(testName);
- return driver.invoke(cmd);
+ TestDriver driver = getDriver(testId);
+
+ //
+ String testId2 = item.getId(driver.getInfo());
+ StartTestCommand cmd2 = new StartTestCommand(testId2, stc.getParametrization());
+ return driver.invoke(cmd2);
}
else
{
@@ -152,12 +162,32 @@
public TestItemInfo getInfo()
{
- TestContainerInfo info = new TestContainerInfo("Main");
- for (Iterator i = _entries.values().iterator();i.hasNext();)
+ return _container;
+ }
+
+ public void updateContext(String testId, HttpTestContext ctx)
+ {
+ TestDriver driver = getDriver(testId);
+ if (driver instanceof HttpTestDriverServer)
{
- TestDriver driver = (TestDriver)i.next();
- info.addChild(driver.getInfo());
+ HttpTestDriverServer httpDriver = (HttpTestDriverServer)driver;
+ TestItemInfo item = _container.findItem(testId);
+ String newId = item.getId(httpDriver.getInfo());
+ HttpTestContext ctx2 = new HttpTestContext(newId, ctx.getRequestCount(), ctx.getArchivePath());
+ ctx2.setTestAgent(getAgent());
+ httpDriver.updateContext(newId, ctx2);
}
- return info;
}
+
+ public HttpTestContext retrieveContext(String testId)
+ {
+ TestDriver tmp = getDriver(testId);
+ HttpTestDriverServer driver = (HttpTestDriverServer)tmp;
+ TestItemInfo item = _container.findItem(testId);
+ String newId = item.getId(driver.getInfo());
+ HttpTestContext context = driver.retrieveContext(newId);
+ context = new HttpTestContext(context);
+ context.setTestAgent(null);
+ return context;
+ }
}
Modified: trunk/server/src/main/org/jboss/portal/test/server/TestRequestController.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/TestRequestController.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/TestRequestController.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -25,49 +25,84 @@
import org.jboss.portal.server.RequestController;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.server.ServerException;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
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;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-import junit.framework.AssertionFailedError;
+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;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class TestRequestController extends AbstractJBossService implements RequestController
+public class TestRequestController extends HttpTestDriverRegistryService implements RequestController
{
/** . */
- private HttpTestDriverRegistry registry;
+ private HttpTestDriverRegistry testDriverRegistry;
+ /** . */
+ private String currentTestId;
+
public HttpTestDriverRegistry getTestDriverRegistry()
{
- return registry;
+ return testDriverRegistry;
}
- public void setTestDriverRegistry(HttpTestDriverRegistry registry)
+ public void setTestDriverRegistry(HttpTestDriverRegistry testDriverRegistry)
{
- this.registry = registry;
+ this.testDriverRegistry = testDriverRegistry;
}
- public void handle(ServerInvocation invocation) throws ServerException
+ protected void createService()
{
- String testName = HttpTestContext.getCurrentTestName();
- AbstractTest test = (AbstractTest)registry.getDriver(testName);
- try
+ testDriverRegistry.register(this);
+ }
+
+ protected void destroyService()
+ {
+ testDriverRegistry.unregister(this);
+ }
+
+
+ public void create() throws Exception
+ {
+ super.create();
+ }
+
+
+ public void start() throws Exception
+ {
+ super.start();
+ }
+
+
+ public void stop()
+ {
+ super.stop();
+ }
+
+ public void destroy()
+ {
+ super.destroy();
+ }
+
+ public DriverResponse invoke(DriverCommand cmd) throws TestDriverException
+ {
+ DriverResponse response = super.invoke(cmd);
+
+ //
+ if (cmd instanceof StartTestCommand)
{
- DriverResponse response = test.execute(invocation);
- HttpTestContext.setCurrentResponse(response);
+ StartTestCommand stc = (StartTestCommand)cmd;
+ currentTestId = stc.getTestId();
}
- catch (AssertionFailedError e)
- {
- HttpTestContext.setCurrentResponse(new FailureResponse(e));
- }
- catch (Exception e)
- {
- HttpTestContext.setCurrentResponse(new ErrorResponse(e));
- }
+
+ return response;
}
+
+ public void handle(ServerInvocation invocation) throws ServerException
+ {
+ AbstractTest test = (AbstractTest)getDriver(currentTestId);
+ test.execute(invocation);
+ }
}
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/GetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/GetTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/GetTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -46,9 +46,9 @@
super("GetTest", "/test");
}
- public DriverResponse execute(final ServerInvocation invocation)
+ public DriverResponse execute(final ServerInvocation invocation, HttpTestContext testContext)
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (testContext.isRequestCount(0))
{
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -47,9 +47,9 @@
super("PostMultipartFormDataNoCharsetTest", "/test");
}
- public DriverResponse execute(final ServerInvocation invocation)
+ public DriverResponse execute(final ServerInvocation invocation, HttpTestContext testContext)
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (testContext.isRequestCount(0))
{
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -47,9 +47,9 @@
super("PostMultipartFormDataUTF8Test", "/test");
}
- public DriverResponse execute(final ServerInvocation invocation)
+ public DriverResponse execute(final ServerInvocation invocation, HttpTestContext testContext)
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (testContext.isRequestCount(0))
{
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -46,9 +46,9 @@
super("PostTest", "/test");
}
- public DriverResponse execute(final ServerInvocation invocation)
+ public DriverResponse execute(final ServerInvocation invocation, HttpTestContext testContext)
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (testContext.isRequestCount(0))
{
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -48,9 +48,9 @@
super("PostXWWWFormURLEncodedNoCharsetTest", "/test");
}
- public DriverResponse execute(final ServerInvocation invocation)
+ public DriverResponse execute(final ServerInvocation invocation, HttpTestContext testContext)
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (testContext.isRequestCount(0))
{
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -47,9 +47,9 @@
super("PostXWWWFormURLEncodedUTF8Test", "/test");
}
- public DriverResponse execute(final ServerInvocation invocation)
+ public DriverResponse execute(final ServerInvocation invocation, HttpTestContext testContext)
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (testContext.isRequestCount(0))
{
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -46,9 +46,9 @@
super("GetTest", "/test");
}
- public DriverResponse execute(final ServerInvocation invocation)
+ public DriverResponse execute(final ServerInvocation invocation, HttpTestContext testContext)
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (testContext.isRequestCount(0))
{
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -47,9 +47,9 @@
super("PostApplicationXWWWFormURLEncodedTest", "/test");
}
- public DriverResponse execute(final ServerInvocation invocation)
+ public DriverResponse execute(final ServerInvocation invocation, HttpTestContext testContext)
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (testContext.isRequestCount(0))
{
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -46,9 +46,9 @@
super("PostMultipartFormDataTest", "/test");
}
- public DriverResponse execute(final ServerInvocation invocation)
+ public DriverResponse execute(final ServerInvocation invocation, HttpTestContext testContext)
{
- if (HttpTestContext.isCurrentRequestCount(0))
+ if (testContext.isRequestCount(0))
{
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
Modified: trunk/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -44,10 +44,10 @@
super("DefaultServletMappingTest", "/test-servlet-defaultservletmapping");
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
final ServerInvocationContext ctx = invocation.getServerContext();
- switch (HttpTestContext.getCurrentRequestCount())
+ switch (testContext.getRequestCount())
{
case 0:
ExtendedAssert.assertEquals("/test-servlet-defaultservletmapping", ctx.getPortalContextPath());
Modified: trunk/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -44,10 +44,10 @@
super("PathMappingTest", "/test-servlet-pathmapping/abc");
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
final ServerInvocationContext ctx = invocation.getServerContext();
- switch (HttpTestContext.getCurrentRequestCount())
+ switch (testContext.getRequestCount())
{
case 0:
ExtendedAssert.assertEquals("/test-servlet-pathmapping/abc", ctx.getPortalContextPath());
Modified: trunk/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -45,11 +45,10 @@
super("RootPathMappingTest", "/test-servlet-rootpathmapping");
}
- public DriverResponse execute(ServerInvocation invocation)
+ public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
- ServerRequest req = invocation.getRequest();
final ServerInvocationContext ctx = invocation.getServerContext();
- switch (HttpTestContext.getCurrentRequestCount())
+ switch (testContext.getRequestCount())
{
case 0:
ExtendedAssert.assertEquals("/test-servlet-rootpathmapping", ctx.getPortalContextPath());
Modified: trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -92,7 +92,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
<mbean
code="org.jboss.portal.test.server.charset.PostTest"
@@ -100,7 +100,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
<mbean
code="org.jboss.portal.test.server.charset.PostXWWWFormURLEncodedNoCharsetTest"
@@ -108,7 +108,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
<mbean
code="org.jboss.portal.test.server.charset.PostXWWWFormURLEncodedUTF8Test"
@@ -116,7 +116,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
<mbean
code="org.jboss.portal.test.server.charset.PostMultipartFormDataNoCharsetTest"
@@ -124,7 +124,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
<mbean
code="org.jboss.portal.test.server.charset.PostMultipartFormDataUTF8Test"
@@ -132,6 +132,6 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
</server>
\ No newline at end of file
Modified: trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -91,7 +91,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
<mbean
code="org.jboss.portal.test.server.parameters.PostApplicationXWWWFormURLEncodedTest"
@@ -99,7 +99,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
<mbean
code="org.jboss.portal.test.server.parameters.PostMultipartFormDataTest"
@@ -107,6 +107,6 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
</server>
\ No newline at end of file
Modified: trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -91,7 +91,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
<mbean
code="org.jboss.portal.test.server.servlet.PathMappingTest"
@@ -99,7 +99,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
<mbean
code="org.jboss.portal.test.server.servlet.DefaultServletMappingTest"
@@ -107,6 +107,6 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
</server>
\ No newline at end of file
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/AbstractHttpTestDriverServerService.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/AbstractHttpTestDriverServerService.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/AbstractHttpTestDriverServerService.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -48,7 +48,7 @@
this.agent = agent;
}
- public void updateContext(HttpTestContext ctx)
+ public void updateContext(String testId, HttpTestContext ctx)
{
ctx.setTestAgent(agent);
@@ -56,7 +56,7 @@
HttpTestContext.setCurrentContext(ctx);
}
- public HttpTestContext retrieveContext()
+ public HttpTestContext retrieveContext(String testId)
{
HttpTestContext ctx = HttpTestContext.peekCurrentContext();
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -112,6 +112,11 @@
this.archivePath = archivePath;
}
+ public String getArchivePath()
+ {
+ return archivePath;
+ }
+
/**
* Should not be exposed, but for now, well.
*/
@@ -149,6 +154,18 @@
}
/**
+ * Return true if the request count is equals to the specified value.
+ *
+ * @param count the expected count
+ * @return true if the expected count is equals to the actual count
+ * @throws IllegalStateException
+ */
+ public boolean isRequestCount(int count)
+ {
+ return requestCount == count;
+ }
+
+ /**
* Return the response.
*
* @return the response of the test
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -149,15 +149,15 @@
Node node = nodeManager.getNode(initialNodeId);
// Setup context
- HttpTestContext ctx = new HttpTestContext(st.getTestName(), -1, archivePath);
- getServer().updateContext(ctx);
+ HttpTestContext ctx = new HttpTestContext(st.getTestId(), -1, archivePath);
+ getServer().updateContext(st.getTestId(), ctx);
//
DriverResponse resp = getServer().invoke(cmd);
if (resp instanceof HttpResponse)
{
HttpResponse httpResp = (HttpResponse)resp;
- HttpConversation conversation = new HttpConversation(st.getTestName(), node);
+ HttpConversation conversation = new HttpConversation(st.getTestId(), node);
return conversation.handleHttpResponse(httpResp);
}
return resp;
@@ -316,7 +316,7 @@
//
HttpTestDriverServer agent = getServer();
- HttpTestContext ctx = agent.retrieveContext();
+ HttpTestContext ctx = agent.retrieveContext(testName);
DriverResponse response = ctx.getResponse();
int status = hm.getStatusCode();
switch (status)
@@ -397,7 +397,7 @@
log.info("# Updating test case context of : " + node + " : " + ctx);
HttpTestDriverServer agent = getServer();
- agent.updateContext(ctx);
+ agent.updateContext(testName, ctx);
//
log.info("# Invoking test case over http " + cfg + " " + method.getURI());
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -33,10 +33,10 @@
/**
*
*/
- void updateContext(HttpTestContext ctx);
+ void updateContext(String testId, HttpTestContext ctx);
/**
*
*/
- HttpTestContext retrieveContext();
+ HttpTestContext retrieveContext(String testId);
}
Modified: trunk/test/src/resources/portal-test-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/test/src/resources/portal-test-sar/META-INF/jboss-service.xml 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/test/src/resources/portal-test-sar/META-INF/jboss-service.xml 2006-11-02 23:02:12 UTC (rev 5568)
@@ -37,10 +37,4 @@
<attribute name="JndiName">TestAgent</attribute>
<attribute name="ExportedInterfaces">org.jboss.portal.test.framework.agent.TestAgent</attribute>
</mbean>
-
- <!-- OpenDS service (LDAP) -->
- <mbean
- code="org.jboss.portal.test.framework.embedded.opends.OpenDSService"
- name="portal.test:service=OpenDSService">
- </mbean>
</server>
\ No newline at end of file
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java 2006-11-02 22:39:59 UTC (rev 5567)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java 2006-11-02 23:02:12 UTC (rev 5568)
@@ -31,9 +31,9 @@
import org.jboss.logging.Logger;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HttpTestDriverServer;
import org.jboss.portal.test.server.HttpTestDriverRegistry;
import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.common.test.driver.TestDriver;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.DriverCommand;
import org.jboss.portal.common.test.driver.TestDriverException;
@@ -52,7 +52,7 @@
* @author <a href="mailto:Boleslaw.Dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @since 2.4 (Feb 20, 2006)
*/
-public abstract class WSRPBaseTest extends AbstractJBossService implements TestDriver
+public abstract class WSRPBaseTest extends AbstractJBossService implements HttpTestDriverServer
{
Logger log = Logger.getLogger(WSRPBaseTest.class);
@@ -63,6 +63,9 @@
/** . */
private HttpTestDriverRegistry testDriverRegistry;
+ /** . */
+ private HttpTestContext context;
+
protected WSRPBaseTest(String name) throws Exception
{
// log("Instantiated test named '" + name + "'");
@@ -217,14 +220,12 @@
protected void deploy(String archiveId) throws Exception
{
- HttpTestContext ctx = HttpTestContext.getCurrentContext();
- ctx.deploy(archiveId);
+ context.deploy(archiveId);
}
protected void undeploy(String archiveId) throws Exception
{
- HttpTestContext ctx = HttpTestContext.getCurrentContext();
- ctx.undeploy(archiveId);
+ context.undeploy(archiveId);
}
public TestItemInfo getInfo()
@@ -236,4 +237,14 @@
{
return test.invoke(command);
}
+
+ public void updateContext(String testId, HttpTestContext ctx)
+ {
+ this.context = ctx;
+ }
+
+ public HttpTestContext retrieveContext(String testId)
+ {
+ return context;
+ }
}
More information about the jboss-svn-commits
mailing list