Author: julien(a)jboss.com Date: 2007-08-22 13:36:30 -0400 (Wed, 22 Aug 2007) New Revision: 8036 Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java Log: update 2.6 to test module rev 8035 Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml 2007-08-22 17:36:30 UTC (rev 8036) @@ -188,6 +188,15 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml 2007-08-22 17:36:30 UTC (rev 8036) @@ -128,6 +128,15 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-08-22 17:36:30 UTC (rev 8036) @@ -167,6 +167,15 @@ </library> </orderEntry> <orderEntry type="module" module-name="core" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> <javadoc-paths> <root url="http://java.sun.com/j2ee/1.4/docs/api/" /> Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java 2007-08-22 17:36:30 UTC (rev 8036) @@ -23,7 +23,7 @@ package org.jboss.portal.test.cms.clustering; import org.jboss.portal.test.framework.server.driver.AbstractTest; -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.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.server.NodeId; @@ -80,7 +80,7 @@ { try { - if (HttpTestContext.isCurrentRequestCount(0) && NodeId.PORTS_01.equals(NodeId.locate())) + if (HTTPTestContext.isCurrentRequestCount(0) && NodeId.PORTS_01.equals(NodeId.locate())) { System.out.println("-------------------------------------------------------"); System.out.println("Performing SetUp on..." + NodeId.PORTS_01 + "(createTestFileDelete)"); @@ -108,10 +108,10 @@ AbstractServerURL url = new AbstractServerURL(); url.setPortalRequestPath("/index.html"); String s = invocation.getResponse().renderURL(url); - s = HttpTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02); + s = HTTPTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02); return new InvokeGetResponse(s); } - else if (HttpTestContext.isCurrentRequestCount(1) && NodeId.PORTS_02.equals(NodeId.locate())) + else if (HTTPTestContext.isCurrentRequestCount(1) && NodeId.PORTS_02.equals(NodeId.locate())) { System.out.println("-------------------------------------------------------"); System.out.println("Performing SetUp on node..." + NodeId.PORTS_02 + "(createTestFileDelete)"); @@ -134,10 +134,10 @@ AbstractServerURL url = new AbstractServerURL(); url.setPortalRequestPath("/index.html"); String s = invocation.getResponse().renderURL(url); - s = HttpTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_01); + s = HTTPTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_01); return new InvokeGetResponse(s); } - else if (HttpTestContext.isCurrentRequestCount(2) && NodeId.PORTS_01.equals(NodeId.locate())) + else if (HTTPTestContext.isCurrentRequestCount(2) && NodeId.PORTS_01.equals(NodeId.locate())) { System.out.println("-------------------------------------------------------"); System.out.println("Performing FileDelete on..." + NodeId.PORTS_01 + "(createTestFileDelete)"); @@ -174,10 +174,10 @@ AbstractServerURL url = new AbstractServerURL(); url.setPortalRequestPath("/index.html"); String s = invocation.getResponse().renderURL(url); - s = HttpTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02); + s = HTTPTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02); return new InvokeGetResponse(s); } - else if (HttpTestContext.isCurrentRequestCount(3) && NodeId.PORTS_02.equals(NodeId.locate())) + else if (HTTPTestContext.isCurrentRequestCount(3) && NodeId.PORTS_02.equals(NodeId.locate())) { System.out.println("-------------------------------------------------------"); System.out.println("Checking FileDelete on node..." + NodeId.PORTS_02 + "(createTestFileDelete)"); Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java 2007-08-22 17:36:30 UTC (rev 8036) @@ -34,7 +34,7 @@ import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.test.framework.server.driver.AbstractTest; -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.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.server.NodeId; @@ -80,7 +80,7 @@ { try { - if (HttpTestContext.isCurrentRequestCount(0) && NodeId.PORTS_01.equals(NodeId.locate())) + if (HTTPTestContext.isCurrentRequestCount(0) && NodeId.PORTS_01.equals(NodeId.locate())) { System.out.println("-------------------------------------------------------"); System.out.println("Performing SetUp on..." + NodeId.PORTS_01 + "(createTestFileUpdate)"); @@ -116,10 +116,10 @@ AbstractServerURL url = new AbstractServerURL(); url.setPortalRequestPath("/index.html"); String s = invocation.getResponse().renderURL(url); - s = HttpTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02); + s = HTTPTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02); return new InvokeGetResponse(s); } - else if (HttpTestContext.isCurrentRequestCount(1) && NodeId.PORTS_02.equals(NodeId.locate())) + else if (HTTPTestContext.isCurrentRequestCount(1) && NodeId.PORTS_02.equals(NodeId.locate())) { System.out.println("-------------------------------------------------------"); System.out.println("Performing SetUp on node..." + NodeId.PORTS_02 + "(createTestFileUpdate)"); @@ -155,10 +155,10 @@ AbstractServerURL url = new AbstractServerURL(); url.setPortalRequestPath("/index.html"); String s = invocation.getResponse().renderURL(url); - s = HttpTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_01); + s = HTTPTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_01); return new InvokeGetResponse(s); } - else if (HttpTestContext.isCurrentRequestCount(2) && NodeId.PORTS_01.equals(NodeId.locate())) + else if (HTTPTestContext.isCurrentRequestCount(2) && NodeId.PORTS_01.equals(NodeId.locate())) { System.out.println("-------------------------------------------------------"); System.out.println("Performing FileUpdate on..." + NodeId.PORTS_01 + "(createTestFileUpdate)"); @@ -208,10 +208,10 @@ AbstractServerURL url = new AbstractServerURL(); url.setPortalRequestPath("/index.html"); String s = invocation.getResponse().renderURL(url); - s = HttpTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02); + s = HTTPTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02); return new InvokeGetResponse(s); } - else if (HttpTestContext.isCurrentRequestCount(3) && NodeId.PORTS_02.equals(NodeId.locate())) + else if (HTTPTestContext.isCurrentRequestCount(3) && NodeId.PORTS_02.equals(NodeId.locate())) { System.out.println("-------------------------------------------------------"); System.out.println("Checking FileUpdate on node..." + NodeId.PORTS_02 + "(createTestFileUpdate)"); Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-08-22 17:36:30 UTC (rev 8036) @@ -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: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-08-22 17:36:30 UTC (rev 8036) @@ -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: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2007-08-22 17:36:30 UTC (rev 8036) @@ -27,7 +27,6 @@ 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; /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-08-22 17:36:30 UTC (rev 8036) @@ -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: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:36:30 UTC (rev 8036) @@ -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: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:36:30 UTC (rev 8036) @@ -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: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-08-22 17:36:30 UTC (rev 8036) @@ -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: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-08-22 17:36:30 UTC (rev 8036) @@ -22,9 +22,9 @@ ******************************************************************************/ 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.portlet.components.AbstractTestPortlet; import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.http.HTTPTestContext; import javax.portlet.PortletException; import javax.portlet.RenderRequest; @@ -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: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java 2007-08-22 17:36:30 UTC (rev 8036) @@ -25,14 +25,14 @@ import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.driver.response.ErrorResponse; -import org.jboss.portal.test.framework.driver.http.HttpTestCase; +import org.jboss.portal.test.framework.driver.http.HTTPTestCase; import org.jboss.portal.test.framework.driver.remote.TestContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public abstract class AbstractTest extends HttpTestCase +public abstract class AbstractTest extends HTTPTestCase { Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java 2007-08-22 17:21:20 UTC (rev 8035) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java 2007-08-22 17:36:30 UTC (rev 8036) @@ -37,7 +37,7 @@ import org.jboss.portal.test.framework.info.TestItemInfo; import org.jboss.portal.test.framework.junit.POJOJUnitTest; import org.jboss.portal.jems.as.system.AbstractJBossService; -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; /** @@ -48,7 +48,7 @@ * @author <a href="mailto:Boleslaw.Dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @since 2.4 (Feb 20, 2006) */ -public abstract class WSRPBaseTest extends AbstractJBossService implements HttpTestDriver +public abstract class WSRPBaseTest extends AbstractJBossService implements HTTPTestDriver { Logger log = Logger.getLogger(WSRPBaseTest.class);