[portal-commits] JBoss Portal SVN: r5860 - in trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck: portletinterface portletrequests

[portal-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-12-14 16:03:28 -0500 (Thu, 14 Dec 2006)
New Revision: 5860

Modified:
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java
Log:
porting to trunk the portlet container fixes that have been applied in 2.4

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java	2006-12-14 19:40:56 UTC (rev 5859)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java	2006-12-14 21:03:28 UTC (rev 5860)
@@ -167,6 +167,7 @@
    {
       Sequence seq = new Sequence();
       registry.addSequence("InvokeActionFirst", seq);
+      final Boolean[] actionInvoked= new Boolean[1];
 
       seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
       {
@@ -180,7 +181,7 @@
       {
          protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
          {
-            UTP1.local.set(Boolean.TRUE);
+            actionInvoked[0] = Boolean.TRUE;
          }
       });
 
@@ -188,7 +189,7 @@
       {
          protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
          {
-            assertEquals(Boolean.TRUE, (Boolean)UTP1.local.get());
+            assertEquals(Boolean.TRUE, actionInvoked[0]);
             return new EndTestResponse();
          }
       });
@@ -204,6 +205,7 @@
    {
       Sequence seq = new Sequence();
       registry.addSequence("InvokeRenderAfterActionURL", seq);
+      final Boolean[] actionInvoked= new Boolean[1];
 
       seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
       {
@@ -238,7 +240,7 @@
          protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
          {
             //mark action phase invokation
-            UTP2.local.set(Boolean.TRUE);
+            actionInvoked[0] = Boolean.TRUE;
          }
       });
 
@@ -247,7 +249,7 @@
          protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
          {
             //assert that render is after Portlet B action
-            assertEquals(Boolean.TRUE, (Boolean)UTP2.local.get());
+             assertEquals(Boolean.TRUE, actionInvoked[0]);
             return null;
          }
       });
@@ -257,7 +259,7 @@
          protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
          {
             //assert that render is after Portlet B action
-            assertEquals(Boolean.TRUE, (Boolean)UTP2.local.get());
+            assertEquals(Boolean.TRUE, actionInvoked[0]);
             //and reinvoke itself
             return new InvokeGetResponse(response.createRenderURL().toString());
          }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java	2006-12-14 19:40:56 UTC (rev 5859)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java	2006-12-14 21:03:28 UTC (rev 5860)
@@ -143,11 +143,15 @@
    {
       Sequence seq = new Sequence();
       registry.addSequence("ParametersDuringRenderNotTargeted", seq);
+      final String[] urls = new String[1];
       seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
       {
          protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
          {
-            UTP2.holder = response.createRenderURL();
+            PortletURL url = response.createRenderURL();
+            url.setParameter("portlet2key1", "p2k1value1");
+            url.setParameter("portlet2key2", new String[]{"p2k2value1", "p2k2value2", "p2k2value3"});
+            urls[0] = url.toString();
             return null;
          }
       });
@@ -171,10 +175,7 @@
          protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
          {
             //invoke render url from different portlet to be able to pass some params to it
-            PortletURL url = (PortletURL)UTP2.holder;
-            url.setParameter("portlet2key1", "p2k1value1");
-            url.setParameter("portlet2key2", new String[]{"p2k2value1", "p2k2value2", "p2k2value3"});
-            return new InvokeGetResponse(url.toString());
+            return new InvokeGetResponse(urls[0]);
          }
       });