[jboss-svn-commits] JBoss Portal SVN: r5481 - in trunk/wsrp/src/main/org/jboss/portal/test/wsrp: framework framework/support v1/consumer v1/consumer/producer
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 18 18:29:21 EDT 2006
Author: chris.laprun at jboss.com
Date: 2006-10-18 18:29:18 -0400 (Wed, 18 Oct 2006)
New Revision: 5481
Added:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/MarkupBehavior.java
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducer.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/BasicBehavior.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/EmptyMarkupBehavior.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/NullMarkupBehavior.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/SessionBehavior.java
Log:
- Extracted Markup-specific behavior to a sub-class.
- Added support for call count.
Added: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/MarkupBehavior.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/MarkupBehavior.java 2006-10-18 18:11:13 UTC (rev 5480)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/MarkupBehavior.java 2006-10-18 22:29:18 UTC (rev 5481)
@@ -0,0 +1,89 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, 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.test.wsrp.framework;
+
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.wsrp.core.BlockingInteractionResponse;
+import org.jboss.portal.wsrp.core.GetMarkup;
+import org.jboss.portal.wsrp.core.MarkupResponse;
+import org.jboss.portal.wsrp.core.PerformBlockingInteraction;
+
+/**
+ * Behavior delivering Markup services.
+ *
+ * @author <a href="mailto:chris.laprun at jboss.com?subject=org.jboss.portal.test.wsrp.framework.AbstractMarkupBehavior">Chris
+ * Laprun</a>
+ * @version $Revision$
+ * @since 2.6
+ */
+public abstract class MarkupBehavior extends TestProducerBehavior
+{
+ protected String portletHandle;
+
+ /**
+ * The portlet handle associated with this behavior for the behaviors that react to a specific portlet handle. Used
+ * essentially for markup/interaction requests.
+ *
+ * @return
+ */
+ public String getPortletHandle()
+ {
+ return portletHandle;
+ }
+
+ /**
+ * Returns a markup String based on the passed information.
+ *
+ * @param mode the requested mode
+ * @param windowState the requested window state
+ * @param navigationalState the current navigational state
+ * @param getMarkup the original GetMarkup request (in case more information is required by this behavior)
+ * @return a possibly <code>null</code> markup String
+ */
+ public abstract String getMarkupString(Mode mode, WindowState windowState, String navigationalState, GetMarkup getMarkup);
+
+ /**
+ * Performs a blocking interaction and returns the appropriate response. Default implementation returns
+ * <code>null</code>.
+ *
+ * @param performBlockingInteraction the original interaction request
+ * @return a BlockingInteractionResponse
+ */
+ public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction)
+ {
+ return null;
+ }
+
+ /**
+ * Allows this behavior to modify the response after the markup has been generated. The default implementation does
+ * nothing.
+ *
+ * @param markupResponse the response that will be passed on to the consumer
+ */
+ public void modifyResponseIfNeeded(MarkupResponse markupResponse)
+ {
+ // default implementation does not nothing
+ }
+}
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java 2006-10-18 18:11:13 UTC (rev 5480)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java 2006-10-18 22:29:18 UTC (rev 5481)
@@ -23,12 +23,9 @@
package org.jboss.portal.test.wsrp.framework;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.wsrp.core.GetMarkup;
-import org.jboss.portal.wsrp.core.MarkupResponse;
-
/**
+ * Provides a base class for Producer behavior used in Consumer testing.
+ *
* @author <a href="mailto:chris.laprun at jboss.com?subject=org.jboss.portal.test.wsrp.framework.TestProducerBehavior">Chris
* Laprun</a>
* @version $Revision$
@@ -36,17 +33,14 @@
*/
public abstract class TestProducerBehavior
{
- protected String portletHandle;
+ protected int callCount;
- public String getPortletHandle()
+ /**
+ * Increment the number of times methods of this behavior have been called. Used when the behavior changes depending
+ * on how many times methods have been called.
+ */
+ public void incrementCallCount()
{
- return portletHandle;
+ callCount++;
}
-
- public abstract String getMarkupString(Mode mode, WindowState windowState, String navigationalState, GetMarkup getMarkup);
-
- public void modifyResponseIfNeeded(MarkupResponse markupResponse)
- {
- // default implementation does not nothing
- }
}
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducer.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducer.java 2006-10-18 18:11:13 UTC (rev 5480)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducer.java 2006-10-18 22:29:18 UTC (rev 5481)
@@ -23,7 +23,6 @@
package org.jboss.portal.test.wsrp.framework;
import org.jboss.portal.wsrp.WSRPProducer;
-import org.jboss.portal.wsrp.core.ServiceDescription;
import javax.servlet.http.HttpServletResponse;
@@ -35,10 +34,16 @@
*/
public interface TestWSRPProducer extends WSRPProducer
{
-
- public void setGetServiceDescriptionResponse(ServiceDescription sd);
-
+ /** Resets any currently held state. */
void reset();
void setResponse(HttpServletResponse response);
+
+ /**
+ * Forces this producer to use the specified behavior.
+ *
+ * @param behavior the behavior to use
+ * @since 2.6
+ */
+ void useBehavior(TestProducerBehavior behavior);
}
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java 2006-10-18 18:11:13 UTC (rev 5480)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java 2006-10-18 22:29:18 UTC (rev 5481)
@@ -127,6 +127,9 @@
/** Used to set the cookie in initCookie */
private HttpServletResponse response;
+ /** The behavior that is currently active. */
+ private TestProducerBehavior currentBehavior;
+
public static final String USER_COOKIE = "cookie";
public TestWSRPProducerImpl()
@@ -157,25 +160,59 @@
requiresInitCookie = null;
- register(new BasicBehavior());
- register(new SessionBehavior());
- register(new NullMarkupBehavior());
- register(new EmptyMarkupBehavior());
+ registerMarkupBehavior(new BasicBehavior());
+ registerMarkupBehavior(new SessionBehavior());
+ registerMarkupBehavior(new NullMarkupBehavior());
+ registerMarkupBehavior(new EmptyMarkupBehavior());
+
+ currentBehavior = null;
}
+ // Behavior management **********************************************************************************************
Map behaviors = new HashMap();
- public void register(TestProducerBehavior behavior)
+ public void useBehavior(TestProducerBehavior behavior)
{
+ currentBehavior = behavior;
+ }
+
+ private void registerMarkupBehavior(MarkupBehavior behavior)
+ {
behaviors.put(behavior.getPortletHandle(), behavior);
}
- public TestProducerBehavior getBehaviorFor(String portletHandle)
+ private MarkupBehavior getMarkupBehaviorFor(String portletHandle)
{
- return (TestProducerBehavior)behaviors.get(portletHandle);
+ return (MarkupBehavior)behaviors.get(portletHandle);
}
+ private void updateCurrentBehaviorIfNeeded(String handle)
+ {
+ if (currentBehavior == null || handle != null)
+ {
+ currentBehavior = getMarkupBehaviorFor(handle);
+ }
+ }
+ private void incrementBehaviorCallCount()
+ {
+ if (currentBehavior != null)
+ {
+ currentBehavior.incrementCallCount();
+ }
+ }
+
+ private MarkupBehavior getMarkupBehavior()
+ {
+ if (currentBehavior instanceof MarkupBehavior)
+ {
+ return (MarkupBehavior)currentBehavior;
+ }
+
+ throw new IllegalArgumentException("Current behavior cannot be used for a Markup interaction. Was: "
+ + currentBehavior);
+ }
+
public void setResponse(HttpServletResponse response)
{
this.response = response;
@@ -200,14 +237,10 @@
public ServiceDescription getServiceDescription(GetServiceDescription gs)
throws InvalidRegistrationFault, OperationFailedFault, RemoteException
{
+ incrementBehaviorCallCount();
return serviceDescription;
}
- public void setGetServiceDescriptionResponse(ServiceDescription sd)
- {
- serviceDescription = sd;
- }
-
// MarkupService implementation *************************************************************************************
public MarkupResponse getMarkup(GetMarkup getMarkup)
@@ -221,9 +254,9 @@
MarkupParams markupParams = getMarkup.getMarkupParams();
- TestProducerBehavior behavior = getBehaviorFor(handle);
+ updateCurrentBehaviorIfNeeded(handle);
- markupString = behavior.getMarkupString(WSRPUtils.getJSR168PortletModeFromWSRPName(markupParams.getMode()),
+ markupString = getMarkupBehavior().getMarkupString(WSRPUtils.getJSR168PortletModeFromWSRPName(markupParams.getMode()),
WSRPUtils.getJSR168WindowStateFromWSRPName(markupParams.getWindowState()), markupParams.getNavigationalState(),
getMarkup);
@@ -232,8 +265,9 @@
MarkupResponse markupResponse = WSRPTypeFactory.createMarkupResponse(markupContext);
- behavior.modifyResponseIfNeeded(markupResponse);
+ getMarkupBehavior().modifyResponseIfNeeded(markupResponse);
+ incrementBehaviorCallCount();
return markupResponse;
}
@@ -262,12 +296,14 @@
ur.setNavigationalState(ns);
BlockingInteractionResponse res = WSRPTypeFactory.createBlockingInteractionResponse(ur);
+ incrementBehaviorCallCount();
return res;
}
public ReturnAny releaseSessions(ReleaseSessions releaseSessions)
throws InvalidRegistrationFault, OperationFailedFault, MissingParametersFault, AccessDeniedFault, RemoteException
{
+ incrementBehaviorCallCount();
return null;
}
@@ -275,6 +311,8 @@
throws AccessDeniedFault, OperationFailedFault, InvalidRegistrationFault, RemoteException
{
response.addCookie(new Cookie("cookieName", USER_COOKIE));
+
+ incrementBehaviorCallCount();
return null;
}
@@ -282,16 +320,19 @@
public RegistrationContext register(RegistrationData register) throws MissingParametersFault, OperationFailedFault, RemoteException
{
+ incrementBehaviorCallCount();
return null;
}
public ReturnAny deregister(RegistrationContext deregister) throws OperationFailedFault, InvalidRegistrationFault, RemoteException
{
+ incrementBehaviorCallCount();
return null;
}
public RegistrationState modifyRegistration(ModifyRegistration modifyRegistration) throws MissingParametersFault, OperationFailedFault, InvalidRegistrationFault, RemoteException
{
+ incrementBehaviorCallCount();
return null;
}
@@ -301,31 +342,37 @@
throws AccessDeniedFault, InvalidHandleFault, InvalidUserCategoryFault, InconsistentParametersFault,
MissingParametersFault, InvalidRegistrationFault, OperationFailedFault, RemoteException
{
+ incrementBehaviorCallCount();
return null;
}
public PortletContext clonePortlet(ClonePortlet clonePortlet) throws InvalidUserCategoryFault, AccessDeniedFault, OperationFailedFault, InvalidHandleFault, InvalidRegistrationFault, InconsistentParametersFault, MissingParametersFault, RemoteException
{
+ incrementBehaviorCallCount();
return null;
}
public DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) throws InconsistentParametersFault, MissingParametersFault, InvalidRegistrationFault, OperationFailedFault, RemoteException
{
+ incrementBehaviorCallCount();
return null;
}
public PortletContext setPortletProperties(SetPortletProperties setPortletProperties) throws OperationFailedFault, InvalidHandleFault, MissingParametersFault, InconsistentParametersFault, InvalidUserCategoryFault, AccessDeniedFault, InvalidRegistrationFault, RemoteException
{
+ incrementBehaviorCallCount();
return null;
}
public PropertyList getPortletProperties(GetPortletProperties getPortletProperties) throws InvalidHandleFault, MissingParametersFault, InvalidRegistrationFault, AccessDeniedFault, OperationFailedFault, InconsistentParametersFault, InvalidUserCategoryFault, RemoteException
{
+ incrementBehaviorCallCount();
return null;
}
public PortletPropertyDescriptionResponse getPortletPropertyDescription(GetPortletPropertyDescription getPortletPropertyDescription) throws MissingParametersFault, InconsistentParametersFault, InvalidUserCategoryFault, InvalidRegistrationFault, AccessDeniedFault, InvalidHandleFault, OperationFailedFault, RemoteException
{
+ incrementBehaviorCallCount();
return null;
}
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java 2006-10-18 18:11:13 UTC (rev 5480)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java 2006-10-18 22:29:18 UTC (rev 5481)
@@ -58,8 +58,10 @@
private String ns;
private HttpServletRequest mockRequest;
private HttpServletResponse mockResponse;
+ private Mode mode;
+ private WindowState state;
- public TestPortletInvocationContext()
+ public TestPortletInvocationContext(Mode mode, WindowState state, String ns)
{
ClassLoader classLoader = getClass().getClassLoader();
HttpSession session = (HttpSession)Proxy.newProxyInstance(classLoader, new Class[]{HttpSession.class},
@@ -70,15 +72,12 @@
new MockHttpServletResponse());
addResolver(PortletInvocation.REQUEST_SCOPE, new RequestAttributeResolver(mockRequest));
- }
-
- public void setNs(String ns)
- {
+ this.mode = (mode != null ? mode : Mode.VIEW);
+ this.state = (state != null ? state : WindowState.MAXIMIZED);
this.ns = ns;
}
-
public void setMockRequest(HttpServletRequest mockRequest)
{
this.mockRequest = mockRequest;
@@ -96,12 +95,12 @@
public Mode getMode()
{
- return Mode.VIEW;
+ return mode;
}
public WindowState getWindowState()
{
- return WindowState.MAXIMIZED;
+ return state;
}
public HTTPStreamInfo getStreamInfo()
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2006-10-18 18:11:13 UTC (rev 5480)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2006-10-18 22:29:18 UTC (rev 5481)
@@ -23,6 +23,8 @@
package org.jboss.portal.test.wsrp.v1.consumer;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.PortletInvocation;
@@ -70,41 +72,25 @@
public void testRender() throws Exception
{
- RenderInvocation render = createRenderInvocation(BasicBehavior.PORTLET_HANDLE);
-
- PortletInvocationResponse response = consumer.invoke(render);
-
- FragmentResponse result = checkRenderResult(response, "portlet1:view:maximized");
+ RenderInvocation render = createRenderInvocation(BasicBehavior.PORTLET_HANDLE, Mode.EDIT,
+ WindowState.NORMAL, "someNS");
+ FragmentResponse result = checkRenderResult(consumer.invoke(render), "portlet1:edit:normal:someNS");
assertEquals(15, result.getExpirationSecs());
render = createRenderInvocation(SessionBehavior.PORTLET_HANDLE);
-
- response = consumer.invoke(render);
-
- result = checkRenderResult(response, "portlet2:0:view:maximized");
+ result = checkRenderResult(consumer.invoke(render), "portlet2:0:view:maximized");
assertEquals(0, result.getExpirationSecs());
}
public void testAction() throws Exception
{
- TestPortletInvocationContext ac = new TestPortletInvocationContext();
- ActionInvocation action = new ActionInvocation(ac);
- action.setInstanceContext(new BasicInstanceContext(BasicBehavior.PORTLET_HANDLE));
- action.setSecurityContext(new BasicSecurityContext());
- action.setUserContext(new BasicUserContext());
- action.setAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE, new PortletContext(BasicBehavior.PORTLET_HANDLE));
+ ActionInvocation action = createActionInvocation(BasicBehavior.PORTLET_HANDLE);
PortletInvocationResponse response = consumer.invoke(action);
assertNotNull(response);
- assertTrue(response instanceof RenderResponse);
+ assertTrue("Was expecting a RenderResponse. Got: " + response, response instanceof RenderResponse);
RenderResponse render = (RenderResponse)response;
- assertEquals("ns1", render.getNavigationalState().getStringValue());
-
- RenderInvocation renderInvocation = createRenderInvocation(BasicBehavior.PORTLET_HANDLE);
- ((TestPortletInvocationContext)renderInvocation.getContext()).setNs("ns1");
-
- response = consumer.invoke(renderInvocation);
- checkRenderResult(response, "portlet1:view:maximized:ns1");
+ assertEquals(BasicBehavior.NS, render.getNavigationalState().getStringValue());
}
public void testSessionHandling() throws Exception
@@ -168,10 +154,16 @@
private RenderInvocation createRenderInvocation(String portletHandle)
{
- TestPortletInvocationContext rc = new TestPortletInvocationContext();
+ return createRenderInvocation(portletHandle, Mode.VIEW, WindowState.MAXIMIZED, null);
+ }
+ private RenderInvocation createRenderInvocation(String portletHandle, Mode mode, WindowState state, String navigationalState)
+ {
+ TestPortletInvocationContext rc = new TestPortletInvocationContext(mode, state, navigationalState);
+
RenderInvocation render = new RenderInvocation(rc);
- render.setAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE, new PortletContext(portletHandle));
+ render.setAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE,
+ new PortletContext(portletHandle));
render.setInstanceContext(new BasicInstanceContext(portletHandle));
render.setSecurityContext(new BasicSecurityContext());
@@ -185,4 +177,16 @@
});
return render;
}
+
+ private ActionInvocation createActionInvocation(String portletHandle)
+ {
+ TestPortletInvocationContext ac = new TestPortletInvocationContext(Mode.VIEW, WindowState.NORMAL, null);
+ ActionInvocation action = new ActionInvocation(ac);
+ action.setInstanceContext(new BasicInstanceContext(portletHandle));
+ action.setSecurityContext(new BasicSecurityContext());
+ action.setUserContext(new BasicUserContext());
+ action.setAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE,
+ new PortletContext(portletHandle));
+ return action;
+ }
}
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/BasicBehavior.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/BasicBehavior.java 2006-10-18 18:11:13 UTC (rev 5480)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/BasicBehavior.java 2006-10-18 22:29:18 UTC (rev 5481)
@@ -25,11 +25,14 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.test.wsrp.framework.TestProducerBehavior;
+import org.jboss.portal.test.wsrp.framework.MarkupBehavior;
import org.jboss.portal.wsrp.WSRPConstants;
import org.jboss.portal.wsrp.WSRPTypeFactory;
+import org.jboss.portal.wsrp.core.BlockingInteractionResponse;
import org.jboss.portal.wsrp.core.GetMarkup;
import org.jboss.portal.wsrp.core.MarkupResponse;
+import org.jboss.portal.wsrp.core.PerformBlockingInteraction;
+import org.jboss.portal.wsrp.core.UpdateResponse;
/**
* @author <a href="mailto:chris.laprun at jboss.com?subject=org.jboss.portal.test.wsrp.v1.consumer.producer.BasicProducer">Chris
@@ -37,9 +40,10 @@
* @version $Revision$
* @since 2.6
*/
-public class BasicBehavior extends TestProducerBehavior
+public class BasicBehavior extends MarkupBehavior
{
public static final String PORTLET_HANDLE = "SamplePortletHandle";
+ public static final String NS = "ns1";
public BasicBehavior()
@@ -61,6 +65,13 @@
}
+ public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction)
+ {
+ UpdateResponse ur = WSRPTypeFactory.createUpdateResponse();
+ ur.setNavigationalState(NS);
+ return WSRPTypeFactory.createBlockingInteractionResponse(ur);
+ }
+
public void modifyResponseIfNeeded(MarkupResponse markupResponse)
{
// fake markup caching
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/EmptyMarkupBehavior.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/EmptyMarkupBehavior.java 2006-10-18 18:11:13 UTC (rev 5480)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/EmptyMarkupBehavior.java 2006-10-18 22:29:18 UTC (rev 5481)
@@ -25,7 +25,7 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.test.wsrp.framework.TestProducerBehavior;
+import org.jboss.portal.test.wsrp.framework.MarkupBehavior;
import org.jboss.portal.wsrp.core.GetMarkup;
/**
@@ -34,7 +34,7 @@
* @version $Revision$
* @since 2.6
*/
-public class EmptyMarkupBehavior extends TestProducerBehavior
+public class EmptyMarkupBehavior extends MarkupBehavior
{
public static final String PORTLET_HANDLE = "EmptyMarkup";
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/NullMarkupBehavior.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/NullMarkupBehavior.java 2006-10-18 18:11:13 UTC (rev 5480)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/NullMarkupBehavior.java 2006-10-18 22:29:18 UTC (rev 5481)
@@ -25,7 +25,7 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.test.wsrp.framework.TestProducerBehavior;
+import org.jboss.portal.test.wsrp.framework.MarkupBehavior;
import org.jboss.portal.wsrp.core.GetMarkup;
/**
@@ -34,7 +34,7 @@
* @version $Revision$
* @since 2.6
*/
-public class NullMarkupBehavior extends TestProducerBehavior
+public class NullMarkupBehavior extends MarkupBehavior
{
public static final String PORTLET_HANDLE = "NullMarkup";
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/SessionBehavior.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/SessionBehavior.java 2006-10-18 18:11:13 UTC (rev 5480)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/producer/SessionBehavior.java 2006-10-18 22:29:18 UTC (rev 5481)
@@ -25,7 +25,7 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.test.wsrp.framework.TestProducerBehavior;
+import org.jboss.portal.test.wsrp.framework.MarkupBehavior;
import org.jboss.portal.wsrp.WSRPTypeFactory;
import org.jboss.portal.wsrp.core.GetMarkup;
import org.jboss.portal.wsrp.core.MarkupResponse;
@@ -37,7 +37,7 @@
* @version $Revision$
* @since 2.6
*/
-public class SessionBehavior extends TestProducerBehavior
+public class SessionBehavior extends MarkupBehavior
{
public static final String PORTLET_HANDLE = "SecondPortletHandle";
public static final String SESSION_ID = "sessionID";
More information about the jboss-svn-commits
mailing list