[jboss-svn-commits] JBoss Portal SVN: r5548 - in trunk: portlet/src/main/org/jboss/portal/test/framework/portlet/components portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec test/src/main/org/jboss/portal/test/framework/driver/http
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 1 11:02:17 EST 2006
Author: julien at jboss.com
Date: 2006-11-01 11:02:04 -0500 (Wed, 01 Nov 2006)
New Revision: 5548
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/AbstractTestPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.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/spec/RequestDispatchingDependingOnModePortlet.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
Log:
avoid to expose marshalling methods for portlet tests, rather make the methode return a DriverResponse and have the enclosing class properly marshall the response when it exists
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-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2006-11-01 16:02:04 UTC (rev 5548)
@@ -24,6 +24,8 @@
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.common.test.driver.DriverResponse;
+import org.jboss.portal.common.test.driver.response.FailureResponse;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -34,6 +36,8 @@
import javax.portlet.RenderResponse;
import java.io.IOException;
+import junit.framework.AssertionFailedError;
+
/**
* Abstract test class for testing GenericPortlet implementation
*
@@ -58,26 +62,53 @@
return Tools.getShortNameOf(clazz);
}
- public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
+ public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
if (HttpTestContext.isCurrentTestName(testCaseId))
{
- doProcessAction(req, resp);
+ DriverResponse response;
+ try
+ {
+ response = doProcessAction(req, resp);
+ }
+ catch (AssertionFailedError e)
+ {
+ response = new FailureResponse(e);
+ }
+
+ //
+ if (response != null)
+ {
+ HttpTestContext.setCurrentResponse(response);
+ }
}
}
- final public void render(RenderRequest request, RenderResponse response) throws PortletException, PortletSecurityException, IOException
+ public void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
if (HttpTestContext.isCurrentTestName(testCaseId))
{
- preRender(request, response);
- super.render(request, response);
- postRender(request, response);
+ DriverResponse response;
+ try
+ {
+ preRender(req, resp);
+ super.render(req, resp);
+ response = postRender(req, resp);
+ }
+ catch (AssertionFailedError e)
+ {
+ response = new FailureResponse(e);
+ }
+
+ //
+ if (response != null)
+ {
+ HttpTestContext.setCurrentResponse(response);
+ }
}
}
-
- protected void doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
throw new PortletException();
}
@@ -91,7 +122,7 @@
* @throws PortletSecurityException
* @throws IOException
*/
- protected void preRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected void preRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
throw new PortletException();
}
@@ -105,10 +136,8 @@
* @throws PortletSecurityException
* @throws IOException
*/
- protected void postRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse postRender(RenderRequest req, RenderResponse resp) 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-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2006-11-01 16:02:04 UTC (rev 5548)
@@ -106,7 +106,25 @@
{
if (HttpTestContext.isCurrentTestName(testCaseId))
{
- doProcessAction(req, resp);
+ DriverResponse response;
+ try
+ {
+ response = doProcessAction(req, resp);
+ }
+ catch (AssertionFailedError e)
+ {
+ response = new FailureResponse(e);
+ }
+
+ //
+ if (response != null)
+ {
+ HttpTestContext.setCurrentResponse(response);
+ }
+ else
+ {
+ HttpTestContext.setCurrentResponse(response);
+ }
}
}
@@ -114,7 +132,21 @@
{
if (HttpTestContext.isCurrentTestName(testCaseId))
{
- doRender(req, resp);
+ DriverResponse response;
+ try
+ {
+ response = doRender(req, resp);
+ }
+ catch (AssertionFailedError e)
+ {
+ response = new FailureResponse(e);
+ }
+
+ //
+ if (response != null)
+ {
+ HttpTestContext.setCurrentResponse(response);
+ }
}
}
@@ -122,12 +154,12 @@
{
}
- protected void doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
{
throw new PortletException();
}
- protected void doRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
{
throw new PortletException();
}
@@ -143,28 +175,4 @@
}
return s;
}
-
- public DriverResponse bilto(Runnable runnable, DriverResponse abc)
- {
- try
- {
- runnable.run();
-
- //
- return new EndTestResponse();
- }
- catch (AssertionFailedError e)
- {
- return new FailureResponse(e);
- }
- catch (Exception e)
- {
- return new ErrorResponse(e);
- }
- }
-
- public static void marshall(DriverResponse response)
- {
- HttpTestContext.setCurrentResponse(response);
- }
}
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-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 2006-11-01 16:02:04 UTC (rev 5548)
@@ -207,7 +207,7 @@
TestAction action = sequence.getAction(ctx.getRequestCount(), NodeId.locate(), renderJoinpoint);
//
- if (action != null && action instanceof PortletRenderTestAction)
+ if (action != null)
{
log.debug("Found action for jointpoint " + renderJoinpoint + " : " + action);
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-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2006-11-01 16:02:04 UTC (rev 5548)
@@ -59,57 +59,52 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected void doRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
{
if (HttpTestContext.getCurrentRequestCount() == 0)
{
//Just repaint
PortletURL url = resp.createRenderURL();
- InvokeGetResponse result = new InvokeGetResponse(url.toString());
- marshall(result);
+ return new InvokeGetResponse(url.toString());
}
- if (HttpTestContext.getCurrentRequestCount() == 1)
+ else if (HttpTestContext.getCurrentRequestCount() == 1)
{
//Invoke PortletExceptionDuringRequestHandlingPortlet action
- InvokeGetResponse result = new InvokeGetResponse(PortletExceptionDuringRequestHandlingPortlet.actionURL);
- marshall(result);
+ return new InvokeGetResponse(PortletExceptionDuringRequestHandlingPortlet.actionURL);
}
- if (HttpTestContext.getCurrentRequestCount() == 2)
+ else if (HttpTestContext.getCurrentRequestCount() == 2)
{
//Invoke RuntimeExceptionDuringRequestHandlingPortlet action
- InvokeGetResponse result = new InvokeGetResponse(RuntimeExceptionDuringRequestHandlingPortlet.actionURL);
- marshall(result);
+ return new InvokeGetResponse(RuntimeExceptionDuringRequestHandlingPortlet.actionURL);
}
- if (HttpTestContext.getCurrentRequestCount() == 3)
+ else if (HttpTestContext.getCurrentRequestCount() == 3)
{
//Invoke UnavailableExceptionDuringProcessActionPortlet action
- InvokeGetResponse result = new InvokeGetResponse(UnavailableExceptionDuringProcessActionPortlet.actionURL);
- marshall(result);
+ return new InvokeGetResponse(UnavailableExceptionDuringProcessActionPortlet.actionURL);
}
- if (HttpTestContext.getCurrentRequestCount() == 4)
+ else if (HttpTestContext.getCurrentRequestCount() == 4)
{
//Just repaint
PortletURL url = resp.createRenderURL();
- InvokeGetResponse result = new InvokeGetResponse(url.toString());
- marshall(result);
+ return new InvokeGetResponse(url.toString());
}
else if (HttpTestContext.isCurrentRequestCount(5))
{
- DriverResponse dr = bilto(new Runnable()
- {
- public void run()
- {
- //portlets that shouldn't render itself after Exception in Action Phase
- ExtendedAssert.assertEquals(false, PortletExceptionDuringRequestHandlingPortlet.rendered);
- ExtendedAssert.assertEquals(false, RuntimeExceptionDuringRequestHandlingPortlet.rendered);
- ExtendedAssert.assertEquals(false, UnavailableExceptionDuringProcessActionPortlet.rendered);
+ //portlets that shouldn't render itself after Exception in Action Phase
+ ExtendedAssert.assertEquals(false, PortletExceptionDuringRequestHandlingPortlet.rendered);
+ ExtendedAssert.assertEquals(false, RuntimeExceptionDuringRequestHandlingPortlet.rendered);
+ ExtendedAssert.assertEquals(false, UnavailableExceptionDuringProcessActionPortlet.rendered);
- //and should be destroyed because of UnavailableException was throwed
- ExtendedAssert.assertEquals(true, UnavailableExceptionDuringProcessActionPortlet.destroyed);
- ExtendedAssert.assertEquals(true, UnavailableExceptionDuringRenderPortlet.destroyed);
- }
- }, new EndTestResponse());
- marshall(dr);
+ //and should be destroyed because of UnavailableException was throwed
+ ExtendedAssert.assertEquals(true, UnavailableExceptionDuringProcessActionPortlet.destroyed);
+ ExtendedAssert.assertEquals(true, UnavailableExceptionDuringRenderPortlet.destroyed);
+
+ //
+ return new EndTestResponse();
}
+ else
+ {
+ return null;
+ }
}
}
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-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java 2006-11-01 16:02:04 UTC (rev 5548)
@@ -26,13 +26,12 @@
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;
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.components.AbstractTestPortlet;
import javax.portlet.PortletException;
import javax.portlet.PortletMode;
-import javax.portlet.PortletSecurityException;
import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -48,95 +47,71 @@
public class MinimizedStateDontRenderPortlet extends AbstractTestGenericPortlet
{
- private DriverResponse ares;
+ private String rendered;
- protected void doView(final RenderRequest request, RenderResponse response) throws PortletException, PortletSecurityException, IOException
+ protected void doView(final RenderRequest request, RenderResponse response) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(1))
- {
- //shouldn't be here
- ares = new FailureResponse();
- }
+ // Shouldn't be here
+ rendered = "doView";
}
- protected void doEdit(final RenderRequest request, RenderResponse response) throws PortletException, PortletSecurityException, IOException
+ protected void doEdit(final RenderRequest request, RenderResponse response) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(2))
- {
- //shouldn't be here
- ares = new FailureResponse();
- }
+ // Shouldn't be here
+ rendered = "doEdit";
}
- protected void doHelp(final RenderRequest request, RenderResponse response) throws PortletException, PortletSecurityException, IOException
+ protected void doHelp(final RenderRequest request, RenderResponse response) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentRequestCount(3))
- {
- //shouldn't be here
- ares = new FailureResponse();
- }
+ // Shouldn't be here
+ rendered = "doHelp";
}
- protected void preRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected void preRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
+ rendered = null;
+ }
- if (ares == null)
+ protected DriverResponse postRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ {
+ if (HttpTestContext.isCurrentRequestCount(0))
{
- if (HttpTestContext.isCurrentRequestCount(0))
- {
- PortletURL url = resp.createRenderURL();
- //invoking VIEW mode
- url.setPortletMode(PortletMode.VIEW);
- url.setWindowState(WindowState.MINIMIZED);
- InvokeGetResponse result = new InvokeGetResponse(url.toString());
- AbstractTestPortlet.marshall(result);
-
- //set not null ares - becouse doRenderInit is invoked for every render request
- ares = new EndTestResponse();
- }
- else
- {
- AbstractTestPortlet.marshall(new FailureResponse("The assert result was expected to be not null"));
- }
+ // Invoking VIEW mode
+ PortletURL url = resp.createRenderURL();
+ url.setPortletMode(PortletMode.VIEW);
+ url.setWindowState(WindowState.MINIMIZED);
+ return new InvokeGetResponse(url.toString());
}
- else
+ else if (HttpTestContext.isCurrentRequestCount(1))
{
- if (HttpTestContext.isCurrentRequestCount(0))
- {
- AbstractTestPortlet.marshall(new FailureResponse("The assert result was expected to be not null"));
- }
+ 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 (HttpTestContext.isCurrentRequestCount(2))
+ {
+ ExtendedAssert.assertNull(rendered);
- protected void postRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
- {
- if (ares instanceof FailureResponse || HttpTestContext.isCurrentRequestCount(3))
+ // Invoking HELP mode
+ PortletURL url = resp.createRenderURL();
+ url.setPortletMode(PortletMode.HELP);
+ url.setWindowState(WindowState.MINIMIZED);
+ return new InvokeGetResponse(url.toString());
+ }
+ else if (HttpTestContext.isCurrentRequestCount(3))
{
- AbstractTestPortlet.marshall(ares);
+ ExtendedAssert.assertNull(rendered);
+
+ //
+ return new EndTestResponse();
}
else
{
- if (HttpTestContext.isCurrentRequestCount(1))
- {
- PortletURL url = resp.createRenderURL();
- //invoking EDIT mode
- url.setPortletMode(PortletMode.EDIT);
- url.setWindowState(WindowState.MINIMIZED);
- InvokeGetResponse result = new InvokeGetResponse(url.toString());
- AbstractTestPortlet.marshall(result);
- }
- else if (HttpTestContext.isCurrentRequestCount(2))
- {
- PortletURL url = resp.createRenderURL();
- //invoking HELP mode
- url.setPortletMode(PortletMode.HELP);
- url.setWindowState(WindowState.MINIMIZED);
- InvokeGetResponse result = new InvokeGetResponse(url.toString());
- AbstractTestPortlet.marshall(result);
- }
+ return new EndTestResponse();
}
-
-
}
-
}
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-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2006-11-01 16:02:04 UTC (rev 5548)
@@ -24,11 +24,11 @@
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
+import org.jboss.portal.common.test.driver.DriverResponse;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -46,26 +46,27 @@
*/
public class PortletExceptionDuringRequestHandlingPortlet extends AbstractTestPortlet
{
- //This is static becouse value is shared beetween portlet instances
+ // This is static becouse value is shared beetween portlet instances
public static boolean rendered;
public static boolean destroyed;
public static String actionURL = "";
- //we override this to force 3 Portlets to have same test id
+ // We override this to force 3 Portlets to have same test id
protected String createCaseTestId(Class clazz)
{
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected void doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
if (HttpTestContext.isCurrentRequestCount(2))
{
throw new PortletException();
}
+ return null;
}
- protected void doRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
if (HttpTestContext.isCurrentRequestCount(0))
{
@@ -76,12 +77,11 @@
{
PortletExceptionDuringRequestHandlingPortlet.rendered = true;
}
+ return null;
}
public void destroy()
{
PortletExceptionDuringRequestHandlingPortlet.destroyed = 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-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2006-11-01 16:02:04 UTC (rev 5548)
@@ -24,11 +24,11 @@
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
+import org.jboss.portal.common.test.driver.DriverResponse;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -59,15 +59,16 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected void doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
if (HttpTestContext.isCurrentRequestCount(3))
{
//throw new RuntimeException();
}
+ return null;
}
- protected void doRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
if (HttpTestContext.isCurrentRequestCount(0))
{
@@ -78,12 +79,11 @@
{
RuntimeExceptionDuringRequestHandlingPortlet.rendered = true;
}
+ return null;
}
public void destroy()
{
RuntimeExceptionDuringRequestHandlingPortlet.destroyed = 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-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2006-11-01 16:02:04 UTC (rev 5548)
@@ -24,6 +24,7 @@
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
+import org.jboss.portal.common.test.driver.DriverResponse;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -45,26 +46,28 @@
*/
public class UnavailableExceptionDuringProcessActionPortlet extends AbstractTestPortlet
{
- //This is static becouse value is shared beetween portlet instances
+
+ // This is static becouse value is shared beetween portlet instances
public static boolean rendered;
public static boolean destroyed;
public static String actionURL = "";
- //we override this to force 3 Portlets to have same test id
+ // We override this to force 3 Portlets to have same test id
protected String createCaseTestId(Class clazz)
{
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected void doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
if (HttpTestContext.isCurrentRequestCount(4))
{
//throw new UnavailableException("UnavailableException thrown during action phase for testing purposes");
}
+ return null;
}
- protected void doRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
if (HttpTestContext.isCurrentRequestCount(0))
{
@@ -75,12 +78,11 @@
{
UnavailableExceptionDuringProcessActionPortlet.rendered = true;
}
+ return null;
}
public void destroy()
{
UnavailableExceptionDuringProcessActionPortlet.destroyed = 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-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2006-11-01 16:02:04 UTC (rev 5548)
@@ -24,9 +24,9 @@
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
+import org.jboss.portal.common.test.driver.DriverResponse;
import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.UnavailableException;
@@ -52,13 +52,13 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
-
- protected void doRender(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
if (HttpTestContext.isCurrentRequestCount(0))
{
throw new UnavailableException("UnavailableException thrown during render phase for testing purposes");
}
+ return null;
}
public void destroy()
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-01 14:59:10 UTC (rev 5547)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java 2006-11-01 16:02:04 UTC (rev 5548)
@@ -23,11 +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.components.AbstractTestPortlet;
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.DriverResponse;
import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
@@ -78,15 +78,14 @@
methodCall = null;
}
- protected void postRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ protected DriverResponse postRender(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
if (HttpTestContext.isCurrentRequestCount(0))
{
// Invoking VIEW mode
PortletURL url = resp.createRenderURL();
url.setPortletMode(PortletMode.VIEW);
- InvokeGetResponse result = new InvokeGetResponse(url.toString());
- AbstractTestPortlet.marshall(result);
+ return new InvokeGetResponse(url.toString());
}
else if (HttpTestContext.isCurrentRequestCount(1))
{
@@ -95,8 +94,7 @@
// Invoking EDIT mode
PortletURL url = resp.createRenderURL();
url.setPortletMode(PortletMode.EDIT);
- InvokeGetResponse result = new InvokeGetResponse(url.toString());
- AbstractTestPortlet.marshall(result);
+ return new InvokeGetResponse(url.toString());
}
else if (HttpTestContext.isCurrentRequestCount(2))
{
@@ -105,16 +103,19 @@
// Invoking HELP mode
PortletURL url = resp.createRenderURL();
url.setPortletMode(PortletMode.HELP);
- InvokeGetResponse result = new InvokeGetResponse(url.toString());
- AbstractTestPortlet.marshall(result);
+ return new InvokeGetResponse(url.toString());
}
else if (HttpTestContext.isCurrentRequestCount(3))
{
ExtendedAssert.assertEquals("doHelp", methodCall);
//
- AbstractTestPortlet.marshall(new EndTestResponse());
+ return new EndTestResponse();
}
+ else
+ {
+ return new EndTestResponse();
+ }
}
}
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-01 14:59:10 UTC (rev 5547)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2006-11-01 16:02:04 UTC (rev 5548)
@@ -160,6 +160,10 @@
public void setResponse(DriverResponse response)
{
+// if (response == null)
+// {
+// throw new IllegalArgumentException();
+// }
if (this.response != null)
{
throw new IllegalStateException("A response is already provided");
More information about the jboss-svn-commits
mailing list