[portal-commits] JBoss Portal SVN: r6226 - in trunk/wsrp/src/main/org/jboss/portal/test/wsrp: v1/consumer and 1 other directories.

Author: chris.laprun(a)jboss.com Date: 2007-02-12 15:33:30 -0500 (Mon, 12 Feb 2007) New Revision: 6226 Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/MarkupBehavior.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/ServiceDescriptionBehavior.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ServiceDescriptionTestCase.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/V1ConsumerBaseTest.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/BasicMarkupBehavior.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/EmptyMarkupBehavior.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/InitCookieMarkupBehavior.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/NullMarkupBehavior.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/SessionMarkupBehavior.java Log: - MarkupBehaviors now register their portlet handle which updates the current service description. - Updated tests. Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/MarkupBehavior.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/MarkupBehavior.java 2007-02-12 18:35:57 UTC (rev 6225) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/MarkupBehavior.java 2007-02-12 20:33:30 UTC (rev 6226) @@ -67,8 +67,15 @@ */ public abstract class MarkupBehavior extends TestProducerBehavior implements WSRP_v1_Markup_PortType { - protected List handles = new ArrayList(3); + private List handles = new ArrayList(3); + private BehaviorRegistry registry; + + protected MarkupBehavior(BehaviorRegistry registry) + { + this.registry = registry; + } + public MarkupResponse getMarkup(GetMarkup getMarkup) throws UnsupportedWindowStateFault, InvalidCookieFault, InvalidSessionFault, AccessDeniedFault, InconsistentParametersFault, InvalidHandleFault, UnsupportedLocaleFault, UnsupportedModeFault, OperationFailedFault, MissingParametersFault, InvalidUserCategoryFault, @@ -164,4 +171,10 @@ { return ""; } + + protected void registerHandle(String handle) + { + handles.add(handle); + registry.getServiceDescriptionBehavior().addPortletDescription(createPortletDescription(handle, getSuffixFor(handle))); + } } Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/ServiceDescriptionBehavior.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/ServiceDescriptionBehavior.java 2007-02-12 18:35:57 UTC (rev 6225) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/ServiceDescriptionBehavior.java 2007-02-12 20:33:30 UTC (rev 6226) @@ -23,15 +23,18 @@ package org.jboss.portal.test.wsrp.framework; +import org.jboss.portal.common.util.Tools; import org.jboss.portal.wsrp.WSRPTypeFactory; import org.jboss.portal.wsrp.core.CookieProtocol; import org.jboss.portal.wsrp.core.GetServiceDescription; import org.jboss.portal.wsrp.core.InvalidRegistrationFault; import org.jboss.portal.wsrp.core.OperationFailedFault; +import org.jboss.portal.wsrp.core.PortletDescription; import org.jboss.portal.wsrp.core.ServiceDescription; import org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType; import java.rmi.RemoteException; +import java.util.List; /** * @author <a href="mailto:chris.laprun@jboss.com?subject=org.jboss.portal.test.wsrp.framework.ServiceDescriptionBehavior">Chris @@ -45,7 +48,7 @@ private static final ServiceDescription DEFAULT_SERVICE_DESCRIPTION = WSRPTypeFactory.createServiceDescription(false); public static final ServiceDescriptionBehavior DEFAULT = new ServiceDescriptionBehavior(); - protected ServiceDescriptionBehavior() + public ServiceDescriptionBehavior() { //Prepare sample ServiceDescription serviceDescription = WSRPTypeFactory.createServiceDescription(false); @@ -54,7 +57,7 @@ public ServiceDescription getServiceDescription(GetServiceDescription getServiceDescription) throws OperationFailedFault, InvalidRegistrationFault, RemoteException { - return DEFAULT_SERVICE_DESCRIPTION; + return serviceDescription; } public void setRequiresRegistration(boolean requiresRegistration) @@ -71,4 +74,19 @@ { return DEFAULT_SERVICE_DESCRIPTION; } + + void addPortletDescription(PortletDescription portletDescription) + { + PortletDescription[] initial = serviceDescription.getOfferedPortlets(); + if (initial == null || initial.length == 0) + { + serviceDescription.setOfferedPortlets(new PortletDescription[]{portletDescription}); + } + else + { + List portlets = Tools.toList(initial); + portlets.add(portletDescription); + serviceDescription.setOfferedPortlets((PortletDescription[])portlets.toArray(new PortletDescription[0])); + } + } } Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ServiceDescriptionTestCase.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ServiceDescriptionTestCase.java 2007-02-12 18:35:57 UTC (rev 6225) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ServiceDescriptionTestCase.java 2007-02-12 20:33:30 UTC (rev 6226) @@ -26,6 +26,7 @@ import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.test.wsrp.v1.consumer.behaviors.BasicMarkupBehavior; +import org.jboss.portal.test.wsrp.v1.consumer.behaviors.BasicServiceDescriptionBehavior; import org.jboss.portal.test.wsrp.v1.consumer.behaviors.SessionMarkupBehavior; import java.util.Set; @@ -44,6 +45,14 @@ super(); } + + public void setUp() throws Exception + { + super.setUp(); + // override default service description behavior to make sure we have the correct state + producer.getBehaviorRegistry().setServiceDescriptionBehavior(new BasicServiceDescriptionBehavior()); + } + public void testGetportlets() throws Exception { //invoke consumer Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/V1ConsumerBaseTest.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/V1ConsumerBaseTest.java 2007-02-12 18:35:57 UTC (rev 6225) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/V1ConsumerBaseTest.java 2007-02-12 20:33:30 UTC (rev 6226) @@ -27,10 +27,10 @@ import org.jboss.portal.portlet.info.MetaInfo; import org.jboss.portal.test.wsrp.WSRPConsumerBaseTest; import org.jboss.portal.test.wsrp.framework.BehaviorRegistry; +import org.jboss.portal.test.wsrp.framework.ServiceDescriptionBehavior; import org.jboss.portal.test.wsrp.framework.support.ServiceObjectFactory; import org.jboss.portal.test.wsrp.v1.consumer.behaviors.BasicMarkupBehavior; import org.jboss.portal.test.wsrp.v1.consumer.behaviors.BasicPortletManagementBehavior; -import org.jboss.portal.test.wsrp.v1.consumer.behaviors.BasicServiceDescriptionBehavior; import org.jboss.portal.test.wsrp.v1.consumer.behaviors.EmptyMarkupBehavior; import org.jboss.portal.test.wsrp.v1.consumer.behaviors.InitCookieMarkupBehavior; import org.jboss.portal.test.wsrp.v1.consumer.behaviors.NullMarkupBehavior; @@ -65,12 +65,12 @@ // reset the behaviors BehaviorRegistry registry = producer.getBehaviorRegistry(); registry.setPortletManagementBehavior(new BasicPortletManagementBehavior(registry)); - registry.setServiceDescriptionBehavior(new BasicServiceDescriptionBehavior()); - registry.registerMarkupBehavior(new BasicMarkupBehavior()); - registry.registerMarkupBehavior(new EmptyMarkupBehavior()); - registry.registerMarkupBehavior(new InitCookieMarkupBehavior()); - registry.registerMarkupBehavior(new NullMarkupBehavior()); - registry.registerMarkupBehavior(new SessionMarkupBehavior()); + registry.setServiceDescriptionBehavior(new ServiceDescriptionBehavior()); + registry.registerMarkupBehavior(new BasicMarkupBehavior(registry)); + registry.registerMarkupBehavior(new EmptyMarkupBehavior(registry)); + registry.registerMarkupBehavior(new InitCookieMarkupBehavior(registry)); + registry.registerMarkupBehavior(new NullMarkupBehavior(registry)); + registry.registerMarkupBehavior(new SessionMarkupBehavior(registry)); // make sure we use clean producer info for each test consumer.refreshProducerInfo(); } Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/BasicMarkupBehavior.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/BasicMarkupBehavior.java 2007-02-12 18:35:57 UTC (rev 6225) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/BasicMarkupBehavior.java 2007-02-12 20:33:30 UTC (rev 6226) @@ -25,6 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.test.wsrp.framework.BehaviorRegistry; import org.jboss.portal.test.wsrp.framework.MarkupBehavior; import org.jboss.portal.wsrp.WSRPConstants; import org.jboss.portal.wsrp.WSRPTypeFactory; @@ -46,9 +47,10 @@ public static final String NS = "ns1"; - public BasicMarkupBehavior() + public BasicMarkupBehavior(BehaviorRegistry registry) { - handles.add(PORTLET_HANDLE); + super(registry); + registerHandle(PORTLET_HANDLE); } public String getMarkupString(Mode mode, WindowState windowState, String navigationalState, GetMarkup getMarkup) Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/EmptyMarkupBehavior.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/EmptyMarkupBehavior.java 2007-02-12 18:35:57 UTC (rev 6225) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/EmptyMarkupBehavior.java 2007-02-12 20:33:30 UTC (rev 6226) @@ -25,6 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.test.wsrp.framework.BehaviorRegistry; import org.jboss.portal.test.wsrp.framework.MarkupBehavior; import org.jboss.portal.wsrp.core.GetMarkup; @@ -39,9 +40,10 @@ public static final String PORTLET_HANDLE = "EmptyMarkup"; - public EmptyMarkupBehavior() + public EmptyMarkupBehavior(BehaviorRegistry registry) { - handles.add(PORTLET_HANDLE); + super(registry); + registerHandle(PORTLET_HANDLE); } public String getMarkupString(Mode mode, WindowState windowState, String navigationalState, GetMarkup getMarkup) Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/InitCookieMarkupBehavior.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/InitCookieMarkupBehavior.java 2007-02-12 18:35:57 UTC (rev 6225) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/InitCookieMarkupBehavior.java 2007-02-12 20:33:30 UTC (rev 6226) @@ -25,6 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.test.wsrp.framework.BehaviorRegistry; import org.jboss.portal.test.wsrp.framework.MarkupBehavior; import org.jboss.portal.wsrp.core.GetMarkup; import org.jboss.portal.wsrp.core.InvalidCookieFault; @@ -40,9 +41,10 @@ public static final String PORTLET_HANDLE = "initcookiehandle"; - public InitCookieMarkupBehavior() + public InitCookieMarkupBehavior(BehaviorRegistry registry) { - handles.add(PORTLET_HANDLE); + super(registry); + registerHandle(PORTLET_HANDLE); } protected String getMarkupString(Mode mode, WindowState windowState, String navigationalState, GetMarkup getMarkup) throws InvalidCookieFault, OperationFailedFault Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/NullMarkupBehavior.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/NullMarkupBehavior.java 2007-02-12 18:35:57 UTC (rev 6225) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/NullMarkupBehavior.java 2007-02-12 20:33:30 UTC (rev 6226) @@ -25,6 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.test.wsrp.framework.BehaviorRegistry; import org.jboss.portal.test.wsrp.framework.MarkupBehavior; import org.jboss.portal.wsrp.core.GetMarkup; @@ -39,9 +40,10 @@ public static final String PORTLET_HANDLE = "NullMarkup"; - public NullMarkupBehavior() + public NullMarkupBehavior(BehaviorRegistry registry) { - handles.add(PORTLET_HANDLE); + super(registry); + registerHandle(PORTLET_HANDLE); } public String getMarkupString(Mode mode, WindowState windowState, String navigationalState, GetMarkup getMarkup) Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/SessionMarkupBehavior.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/SessionMarkupBehavior.java 2007-02-12 18:35:57 UTC (rev 6225) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/SessionMarkupBehavior.java 2007-02-12 20:33:30 UTC (rev 6226) @@ -25,6 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.test.wsrp.framework.BehaviorRegistry; import org.jboss.portal.test.wsrp.framework.MarkupBehavior; import org.jboss.portal.wsrp.WSRPTypeFactory; import org.jboss.portal.wsrp.core.BlockingInteractionResponse; @@ -50,9 +51,10 @@ private int count = 0; private String sessionId; - public SessionMarkupBehavior() + public SessionMarkupBehavior(BehaviorRegistry registry) { - handles.add(PORTLET_HANDLE); + super(registry); + registerHandle(PORTLET_HANDLE); } public String getMarkupString(Mode mode, WindowState windowState, String navigationalState, GetMarkup getMarkup)