Author: julien(a)jboss.com
Date: 2008-03-10 05:45:04 -0400 (Mon, 10 Mar 2008)
New Revision: 10252
Modified:
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java
Log:
minor refactoring
Modified:
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java
===================================================================
---
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java 2008-03-09
22:35:43 UTC (rev 10251)
+++
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java 2008-03-10
09:45:04 UTC (rev 10252)
@@ -26,8 +26,11 @@
import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.portlet.controller.state.PageNavigationalState;
import org.jboss.portal.portlet.controller.state.StateControllerContext;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl;
import org.jboss.portal.portlet.controller.event.EventControllerContext;
+import org.jboss.portal.portlet.controller.request.ControllerRequest;
+import org.jboss.portal.portlet.controller.request.PortletActionRequest;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.EventInvocation;
@@ -35,8 +38,10 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.PortletContext;
+import org.jboss.portal.portlet.OpaqueStateString;
import org.jboss.portal.portlet.support.PortletInvokerSupport;
import org.jboss.portal.portlet.support.PortletSupport;
+import org.jboss.portal.common.util.ParameterMap;
import javax.servlet.http.Cookie;
import java.util.List;
@@ -131,4 +136,15 @@
{
return stateControllerContext;
}
+
+ public ControllerRequest createActionRequest(String windowId)
+ {
+ return new PortletActionRequest(
+ windowId,
+ new OpaqueStateString(""),
+ new ParameterMap(),
+ new WindowNavigationalState(),
+ getStateControllerContext().createPageNavigationalState(false)
+ );
+ }
}
Modified:
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java
===================================================================
---
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-03-09
22:35:43 UTC (rev 10251)
+++
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-03-10
09:45:04 UTC (rev 10252)
@@ -23,8 +23,6 @@
package org.jboss.portal.portlet.controller;
import org.jboss.portal.portlet.controller.request.ControllerRequest;
-import org.jboss.portal.portlet.controller.request.PortletActionRequest;
-import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
import org.jboss.portal.portlet.controller.state.PageNavigationalState;
import org.jboss.portal.portlet.controller.response.ControllerResponse;
import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
@@ -32,7 +30,6 @@
import org.jboss.portal.portlet.controller.event.EventPhaseContext;
import org.jboss.portal.portlet.controller.event.Event;
import org.jboss.portal.portlet.controller.event.AbstractEventControllerContext;
-import org.jboss.portal.portlet.OpaqueStateString;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.support.PortletSupport;
import org.jboss.portal.portlet.support.PortletInvokerSupport;
@@ -41,7 +38,6 @@
import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.EventInvocation;
-import org.jboss.portal.common.util.ParameterMap;
import org.jboss.portal.common.util.Tools;
import org.jboss.unit.api.pojo.annotations.Test;
import org.jboss.unit.api.pojo.annotations.Create;
@@ -88,30 +84,18 @@
}
});
- ControllerRequest request = new PortletActionRequest(
- "foo",
- new OpaqueStateString(""),
- new ParameterMap(),
- new WindowNavigationalState(),
- context.getStateControllerContext().createPageNavigationalState(false)
- );
-
+ //
+ ControllerRequest request = context.createActionRequest("foo");
ControllerResponse response = controller.process(context, request);
-
PageUpdateResponse pageUpdate = assertInstanceOf(response,
PageUpdateResponse.class);
-
PageNavigationalState pageNS =
assertNotNull(pageUpdate.getPageNavigationalState());
-
assertEquals(Tools.toSet("foo"), pageNS.getWindowIds());
-
}
@Test
public void testActionThrowsPortletInvokerException() throws PortletInvokerException
{
-
final PortletInvokerException e = new PortletInvokerException();
-
PortletSupport fooPortlet = invoker.addPortlet("foo");
fooPortlet.addHandler(new PortletSupport.ActionHandler()
{
@@ -122,13 +106,7 @@
});
//
- ControllerRequest request = new PortletActionRequest(
- "foo",
- new OpaqueStateString(""),
- new ParameterMap(),
- new WindowNavigationalState(),
- context.getStateControllerContext().createPageNavigationalState(false)
- );
+ ControllerRequest request = context.createActionRequest("foo");
try
{
@@ -147,28 +125,14 @@
{
QName srcName = new QName("juu", "foo");
QName dstName = new QName("juu", "bar");
-
- //
PortletSupport fooPortlet = invoker.addPortlet("foo");
PortletSupport barPortlet = invoker.addPortlet("bar");
-
- //
EventProducerActionHandler eventProducerHandler = new
EventProducerActionHandler(srcName);
NoOpEventProcessor eventConsumer = new NoOpEventProcessor();
-
- // Create wire
eventControllerContext.createWire(srcName, "foo", dstName,
"bar");
+ ControllerRequest request = context.createActionRequest("foo");
//
- ControllerRequest request = new PortletActionRequest(
- "foo",
- new OpaqueStateString(""),
- new ParameterMap(),
- new WindowNavigationalState(),
- context.getStateControllerContext().createPageNavigationalState(false)
- );
-
- //
controller.setDistributeNonProduceableEvents(true);
controller.setDistributeNonConsumableEvents(true);
fooPortlet.addHandler(eventProducerHandler);
@@ -248,21 +212,11 @@
public void testEventFloodDetection() throws PortletInvokerException
{
QName srcName = new QName("juu", "foo");
-
- //
PortletSupport fooPortlet = invoker.addPortlet("foo");
-
- // Create wire
eventControllerContext.createWire(srcName, "foo", srcName,
"foo");
+ ControllerRequest request = context.createActionRequest("foo");
- ControllerRequest request = new PortletActionRequest(
- "foo",
- new OpaqueStateString(""),
- new ParameterMap(),
- new WindowNavigationalState(),
- context.getStateControllerContext().createPageNavigationalState(false)
- );
-
+ //
EventProducerActionHandler eventProducerActionHandler = new
EventProducerActionHandler(srcName);
EventProducerEventHandler eventProducerEventHandler = new
EventProducerEventHandler(srcName);
@@ -289,21 +243,10 @@
public void testEventFloodInterruption() throws PortletInvokerException
{
QName srcName = new QName("juu", "foo");
-
- //
PortletSupport fooPortlet = invoker.addPortlet("foo");
-
- // Create wire
eventControllerContext.createWire(srcName, "foo", srcName,
"foo");
+ ControllerRequest request = context.createActionRequest("foo");
- ControllerRequest request = new PortletActionRequest(
- "foo",
- new OpaqueStateString(""),
- new ParameterMap(),
- new WindowNavigationalState(),
- context.getStateControllerContext().createPageNavigationalState(false)
- );
-
//
EventProducerActionHandler eventProducerActionHandler = new
EventProducerActionHandler(srcName);
@@ -327,25 +270,14 @@
public void testEventControllerContextFails() throws PortletInvokerException
{
QName srcName = new QName("juu", "foo");
-
- //
PortletSupport fooPortlet = invoker.addPortlet("foo");
-
- // Create wire
eventControllerContext.createWire(srcName, "foo", srcName,
"foo");
+ ControllerRequest request = context.createActionRequest("foo");
- ControllerRequest request = new PortletActionRequest(
- "foo",
- new OpaqueStateString(""),
- new ParameterMap(),
- new WindowNavigationalState(),
- context.getStateControllerContext().createPageNavigationalState(false)
- );
-
//
EventProducerActionHandler eventProducerActionHandler = new
EventProducerActionHandler(srcName);
- //
+ // We test that a runtime exception thrown does not interrrupt the flow of the
controller
controller.setConsumedEventThreshold(10);
controller.setProducedEventThreshold(10);
context.setEventControllerContext(new AbstractEventControllerContext()
@@ -360,7 +292,7 @@
PageUpdateResponse updateResponse = assertInstanceOf(response,
PageUpdateResponse.class);
assertEquals(PortletResponse.DISTRIBUTION_DONE,
updateResponse.getEventDistributionStatus());
- //
+ // We test than an error thrown interrupts the flow of the controller
final Error error = new Error();
context.setEventControllerContext(new AbstractEventControllerContext()
{