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());