JBoss Portal SVN: r10267 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-12 01:39:42 -0400 (Wed, 12 Mar 2008)
New Revision: 10267
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java
Log:
- Made getInitParameters public (returning an immutable Map).
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2008-03-12 05:17:41 UTC (rev 10266)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2008-03-12 05:39:42 UTC (rev 10267)
@@ -191,9 +191,9 @@
return initParameters.get(name);
}
- protected Map<String, String> getInitParameters()
+ public Map<String, String> getInitParameters()
{
- return initParameters;
+ return Collections.unmodifiableMap(initParameters);
}
public List<String> getFilterRefs()
16 years, 3 months
JBoss Portal SVN: r10266 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-12 01:17:41 -0400 (Wed, 12 Mar 2008)
New Revision: 10266
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java
Log:
- Added protected access to constructor and init parameters for easier subclassing.
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2008-03-12 05:13:44 UTC (rev 10265)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2008-03-12 05:17:41 UTC (rev 10266)
@@ -22,13 +22,13 @@
******************************************************************************/
package org.jboss.portal.portlet.impl.info;
+import org.jboss.portal.common.i18n.ResourceBundleManager;
import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.common.i18n.ResourceBundleManager;
+import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.List;
-import java.util.Collections;
/**
* For now implementation that use the portlet container directly.
@@ -108,7 +108,7 @@
this.security = security;
this.cache = cache;
this.session = session;
- this.events = new ContainerEventingInfo();
+ this.events = new ContainerEventingInfo();
this.navigation = new ContainerNavigationInfo();
this.filterRefs = Collections.emptyList();
this.name = name;
@@ -120,7 +120,7 @@
this.options = Collections.emptyMap();
}
- ContainerPortletInfo(
+ protected ContainerPortletInfo(
ContainerCapabilitiesInfo capabilities,
ContainerPreferencesInfo preferences,
ContainerMetaInfo meta,
@@ -144,7 +144,7 @@
this.security = security;
this.cache = cache;
this.session = session;
- this.events = events;
+ this.events = events;
this.navigation = navigation;
this.filterRefs = filterRefs;
this.name = name;
@@ -191,6 +191,11 @@
return initParameters.get(name);
}
+ protected Map<String, String> getInitParameters()
+ {
+ return initParameters;
+ }
+
public List<String> getFilterRefs()
{
return filterRefs;
16 years, 3 months
JBoss Portal SVN: r10265 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-12 01:13:44 -0400 (Wed, 12 Mar 2008)
New Revision: 10265
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java
Log:
- Minor.
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java 2008-03-11 21:51:14 UTC (rev 10264)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java 2008-03-12 05:13:44 UTC (rev 10265)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -24,14 +24,14 @@
import org.jboss.portal.common.invocation.AbstractInvocationContext;
import org.jboss.portal.common.util.MarkupInfo;
-import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.portlet.ContainerURL;
import org.jboss.portal.portlet.URLFormat;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.io.Writer;
-import java.io.IOException;
/**
* An abstract implementation that relies on the a request and response provided by the client (i.e the portal).
@@ -90,10 +90,11 @@
}
/**
- * Delegates the URL rendendition to the method {@link #renderURL(org.jboss.portal.portlet.ContainerURL,org.jboss.portal.portlet.URLFormat)} and
- * then invoke the {@link java.io.Writer#write(String)} method with the returned result.
+ * Delegates the URL rendition to the method {@link #renderURL(org.jboss.portal.portlet.ContainerURL,org.jboss.portal.portlet.URLFormat)}
+ * and then invoke the {@link java.io.Writer#write(String)} method with the returned result.
*
- * @see org.jboss.portal.portlet.spi.PortletInvocationContext#renderURL(org.jboss.portal.portlet.ContainerURL, org.jboss.portal.portlet.URLFormat)
+ * @see org.jboss.portal.portlet.spi.PortletInvocationContext#renderURL(org.jboss.portal.portlet.ContainerURL,
+ * org.jboss.portal.portlet.URLFormat)
*/
public void renderURL(Writer writer, ContainerURL containerURL, URLFormat format) throws IOException
{
16 years, 3 months
JBoss Portal SVN: r10264 - branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-03-11 17:51:14 -0400 (Tue, 11 Mar 2008)
New Revision: 10264
Modified:
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java
Log:
JBPORTAL-1872: Last-Modified Header Fix (Testcase)
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java 2008-03-11 19:56:33 UTC (rev 10263)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java 2008-03-11 21:51:14 UTC (rev 10264)
@@ -84,6 +84,7 @@
assertEquals("Language Incorrect", content.getLocale().getLanguage(), "en");
assertEquals("Title Incorrect", content.getTitle(), "English Title");
assertEquals("Desc Incorrect", content.getDescription(), "English Description");
+ assertNotNull("Last Modified Date Missing", content.getLastModified());
}
/**
16 years, 3 months
JBoss Portal SVN: r10263 - in branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp: v1/consumer and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-11 15:56:33 -0400 (Tue, 11 Mar 2008)
New Revision: 10263
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/BasicUserContext.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
Log:
- Update WSRP tests to PC 2.0 (somehow forgot to do that earlier)
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/BasicUserContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/BasicUserContext.java 2008-03-11 14:03:31 UTC (rev 10262)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/BasicUserContext.java 2008-03-11 19:56:33 UTC (rev 10263)
@@ -23,11 +23,12 @@
package org.jboss.portal.test.wsrp.framework.support;
-import org.jboss.portal.portlet.support.spi.UserContextSupport;
+import org.jboss.portal.portlet.spi.UserContext;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
/**
* @author <a href="mailto:chris.laprun@jboss.com?subject=org.jboss.portal.test.wsrp.framework.support.BasicUserContext">Chris
@@ -35,7 +36,7 @@
* @version $Revision$
* @since 2.4
*/
-public class BasicUserContext extends UserContextSupport
+public class BasicUserContext implements UserContext
{
public String getId()
@@ -43,6 +44,11 @@
return null;
}
+ public Map<String, String> getInformations()
+ {
+ return null;
+ }
+
public Locale getLocale()
{
return Locale.ENGLISH;
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java 2008-03-11 14:03:31 UTC (rev 10262)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java 2008-03-11 19:56:33 UTC (rev 10263)
@@ -23,19 +23,16 @@
package org.jboss.portal.test.wsrp.framework.support;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
import org.jboss.portal.common.invocation.resolver.RequestAttributeResolver;
import org.jboss.portal.common.util.MarkupInfo;
import org.jboss.portal.common.util.MediaType;
import org.jboss.portal.common.util.ParameterMap;
-import org.jboss.portal.portlet.PortletURL;
+import org.jboss.portal.portlet.ContainerURL;
import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.URLFormat;
import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.spi.ActionContext;
import org.jboss.portal.portlet.spi.PortletInvocationContext;
-import org.jboss.portal.portlet.spi.RenderContext;
import org.jboss.portal.wsrp.WSRPConstants;
import javax.servlet.http.HttpServletRequest;
@@ -51,20 +48,15 @@
* @version $Revision$
* @since 2.4
*/
-public class TestPortletInvocationContext extends AbstractPortletInvocationContext
- implements PortletInvocationContext, RenderContext, ActionContext
+public class TestPortletInvocationContext extends AbstractPortletInvocationContext implements PortletInvocationContext
{
private HttpServletRequest mockRequest;
private HttpServletResponse mockResponse;
- public TestPortletInvocationContext(Mode mode, WindowState state, String ns)
+ public TestPortletInvocationContext()
{
- super(
- mode != null ? mode : Mode.VIEW,
- state != null ? state : WindowState.MAXIMIZED,
- StateString.createFrom(ns),
- new MarkupInfo(MediaType.HTML, WSRPConstants.DEFAULT_CHARACTER_SET));
+ super(new MarkupInfo(MediaType.HTML, WSRPConstants.DEFAULT_CHARACTER_SET));
ClassLoader classLoader = getClass().getClassLoader();
HttpSession session = (HttpSession)Proxy.newProxyInstance(classLoader, new Class[]{HttpSession.class},
@@ -110,7 +102,7 @@
return null;
}
- public String renderURL(PortletURL portletURL, Boolean wantSecure, Boolean wantAuthenticated, boolean relative)
+ public String renderURL(ContainerURL containerURL, URLFormat urlFormat)
{
return null;
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2008-03-11 14:03:31 UTC (rev 10262)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2008-03-11 19:56:33 UTC (rev 10263)
@@ -26,6 +26,7 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
import org.jboss.portal.common.junit.ExtendedAssert;
+import org.jboss.portal.portlet.OpaqueStateString;
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.invocation.ActionInvocation;
@@ -94,11 +95,11 @@
RenderInvocation render = createRenderInvocation(BasicMarkupBehavior.PORTLET_HANDLE, Mode.EDIT,
WindowState.NORMAL, "someNS");
FragmentResponse result = checkRenderResult(consumer.invoke(render), "portlet1:edit:normal:someNS");
- ExtendedAssert.assertEquals(15, result.getExpirationSecs());
+ ExtendedAssert.assertEquals(15, result.getCacheControl().getExpirationSecs());
render = createRenderInvocation(SessionMarkupBehavior.PORTLET_HANDLE);
result = checkRenderResult(consumer.invoke(render), "portlet2:0:view:maximized");
- ExtendedAssert.assertEquals(0, result.getExpirationSecs());
+ ExtendedAssert.assertEquals(0, result.getCacheControl().getExpirationSecs());
}
public void testAction() throws Exception
@@ -208,11 +209,14 @@
{
if (invocationContext == null)
{
- invocationContext = new TestPortletInvocationContext(mode, state, navigationalState);
+ invocationContext = new TestPortletInvocationContext();
}
RenderInvocation render = new RenderInvocation(invocationContext);
render.setTarget(PortletContext.createPortletContext(portletHandle));
+ render.setMode(mode);
+ render.setWindowState(state);
+ render.setNavigationalState(new OpaqueStateString(navigationalState));
render.setInstanceContext(new BasicInstanceContext(portletHandle));
render.setSecurityContext(new BasicSecurityContext());
@@ -229,7 +233,7 @@
private ActionInvocation createActionInvocation(String portletHandle)
{
- TestPortletInvocationContext ac = new TestPortletInvocationContext(Mode.VIEW, WindowState.NORMAL, null);
+ TestPortletInvocationContext ac = new TestPortletInvocationContext();
ActionInvocation action = new ActionInvocation(ac);
action.setInstanceContext(new BasicInstanceContext(portletHandle));
action.setSecurityContext(new BasicSecurityContext());
16 years, 3 months
JBoss Portal SVN: r10262 - in modules/portlet/trunk: controller/src/main/java/org/jboss/portal/portlet/controller/event and 3 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-11 10:03:31 -0400 (Tue, 11 Mar 2008)
New Revision: 10262
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java
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/WiringEventControllerContext.java
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java
Log:
make event controller context API more symetric
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java 2008-03-11 13:07:37 UTC (rev 10261)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java 2008-03-11 14:03:31 UTC (rev 10262)
@@ -44,7 +44,7 @@
{
try
{
- controllerContext.eventProduced(phaseContext, sourceEvent, producedEvent);
+ controllerContext.eventProduced(phaseContext, producedEvent, sourceEvent);
//
return true;
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java 2008-03-11 13:07:37 UTC (rev 10261)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java 2008-03-11 14:03:31 UTC (rev 10262)
@@ -32,7 +32,7 @@
*/
public class AbstractEventControllerContext implements EventControllerContext
{
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent)
{
}
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java 2008-03-11 13:07:37 UTC (rev 10261)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java 2008-03-11 14:03:31 UTC (rev 10262)
@@ -67,10 +67,10 @@
* to the portlet controller invoker.</p>
*
* @param context the session
+ * @param producedEvent the produced event
* @param sourceEvent the source event
- * @param producedEvent the produced event
*/
- void eventProduced(EventPhaseContext context, Event sourceEvent, Event producedEvent);
+ void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent);
/**
* <p>Context call back when an event is consumed by a portlet. The session argument
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java 2008-03-11 13:07:37 UTC (rev 10261)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java 2008-03-11 14:03:31 UTC (rev 10262)
@@ -46,7 +46,7 @@
this.invoker = invoker;
}
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent)
{
try
{
Modified: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java
===================================================================
--- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java 2008-03-11 13:07:37 UTC (rev 10261)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java 2008-03-11 14:03:31 UTC (rev 10262)
@@ -148,7 +148,7 @@
{
AbstractEventControllerContext ecc = new AbstractEventControllerContext()
{
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent)
{
called = true;
throw new RuntimeException();
@@ -168,7 +168,7 @@
final Error error = new Error();
ecc = new AbstractEventControllerContext()
{
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent)
{
called = true;
throw error;
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-11 13:07:37 UTC (rev 10261)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-03-11 14:03:31 UTC (rev 10262)
@@ -353,7 +353,7 @@
controller.setProducedEventThreshold(10);
context.setEventControllerContext(new AbstractEventControllerContext()
{
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent)
{
context.interrupt();
}
Modified: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java
===================================================================
--- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java 2008-03-11 13:07:37 UTC (rev 10261)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java 2008-03-11 14:03:31 UTC (rev 10262)
@@ -49,7 +49,7 @@
/** . */
private final List<EventCallback> callbacks = new LinkedList<EventCallback>();
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent)
{
List<Coordinate> dsts = wires.get(new Coordinate(producedEvent.getName(), producedEvent.getWindowId()));
Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2008-03-11 13:07:37 UTC (rev 10261)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2008-03-11 14:03:31 UTC (rev 10262)
@@ -54,7 +54,7 @@
this.prepareResponse = prepareResponse;
}
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent)
{
for (String windowId : prepareResponse.getWindowIds())
{
16 years, 3 months
JBoss Portal SVN: r10261 - in modules/portlet/trunk: controller/src/test/resources and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-11 09:07:37 -0400 (Tue, 11 Mar 2008)
New Revision: 10261
Added:
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java
Modified:
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java
modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java
Log:
more controller testing
Added: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java
===================================================================
--- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java (rev 0)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java 2008-03-11 13:07:37 UTC (rev 10261)
@@ -0,0 +1,190 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.controller;
+
+import static org.jboss.unit.api.Assert.*;
+import org.jboss.unit.api.pojo.annotations.Test;
+import org.jboss.portal.portlet.support.PortletInvokerSupport;
+import org.jboss.portal.portlet.support.PortletSupport;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.invocation.ResourceInvocation;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.OpaqueStateString;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.cache.CacheLevel;
+import org.jboss.portal.portlet.controller.request.PortletActionRequest;
+import org.jboss.portal.portlet.controller.request.PortletResourceRequest;
+import org.jboss.portal.portlet.controller.request.PortletRenderRequest;
+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.common.util.ParameterMap;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+
+import java.util.Collections;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+@Test
+public class PortletControllerRequestTestCase
+{
+
+ /** . */
+ PortletController controller = new PortletController();
+
+ /** . */
+ PortletControllerContextSupport context = new PortletControllerContextSupport();
+
+ /** . */
+ WiringEventControllerContext eventControllerContext = new WiringEventControllerContext();
+
+ /** . */
+ PortletInvokerSupport invoker = context.getInvoker();
+
+ /** . */
+ PageNavigationalState pageNS = context.getStateControllerContext().createPageNavigationalState(false);
+
+ /** . */
+ StateString portletNS = new OpaqueStateString("abc");
+
+ /** . */
+ WindowNavigationalState windowNS = new WindowNavigationalState(portletNS, Mode.EDIT, WindowState.MAXIMIZED);
+
+ /** . */
+ ParameterMap body = new ParameterMap(Collections.singletonMap("param", new String[]{"value"}));
+
+ /** . */
+ OpaqueStateString is = new OpaqueStateString("is");
+
+ /** . */
+ OpaqueStateString rs = new OpaqueStateString("rs");
+
+ @Test
+ public void testPortletControllerActionRequest() throws PortletInvokerException
+ {
+ PortletSupport fooPortlet = invoker.addPortlet("foo");
+ fooPortlet.addHandler(new PortletSupport.ActionHandler()
+ {
+ protected PortletInvocationResponse invoke(ActionInvocation action) throws PortletInvokerException
+ {
+ assertNotNull(action);
+ assertEquals(is, action.getInteractionState());
+ assertEquals(portletNS, action.getNavigationalState());
+ assertEquals(Mode.EDIT, action.getMode());
+ assertEquals(WindowState.MAXIMIZED, action.getWindowState());
+ assertEquals(body, action.getForm());
+
+ //
+ return new UpdateNavigationalStateResponse();
+ }
+ });
+
+ //
+ PortletActionRequest action = new PortletActionRequest("foo", is, body, windowNS, pageNS);
+
+ //
+ controller.process(context, action);
+ }
+
+ @Test
+ public void testPortletControllerRenderRequest() throws PortletInvokerException
+ {
+ invoker.addPortlet("foo");
+ PortletRenderRequest render = new PortletRenderRequest("foo", windowNS, new HashMap<String, String[]>(), pageNS);
+ controller.process(context, render);
+ }
+
+ @Test
+ public void testPortletControllerResourceRequest() throws PortletInvokerException
+ {
+ PortletSupport fooPortlet = invoker.addPortlet("foo");
+ fooPortlet.addHandler(new PortletSupport.ResourceHandler()
+ {
+ protected PortletInvocationResponse invoke(ResourceInvocation resServing) throws PortletInvokerException
+ {
+ assertNotNull(resServing);
+ assertEquals("resourceid", resServing.getResourceId());
+ assertEquals(rs, resServing.getResourceState());
+ assertEquals(CacheLevel.FULL, resServing.getCacheLevel());
+ assertEquals(null, resServing.getNavigationalState());
+ assertEquals(Mode.VIEW, resServing.getMode());
+ assertEquals(WindowState.NORMAL, resServing.getWindowState());
+ assertEquals(body, resServing.getForm());
+
+ //
+ return new UpdateNavigationalStateResponse();
+ }
+ });
+ fooPortlet.addHandler(new PortletSupport.ResourceHandler()
+ {
+ protected PortletInvocationResponse invoke(ResourceInvocation resServing) throws PortletInvokerException
+ {
+ assertNotNull(resServing);
+ assertEquals("resourceid", resServing.getResourceId());
+ assertEquals(rs, resServing.getResourceState());
+ assertEquals(CacheLevel.PORTLET, resServing.getCacheLevel());
+ assertEquals(portletNS, resServing.getNavigationalState());
+ assertEquals(Mode.EDIT, resServing.getMode());
+ assertEquals(WindowState.MAXIMIZED, resServing.getWindowState());
+ assertEquals(body, resServing.getForm());
+
+ //
+ return new UpdateNavigationalStateResponse();
+ }
+ });
+ fooPortlet.addHandler(new PortletSupport.ResourceHandler()
+ {
+ protected PortletInvocationResponse invoke(ResourceInvocation resServing) throws PortletInvokerException
+ {
+ assertNotNull(resServing);
+ assertEquals("resourceid", resServing.getResourceId());
+ assertEquals(rs, resServing.getResourceState());
+ assertEquals(CacheLevel.PAGE, resServing.getCacheLevel());
+ assertEquals(portletNS, resServing.getNavigationalState());
+ assertEquals(Mode.EDIT, resServing.getMode());
+ assertEquals(WindowState.MAXIMIZED, resServing.getWindowState());
+ assertEquals(body, resServing.getForm());
+
+ //
+ return new UpdateNavigationalStateResponse();
+ }
+ });
+
+ //
+ PortletResourceRequest fullServing = new PortletResourceRequest("foo", "resourceid", rs, body, new PortletResourceRequest.FullScope());
+ PortletResourceRequest portletServing = new PortletResourceRequest("foo", "resourceid", rs, body, new PortletResourceRequest.PortletScope(windowNS));
+ PortletResourceRequest pageServing = new PortletResourceRequest("foo", "resourceid", rs, body, new PortletResourceRequest.PageScope(windowNS, pageNS));
+
+ //
+ controller.process(context, fullServing);
+ controller.process(context, portletServing);
+ controller.process(context, pageServing);
+ }
+
+}
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-11 10:59:19 UTC (rev 10260)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-03-11 13:07:37 UTC (rev 10261)
@@ -23,6 +23,7 @@
package org.jboss.portal.portlet.controller;
import org.jboss.portal.portlet.controller.request.ControllerRequest;
+import org.jboss.portal.portlet.controller.request.PortletRenderRequest;
import org.jboss.portal.portlet.controller.state.PageNavigationalState;
import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
import org.jboss.portal.portlet.controller.response.ControllerResponse;
@@ -36,6 +37,7 @@
import org.jboss.portal.portlet.controller.handlers.NoOpEventHandler;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.OpaqueStateString;
+import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.support.PortletSupport;
import org.jboss.portal.portlet.support.PortletInvokerSupport;
import org.jboss.portal.portlet.support.info.EventInfoSupport;
@@ -80,6 +82,25 @@
}
@Test
+ public void testPortletControllerRenderRequest() throws PortletInvokerException
+ {
+ invoker.addPortlet("foo");
+ StateString portletNS = new OpaqueStateString("abc");
+ PageNavigationalState pageNS = context.getStateControllerContext().createPageNavigationalState(true);
+ WindowNavigationalState windowNS = new WindowNavigationalState(portletNS, Mode.EDIT, WindowState.MAXIMIZED);
+ PortletRenderRequest render = new PortletRenderRequest("foo", windowNS, new HashMap<String, String[]>(), pageNS);
+ ControllerResponse response = controller.process(context, render);
+ PageUpdateResponse pageUpdate = assertInstanceOf(response, PageUpdateResponse.class);
+ PageNavigationalState pageNS2 = assertNotNull(pageUpdate.getPageNavigationalState());
+ assertEquals(Tools.toSet("foo"), pageNS2.getWindowIds());
+ WindowNavigationalState windowNS2 = pageNS2.getWindowNavigationalState("foo");
+ assertNotNull(windowNS2);
+ assertEquals(portletNS, windowNS2.getPortletNavigationalState());
+ assertEquals(Mode.EDIT, windowNS2.getMode());
+ assertEquals(WindowState.MAXIMIZED, windowNS2.getWindowState());
+ }
+
+ @Test
public void testAction() throws PortletInvokerException
{
testAction(false);
Modified: modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml
===================================================================
--- modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml 2008-03-11 10:59:19 UTC (rev 10260)
+++ modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml 2008-03-11 13:07:37 UTC (rev 10261)
@@ -13,5 +13,8 @@
<test>
<class name="org.jboss.portal.portlet.controller.PortletControllerRequestConstructorTestCase"/>
</test>
+ <test>
+ <class name="org.jboss.portal.portlet.controller.PortletControllerRequestTestCase"/>
+ </test>
</pojo>
</jboss-unit>
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java 2008-03-11 10:59:19 UTC (rev 10260)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java 2008-03-11 13:07:37 UTC (rev 10261)
@@ -25,12 +25,12 @@
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.support.info.PortletInfoSupport;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.EventInvocation;
import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.portlet.invocation.ResourceInvocation;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.common.value.Value;
import static org.jboss.unit.api.Assert.*;
@@ -201,4 +201,20 @@
protected abstract PortletInvocationResponse invoke(RenderInvocation action) throws PortletInvokerException;
}
+
+ public static abstract class ResourceHandler extends InvocationHandler
+ {
+ protected final PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
+ {
+ if (invocation instanceof ResourceInvocation)
+ {
+ return invoke((ResourceInvocation)invocation);
+ }
+
+ //
+ throw new AssertionError();
+ }
+
+ protected abstract PortletInvocationResponse invoke(ResourceInvocation action) throws PortletInvokerException;
+ }
}
16 years, 3 months
JBoss Portal SVN: r10260 - modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-11 06:59:19 -0400 (Tue, 11 Mar 2008)
New Revision: 10260
Modified:
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java
Log:
test that an event processing that updates NS, updates the page NS
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-11 10:41:04 UTC (rev 10259)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-03-11 10:59:19 UTC (rev 10260)
@@ -42,6 +42,7 @@
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
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.Tools;
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
@@ -81,6 +82,21 @@
@Test
public void testAction() throws PortletInvokerException
{
+ testAction(false);
+ }
+
+ @Test
+ public void testActionPublishesAnEvent() throws PortletInvokerException
+ {
+ testAction(true);
+ }
+
+ private void testAction(final boolean publishEvent) throws PortletInvokerException
+ {
+ final QName srcName = new QName("juu", "foo");
+ final QName dstName = new QName("juu", "bar");
+
+ //
PortletSupport fooPortlet = invoker.addPortlet("foo");
fooPortlet.addHandler(new PortletSupport.ActionHandler()
{
@@ -90,20 +106,68 @@
updateNS.setMode(Mode.EDIT);
updateNS.setWindowState(WindowState.MAXIMIZED);
updateNS.setNavigationalState(new OpaqueStateString("abc"));
+
+ //
+ if (publishEvent)
+ {
+ updateNS.queueEvent(new UpdateNavigationalStateResponse.Event(srcName, null));
+ }
+
+ //
return updateNS;
}
});
//
+ PortletSupport barPortlet = invoker.addPortlet("bar");
+ barPortlet.addHandler(new PortletSupport.EventHandler()
+ {
+ protected PortletInvocationResponse invoke(EventInvocation action) throws PortletInvokerException
+ {
+ assertEquals(dstName, action.getName());
+ assertEquals(null, action.getPayload());
+
+ //
+ UpdateNavigationalStateResponse updateNS = new UpdateNavigationalStateResponse();
+ updateNS.setMode(Mode.HELP);
+ updateNS.setWindowState(WindowState.MINIMIZED);
+ updateNS.setNavigationalState(new OpaqueStateString("def"));
+
+ //
+ return updateNS;
+ }
+ });
+
+ //
+ eventControllerContext.createWire(srcName, "foo", dstName, "bar");
+
+ //
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());
+
+ //
WindowNavigationalState fooNS = assertNotNull(pageNS.getWindowNavigationalState("foo"));
assertEquals(WindowState.MAXIMIZED, fooNS.getWindowState());
assertEquals(Mode.EDIT, fooNS.getMode());
assertEquals(new OpaqueStateString("abc"), fooNS.getPortletNavigationalState());
+
+ //
+ if (publishEvent)
+ {
+ assertEquals(Tools.toSet("foo", "bar"), pageNS.getWindowIds());
+
+ //
+ WindowNavigationalState barNS = assertNotNull(pageNS.getWindowNavigationalState("bar"));
+ assertEquals(WindowState.MINIMIZED, barNS.getWindowState());
+ assertEquals(Mode.HELP, barNS.getMode());
+ assertEquals(new OpaqueStateString("def"), barNS.getPortletNavigationalState());
+ }
+ else
+ {
+ assertEquals(Tools.toSet("foo"), pageNS.getWindowIds());
+ }
}
@Test
16 years, 3 months
JBoss Portal SVN: r10259 - modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-11 06:41:04 -0400 (Tue, 11 Mar 2008)
New Revision: 10259
Modified:
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java
Log:
test that the updated NS is correctly done by the controller in case of a process action
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-11 00:51:36 UTC (rev 10258)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-03-11 10:41:04 UTC (rev 10259)
@@ -24,6 +24,7 @@
import org.jboss.portal.portlet.controller.request.ControllerRequest;
import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
import org.jboss.portal.portlet.controller.response.ControllerResponse;
import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
import org.jboss.portal.portlet.controller.response.PortletResponse;
@@ -34,6 +35,7 @@
import org.jboss.portal.portlet.controller.handlers.EventProducerEventHandler;
import org.jboss.portal.portlet.controller.handlers.NoOpEventHandler;
import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.OpaqueStateString;
import org.jboss.portal.portlet.support.PortletSupport;
import org.jboss.portal.portlet.support.PortletInvokerSupport;
import org.jboss.portal.portlet.support.info.EventInfoSupport;
@@ -41,11 +43,14 @@
import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
import org.jboss.unit.api.pojo.annotations.Test;
import org.jboss.unit.api.pojo.annotations.Create;
import static org.jboss.unit.api.Assert.*;
import javax.xml.namespace.QName;
+import java.util.HashMap;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -74,14 +79,18 @@
}
@Test
- public void testActionReturnsUpdateNavigationalState() throws PortletInvokerException
+ public void testAction() throws PortletInvokerException
{
PortletSupport fooPortlet = invoker.addPortlet("foo");
fooPortlet.addHandler(new PortletSupport.ActionHandler()
{
protected PortletInvocationResponse invoke(ActionInvocation action) throws PortletInvokerException
{
- return new UpdateNavigationalStateResponse();
+ UpdateNavigationalStateResponse updateNS = new UpdateNavigationalStateResponse();
+ updateNS.setMode(Mode.EDIT);
+ updateNS.setWindowState(WindowState.MAXIMIZED);
+ updateNS.setNavigationalState(new OpaqueStateString("abc"));
+ return updateNS;
}
});
@@ -91,6 +100,10 @@
PageUpdateResponse pageUpdate = assertInstanceOf(response, PageUpdateResponse.class);
PageNavigationalState pageNS = assertNotNull(pageUpdate.getPageNavigationalState());
assertEquals(Tools.toSet("foo"), pageNS.getWindowIds());
+ WindowNavigationalState fooNS = assertNotNull(pageNS.getWindowNavigationalState("foo"));
+ assertEquals(WindowState.MAXIMIZED, fooNS.getWindowState());
+ assertEquals(Mode.EDIT, fooNS.getMode());
+ assertEquals(new OpaqueStateString("abc"), fooNS.getPortletNavigationalState());
}
@Test
@@ -118,7 +131,6 @@
{
assertSame(e, ex);
}
-
}
@Test
16 years, 3 months
JBoss Portal SVN: r10258 - in modules/portlet/trunk/controller/src: test/java/org/jboss/portal/portlet/controller and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-10 20:51:36 -0400 (Mon, 10 Mar 2008)
New Revision: 10258
Added:
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestConstructorTestCase.java
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java
modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml
Log:
test the various portlet controller request constructors
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java 2008-03-11 00:17:40 UTC (rev 10257)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java 2008-03-11 00:51:36 UTC (rev 10258)
@@ -23,6 +23,8 @@
package org.jboss.portal.portlet.controller.request;
/**
+ * Any request made to a portlet container.
+ *
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
@@ -32,11 +34,17 @@
/** . */
private final String windowId;
- ContainerRequest(String windowId)
+ /**
+ * @param windowId the target window id
+ * @throws IllegalArgumentException if the window id is null
+ */
+ protected ContainerRequest(String windowId) throws IllegalArgumentException
{
- super();
+ if (windowId == null)
+ {
+ throw new IllegalArgumentException("No null window id accepted");
+ }
- //
this.windowId = windowId;
}
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java 2008-03-11 00:17:40 UTC (rev 10257)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java 2008-03-11 00:51:36 UTC (rev 10258)
@@ -28,7 +28,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class ControllerRequest
+public abstract class ControllerRequest
{
ControllerRequest()
@@ -40,8 +40,5 @@
*
* @return the page state
*/
- public PageNavigationalState getPageNavigationalState()
- {
- return null;
- }
+ public abstract PageNavigationalState getPageNavigationalState();
}
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-03-11 00:17:40 UTC (rev 10257)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-03-11 00:51:36 UTC (rev 10258)
@@ -40,16 +40,32 @@
/** . */
private final ParameterMap bodyParameters;
+ /**
+ * Build a new portlet action request.
+ *
+ * @param windowId the window id
+ * @param interactionState the interaction state
+ * @param bodyParameters the body parameters
+ * @param windowNavigationalState the window navigational state
+ * @param pageNavigationalState the page navigational state
+ * @throws IllegalArgumentException if the window id or the interaction state is null
+ */
public PortletActionRequest(
String windowId,
StateString interactionState,
ParameterMap bodyParameters,
WindowNavigationalState windowNavigationalState,
- PageNavigationalState pageNavigationalState)
+ PageNavigationalState pageNavigationalState) throws IllegalArgumentException
{
super(windowId, windowNavigationalState, pageNavigationalState);
//
+ if (interactionState == null)
+ {
+ throw new IllegalArgumentException("No null interaction state accepted");
+ }
+
+ //
this.interactionState = interactionState;
this.bodyParameters = bodyParameters;
}
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java 2008-03-11 00:17:40 UTC (rev 10257)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java 2008-03-11 00:51:36 UTC (rev 10258)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.portlet.controller.request;
-import org.jboss.portal.portlet.controller.PortletControllerContext;
import org.jboss.portal.portlet.controller.state.PageNavigationalState;
import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2008-03-11 00:17:40 UTC (rev 10257)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2008-03-11 00:51:36 UTC (rev 10258)
@@ -47,16 +47,36 @@
/** . */
private final Scope scope;
+ /**
+ * Build a new portlet resource request.
+ *
+ * @param windowId the window id
+ * @param resourceId the resource id
+ * @param resourceState the resource state
+ * @param bodyParameters the body parameters
+ * @param scope the scope
+ * @throws IllegalArgumentException if the windows id, the resource state or the scope is null
+ */
public PortletResourceRequest(
String windowId,
String resourceId,
StateString resourceState,
ParameterMap bodyParameters,
- Scope scope)
+ Scope scope) throws IllegalArgumentException
{
super(windowId);
//
+ if (resourceState == null)
+ {
+ throw new IllegalArgumentException("No null resource state provided");
+ }
+ if (scope == null)
+ {
+ throw new IllegalArgumentException("No null scope provided");
+ }
+
+ //
this.resourceId = resourceId;
this.resourceState = resourceState;
this.bodyParameters = bodyParameters;
@@ -88,6 +108,18 @@
return bodyParameters;
}
+ public PageNavigationalState getPageNavigationalState()
+ {
+ if (scope instanceof PageScope)
+ {
+ return ((PageScope)scope).getPageNavigationalState();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
public abstract static class Scope
{
Added: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestConstructorTestCase.java
===================================================================
--- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestConstructorTestCase.java (rev 0)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestConstructorTestCase.java 2008-03-11 00:51:36 UTC (rev 10258)
@@ -0,0 +1,198 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.controller;
+
+import org.jboss.portal.portlet.controller.request.PortletActionRequest;
+import org.jboss.portal.portlet.controller.request.PortletRenderRequest;
+import org.jboss.portal.portlet.controller.request.PortletResourceRequest;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.OpaqueStateString;
+import org.jboss.portal.common.util.ParameterMap;
+import static org.jboss.unit.api.Assert.*;
+import org.jboss.unit.api.pojo.annotations.Test;
+
+import java.util.Map;
+import java.util.Collections;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+@Test
+public class PortletControllerRequestConstructorTestCase
+{
+
+ private String windowId = "foo";
+ private StateString interactionState = new OpaqueStateString("");
+ private StateString resourceState = new OpaqueStateString("");
+ private ParameterMap body = new ParameterMap();
+ private WindowNavigationalState windowNS = new WindowNavigationalState();
+ private PageNavigationalState pageNS = new StateControllerContextImpl(new PortletControllerContextSupport()).createPageNavigationalState(false);
+ private Map<String, String[]> pageNSChanges = Collections.emptyMap();
+
+ @Test
+ public void testWithNonNullArgs()
+ {
+ new PortletActionRequest(windowId, interactionState, body, windowNS, pageNS);
+ new PortletRenderRequest(windowId, windowNS, pageNSChanges, pageNS);
+ new PortletResourceRequest(windowId, "foo", resourceState, body, new PortletResourceRequest.FullScope());
+ new PortletResourceRequest(windowId, "foo", resourceState, body, new PortletResourceRequest.PortletScope(windowNS));
+ new PortletResourceRequest(windowId, "foo", resourceState, body, new PortletResourceRequest.PageScope(windowNS, pageNS));
+ }
+
+ @Test
+ public void testWithNullWindowNavigationalState()
+ {
+ new PortletActionRequest(windowId, interactionState, body, null, pageNS);
+ new PortletRenderRequest(windowId, null, pageNSChanges, pageNS);
+ new PortletResourceRequest(windowId, "foo", resourceState, body, new PortletResourceRequest.PageScope(null, pageNS));
+ }
+
+ @Test
+ public void testNullPageNavigationalState()
+ {
+ new PortletActionRequest(windowId, interactionState, body, windowNS, null);
+ new PortletRenderRequest(windowId, windowNS, pageNSChanges, null);
+ new PortletResourceRequest(windowId, "foo", resourceState, body, new PortletResourceRequest.PageScope(windowNS, null));
+ }
+
+ @Test
+ public void testWithNullBody()
+ {
+ new PortletActionRequest(windowId, interactionState, null, windowNS, pageNS);
+ new PortletResourceRequest(windowId, "foo", resourceState, null, new PortletResourceRequest.FullScope());
+ new PortletResourceRequest(windowId, "foo", resourceState, null, new PortletResourceRequest.PortletScope(windowNS));
+ new PortletResourceRequest(windowId, "foo", resourceState, null, new PortletResourceRequest.PageScope(windowNS, pageNS));
+ }
+
+ @Test
+ public void testWithNullResourceId()
+ {
+ new PortletResourceRequest(windowId, null, resourceState, body, new PortletResourceRequest.FullScope());
+ new PortletResourceRequest(windowId, null, resourceState, body, new PortletResourceRequest.PortletScope(windowNS));
+ new PortletResourceRequest(windowId, null, resourceState, body, new PortletResourceRequest.PageScope(windowNS, pageNS));
+ }
+
+ @Test
+ public void testNullWindowId()
+ {
+ try
+ {
+ new PortletActionRequest(null, interactionState, body, windowNS, pageNS);
+ fail();
+ }
+ catch (IllegalArgumentException ignore)
+ {
+ }
+ try
+ {
+ new PortletRenderRequest(null, windowNS, pageNSChanges, pageNS);
+ fail();
+ }
+ catch (IllegalArgumentException ignore)
+ {
+ }
+ try
+ {
+ new PortletResourceRequest(null, "foo", resourceState, body, new PortletResourceRequest.FullScope());
+ fail();
+ }
+ catch (IllegalArgumentException ignore)
+ {
+ }
+ try
+ {
+ new PortletResourceRequest(null, "foo", resourceState, body, new PortletResourceRequest.PortletScope(windowNS));
+ fail();
+ }
+ catch (IllegalArgumentException ignore)
+ {
+ }
+ try
+ {
+ new PortletResourceRequest(null, "foo", resourceState, body, new PortletResourceRequest.PageScope(windowNS, pageNS));
+ fail();
+ }
+ catch (IllegalArgumentException ignore)
+ {
+ }
+ }
+
+ @Test
+ public void testNullInteractionState()
+ {
+ try
+ {
+ new PortletActionRequest(windowId, null, body, windowNS, pageNS);
+ fail();
+ }
+ catch (IllegalArgumentException ignore)
+ {
+ }
+ }
+
+ @Test
+ public void testNullResourceState()
+ {
+ try
+ {
+ new PortletResourceRequest(windowId, "foo", null, body, new PortletResourceRequest.FullScope());
+ fail();
+ }
+ catch (IllegalArgumentException ignore)
+ {
+ }
+ try
+ {
+ new PortletResourceRequest(windowId, "foo", null, body, new PortletResourceRequest.PortletScope(windowNS));
+ fail();
+ }
+ catch (IllegalArgumentException ignore)
+ {
+ }
+ try
+ {
+ new PortletResourceRequest(windowId, "foo", null, body, new PortletResourceRequest.PageScope(windowNS, pageNS));
+ fail();
+ }
+ catch (IllegalArgumentException ignore)
+ {
+ }
+ }
+
+ @Test
+ public void testNullScope()
+ {
+ try
+ {
+ new PortletResourceRequest(windowId, "foo", resourceState, body, null);
+ fail();
+ }
+ catch (IllegalArgumentException ignore)
+ {
+ }
+ }
+}
Modified: modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml
===================================================================
--- modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml 2008-03-11 00:17:40 UTC (rev 10257)
+++ modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml 2008-03-11 00:51:36 UTC (rev 10258)
@@ -10,5 +10,8 @@
<test>
<class name="org.jboss.portal.portlet.controller.EventControllerContextFailureTestCase"/>
</test>
+ <test>
+ <class name="org.jboss.portal.portlet.controller.PortletControllerRequestConstructorTestCase"/>
+ </test>
</pojo>
</jboss-unit>
16 years, 3 months