[jboss-svn-commits] JBoss Portal SVN: r5573 - in trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck: portletinterface/spec portletmode/spec
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Nov 3 09:34:36 EST 2006
Author: julien at jboss.com
Date: 2006-11-03 09:34:33 -0500 (Fri, 03 Nov 2006)
New Revision: 5573
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/portletmode/spec/RequestDispatchingDependingOnModePortlet.java
Log:
fix 3 portlet container test cases that were not properly subclassing their parent class (broken during refactoring)
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-03 14:16:41 UTC (rev 5572)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java 2006-11-03 14:34:33 UTC (rev 5573)
@@ -22,12 +22,13 @@
******************************************************************************/
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.EndTestResponse;
+import org.jboss.portal.common.test.driver.response.ErrorResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import org.jboss.portal.test.framework.portlet.components.AbstractTestGenericPortlet;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import javax.portlet.PortletException;
import javax.portlet.PortletMode;
@@ -66,51 +67,52 @@
rendered = "doHelp";
}
- protected void preRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected void preRender(RenderRequest req, RenderResponse resp, PortletTestContext context) throws PortletException, IOException
{
rendered = null;
}
- protected DriverResponse postRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse postRender(RenderRequest req, RenderResponse resp, PortletTestContext context) throws PortletException, IOException
{
- if (context.isRequestCount(0))
+ switch(context.getRequestCount())
{
- // Invoking VIEW mode
- PortletURL url = resp.createRenderURL();
- url.setPortletMode(PortletMode.VIEW);
- url.setWindowState(WindowState.MINIMIZED);
- return new InvokeGetResponse(url.toString());
- }
- else if (context.isRequestCount(1))
- {
- ExtendedAssert.assertNull(rendered);
+ case 0:
+ {
+ // Invoking VIEW mode
+ PortletURL url = resp.createRenderURL();
+ url.setPortletMode(PortletMode.VIEW);
+ url.setWindowState(WindowState.MINIMIZED);
+ return new InvokeGetResponse(url.toString());
+ }
+ case 1:
+ {
+ ExtendedAssert.assertNull(rendered);
- // Invoking EDIT mode
- PortletURL url = resp.createRenderURL();
- url.setPortletMode(PortletMode.EDIT);
- url.setWindowState(WindowState.MINIMIZED);
- return new InvokeGetResponse(url.toString());
- }
- else if (context.isRequestCount(2))
- {
- ExtendedAssert.assertNull(rendered);
+ // Invoking EDIT mode
+ PortletURL url = resp.createRenderURL();
+ url.setPortletMode(PortletMode.EDIT);
+ url.setWindowState(WindowState.MINIMIZED);
+ return new InvokeGetResponse(url.toString());
+ }
+ case 2:
+ {
+ ExtendedAssert.assertNull(rendered);
- // Invoking HELP mode
- PortletURL url = resp.createRenderURL();
- url.setPortletMode(PortletMode.HELP);
- url.setWindowState(WindowState.MINIMIZED);
- return new InvokeGetResponse(url.toString());
- }
- else if (context.isRequestCount(3))
- {
- ExtendedAssert.assertNull(rendered);
+ // Invoking HELP mode
+ PortletURL url = resp.createRenderURL();
+ url.setPortletMode(PortletMode.HELP);
+ url.setWindowState(WindowState.MINIMIZED);
+ return new InvokeGetResponse(url.toString());
+ }
+ case 3:
+ {
+ ExtendedAssert.assertNull(rendered);
- //
- return new EndTestResponse();
+ //
+ return new EndTestResponse();
+ }
+ default:
+ return new ErrorResponse();
}
- else
- {
- return new EndTestResponse();
- }
}
}
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-03 14:16:41 UTC (rev 5572)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java 2006-11-03 14:34:33 UTC (rev 5573)
@@ -23,10 +23,11 @@
package org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec;
import org.jboss.portal.test.framework.portlet.components.AbstractTestGenericPortlet;
+import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
+import org.jboss.portal.common.test.driver.response.ErrorResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import javax.portlet.PortletException;
@@ -49,11 +50,11 @@
/** . */
private String methodCall;
- private HttpTestContext context;
+ private PortletTestContext context;
protected void doView(final RenderRequest request, RenderResponse response) throws PortletException, IOException
{
- if (context.isRequestCount(1))
+ if (context.getRequestCount() == 1)
{
methodCall = "doView";
}
@@ -61,7 +62,7 @@
protected void doEdit(final RenderRequest request, RenderResponse response) throws PortletException, IOException
{
- if (context.isRequestCount(2))
+ if (context.getRequestCount() == 2)
{
methodCall = "doEdit";
}
@@ -69,58 +70,59 @@
protected void doHelp(final RenderRequest request, RenderResponse response) throws PortletException, IOException
{
- if (context.isRequestCount(3))
+ if (context.getRequestCount() == 3)
{
methodCall = "doHelp";
}
}
- protected void preRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected void preRender(RenderRequest req, RenderResponse resp, PortletTestContext context) throws PortletException, IOException
{
this.context = context;
this.methodCall = null;
}
- protected DriverResponse postRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse postRender(RenderRequest req, RenderResponse resp, PortletTestContext context) throws PortletException, IOException
{
try
{
- if (context.isRequestCount(0))
+ switch(context.getRequestCount())
{
- // 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);
+ case 0:
+ {
+ // Invoking VIEW mode
+ PortletURL url = resp.createRenderURL();
+ url.setPortletMode(PortletMode.VIEW);
+ return new InvokeGetResponse(url.toString());
+ }
+ case 1:
+ {
+ ExtendedAssert.assertEquals("doView", 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 EDIT mode
+ PortletURL url = resp.createRenderURL();
+ url.setPortletMode(PortletMode.EDIT);
+ return new InvokeGetResponse(url.toString());
+ }
+ case 2:
+ {
+ ExtendedAssert.assertEquals("doEdit", 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);
+ // Invoking HELP mode
+ PortletURL url = resp.createRenderURL();
+ url.setPortletMode(PortletMode.HELP);
+ return new InvokeGetResponse(url.toString());
+ }
+ case 3:
+ {
+ ExtendedAssert.assertEquals("doHelp", methodCall);
- //
- return new EndTestResponse();
+ //
+ return new EndTestResponse();
+ }
+ default:
+ return new ErrorResponse();
}
- else
- {
- return new EndTestResponse();
- }
}
finally
{
More information about the jboss-svn-commits
mailing list