Author: julien(a)jboss.com Date: 2007-08-22 13:39:30 -0400 (Wed, 22 Aug 2007) New Revision: 8037 Modified: modules/portlet/trunk/jboss-portal-portlet.iws modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml Log: update portlet module to use test module rev 8035 Modified: modules/portlet/trunk/jboss-portal-portlet.iws =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.iws 2007-08-22 17:36:30 UTC (rev 8036) +++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-08-22 17:39:30 UTC (rev 8037) @@ -17,14 +17,15 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/build.xml" afterPath="$PROJECT_DIR$/portlet/build.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/build.xml" afterPath="$PROJECT_DIR$/test/build.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" afterPath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" afterPath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -155,33 +156,87 @@ <component name="FavoritesProjectViewPane" /> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="TestDriverRegistryAccess.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java"> + <file leaf-file-name="jboss-beans.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="7" selection-start="2114" selection-end="2114" vertical-scroll-proportion="0.19235511"> + <state line="19" column="64" selection-start="854" selection-end="854" vertical-scroll-proportion="0.21105528"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="PortletTestSuite.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java"> + <file leaf-file-name="PortletTestDriver.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="101" column="31" selection-start="4316" selection-end="4316" vertical-scroll-proportion="0.5437731"> + <state line="46" column="42" selection-start="2794" selection-end="2794" vertical-scroll-proportion="0.16276202"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="SessionTestCase.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java"> + <file leaf-file-name="AbstractInfoTest.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="12" selection-start="2174" selection-end="2174" vertical-scroll-proportion="0.20715167"> + <state line="41" column="50" selection-start="2741" selection-end="2741" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="SecurityInfoTest.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="29" column="108" selection-start="2139" selection-end="2139" vertical-scroll-proportion="0.044389643"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ExceptionsDuringRequestHandlingControllerPortlet.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="90" column="15" selection-start="4984" selection-end="4984" vertical-scroll-proportion="0.6080402"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="PortletExceptionDuringRequestHandlingPortlet.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="68" column="77" selection-start="3677" selection-end="3677" vertical-scroll-proportion="0.55778897"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="RuntimeExceptionDuringRequestHandlingPortlet.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="70" column="77" selection-start="3818" selection-end="3818" vertical-scroll-proportion="0.5879397"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="UnavailableExceptionDuringProcessActionPortlet.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="68" column="77" selection-start="3593" selection-end="3593" vertical-scroll-proportion="0.55778897"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="UnavailableExceptionDuringRenderPortlet.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="55" column="52" selection-start="3167" selection-end="3167" vertical-scroll-proportion="0.38471022"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -1154,104 +1209,111 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java"> + <entry file="file://$PROJECT_DIR$/portlet/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="17" selection-start="2014" selection-end="2014" vertical-scroll-proportion="0.14796548"> + <state line="227" column="56" selection-start="11875" selection-end="11875" vertical-scroll-proportion="0.77681875"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/container/PortletApplication.java"> + <entry file="file://$PROJECT_DIR$/test/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="0" selection-start="1995" selection-end="2240" vertical-scroll-proportion="0.3107275"> + <state line="162" column="93" selection-start="8435" selection-end="8435" vertical-scroll-proportion="0.30456227"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestRenderContext.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="56" selection-start="2383" selection-end="2383" vertical-scroll-proportion="0.1356784"> + <state line="35" column="7" selection-start="2114" selection-end="2114" vertical-scroll-proportion="0.19235511"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestPortletInvocationContext.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="66" column="75" selection-start="3157" selection-end="3157" vertical-scroll-proportion="0.50308263"> + <state line="101" column="31" selection-start="4316" selection-end="4316" vertical-scroll-proportion="0.5437731"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="829" column="63" selection-start="31326" selection-end="31326" vertical-scroll-proportion="0.76884425"> + <state line="36" column="12" selection-start="2174" selection-end="2174" vertical-scroll-proportion="0.20715167"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/modules.ent"> + <entry file="jar://$PROJECT_DIR$/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="13" column="83" selection-start="688" selection-end="720" vertical-scroll-proportion="0.19235511"> + <state line="5" column="20" selection-start="196" selection-end="196" vertical-scroll-proportion="0.05918619"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="0" selection-start="902" selection-end="902" vertical-scroll-proportion="0.30150753"> + <state line="19" column="64" selection-start="854" selection-end="854" vertical-scroll-proportion="0.21105528"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/classes/logging.properties"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="46" column="42" selection-start="2794" selection-end="2794" vertical-scroll-proportion="0.16276202"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="90" column="51" selection-start="3981" selection-end="3981" vertical-scroll-proportion="0.6118091"> + <state line="41" column="50" selection-start="2741" selection-end="2741" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="227" column="56" selection-start="11875" selection-end="11875" vertical-scroll-proportion="0.77681875"> + <state line="29" column="108" selection-start="2139" selection-end="2139" vertical-scroll-proportion="0.044389643"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="162" column="93" selection-start="8435" selection-end="8435" vertical-scroll-proportion="0.30456227"> + <state line="90" column="15" selection-start="4984" selection-end="4984" vertical-scroll-proportion="0.6080402"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="7" selection-start="2114" selection-end="2114" vertical-scroll-proportion="0.19235511"> + <state line="68" column="77" selection-start="3677" selection-end="3677" vertical-scroll-proportion="0.55778897"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="101" column="31" selection-start="4316" selection-end="4316" vertical-scroll-proportion="0.5437731"> + <state line="70" column="77" selection-start="3818" selection-end="3818" vertical-scroll-proportion="0.5879397"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="12" selection-start="2174" selection-end="2174" vertical-scroll-proportion="0.20715167"> + <state line="68" column="77" selection-start="3593" selection-end="3593" vertical-scroll-proportion="0.55778897"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="55" column="52" selection-start="3167" selection-end="3167" vertical-scroll-proportion="0.38471022"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-08-22 17:36:30 UTC (rev 8036) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-08-22 17:39:30 UTC (rev 8037) @@ -30,7 +30,7 @@ import org.jboss.portal.test.framework.driver.DriverCommand; import org.jboss.portal.test.framework.driver.TestDriverException; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.test.framework.driver.http.HttpTestDriver; +import org.jboss.portal.test.framework.driver.http.HTTPTestDriver; import org.jboss.portal.test.framework.driver.remote.TestContext; import java.util.HashMap; @@ -44,7 +44,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 6720 $ */ -public class PortletTestDriver implements HttpTestDriver +public class PortletTestDriver implements HTTPTestDriver { /** . */ Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-08-22 17:36:30 UTC (rev 8036) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-08-22 17:39:30 UTC (rev 8037) @@ -32,14 +32,14 @@ import org.jboss.portal.test.framework.driver.command.StartTestCommand; import org.jboss.portal.test.framework.info.TestItemInfo; import org.jboss.portal.test.framework.info.TestInfo; -import org.jboss.portal.test.framework.driver.http.HttpTestDriver; +import org.jboss.portal.test.framework.driver.http.HTTPTestDriver; import org.jboss.portal.test.framework.driver.remote.TestContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public abstract class AbstractInfoTest implements HttpTestDriver +public abstract class AbstractInfoTest implements HTTPTestDriver { /** The test id. */ Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2007-08-22 17:36:30 UTC (rev 8036) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2007-08-22 17:39:30 UTC (rev 8037) @@ -27,7 +27,7 @@ import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.info.SecurityInfo; import org.jboss.portal.common.junit.ExtendedAssert; -import org.jboss.portal.test.framework.driver.http.HttpTestContext; +import org.jboss.portal.test.framework.driver.http.HTTPTestContext; /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-08-22 17:36:30 UTC (rev 8036) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-08-22 17:39:30 UTC (rev 8037) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -import org.jboss.portal.test.framework.driver.http.HttpTestContext; +import org.jboss.portal.test.framework.driver.http.HTTPTestContext; import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; @@ -59,7 +59,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, PortletSecurityException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, PortletSecurityException, IOException { if (context.getRequestCount() == 0) { @@ -88,7 +88,7 @@ PortletURL url = resp.createRenderURL(); return new InvokeGetResponse(url.toString()); } - else if (HttpTestContext.isCurrentRequestCount(5)) + else if (HTTPTestContext.isCurrentRequestCount(5)) { //portlets that shouldn't render itself after Exception in Action Phase ExtendedAssert.assertEquals(false, PortletExceptionDuringRequestHandlingPortlet.rendered); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:36:30 UTC (rev 8036) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:39:30 UTC (rev 8037) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -import org.jboss.portal.test.framework.driver.http.HttpTestContext; +import org.jboss.portal.test.framework.driver.http.HTTPTestContext; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; import org.jboss.portal.test.framework.driver.DriverResponse; @@ -57,7 +57,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException + protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HTTPTestContext context) throws PortletException, IOException { if (context.isRequestCount(2)) { @@ -66,7 +66,7 @@ return null; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException { if (context.isRequestCount(0)) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:36:30 UTC (rev 8036) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:39:30 UTC (rev 8037) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -import org.jboss.portal.test.framework.driver.http.HttpTestContext; +import org.jboss.portal.test.framework.driver.http.HTTPTestContext; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; import org.jboss.portal.test.framework.driver.DriverResponse; @@ -59,7 +59,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException + protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HTTPTestContext context) throws PortletException, IOException { if (context.isRequestCount(3)) { @@ -68,7 +68,7 @@ return null; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException { if (context.isRequestCount(0)) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-08-22 17:36:30 UTC (rev 8036) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-08-22 17:39:30 UTC (rev 8037) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -import org.jboss.portal.test.framework.driver.http.HttpTestContext; +import org.jboss.portal.test.framework.driver.http.HTTPTestContext; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; import org.jboss.portal.test.framework.driver.DriverResponse; @@ -57,7 +57,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException + protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HTTPTestContext context) throws PortletException, IOException { if (context.isRequestCount(4)) { @@ -66,7 +66,7 @@ return null; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException { if (context.isRequestCount(0)) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-08-22 17:36:30 UTC (rev 8036) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-08-22 17:39:30 UTC (rev 8037) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -import org.jboss.portal.test.framework.driver.http.HttpTestContext; +import org.jboss.portal.test.framework.driver.http.HTTPTestContext; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; import org.jboss.portal.test.framework.driver.DriverResponse; @@ -52,7 +52,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException { if (context.isRequestCount(0)) { Modified: modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-08-22 17:36:30 UTC (rev 8036) +++ modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-08-22 17:39:30 UTC (rev 8037) @@ -17,7 +17,7 @@ <constructor> <parameter>socket://localhost:5400</parameter> <parameter><inject bean="TestDriverServer"/></parameter> - <parameter>org.jboss.portal.test.framework.driver.http.HttpTestDriver</parameter> + <parameter>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</parameter> </constructor> </bean>