[jboss-cvs] jboss-portal/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer ...

[Chris Laprun]

  User: claprun 
  Date: 06/08/02 19:48:24

  Modified:    wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer 
                        MarkupTestCase.java
  Log:
  - Implemented producer-side support for sending caching information to consumers.
  - Added caching support tests.
  - Improved tests.
  
  Revision  Changes    Path
  1.20      +14 -5     jboss-portal/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MarkupTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- MarkupTestCase.java	31 Jul 2006 19:29:59 -0000	1.19
  +++ MarkupTestCase.java	2 Aug 2006 23:48:24 -0000	1.20
  @@ -26,6 +26,7 @@
   import org.jboss.portal.WindowState;
   import org.jboss.portal.common.MediaType;
   import org.jboss.portal.common.util.Tools;
  +import org.jboss.portal.portlet.Parameters;
   import org.jboss.portal.portlet.PortletURL;
   import org.jboss.portal.portlet.StateString;
   import org.jboss.portal.portlet.impl.spi.AbstractInvocationContext;
  @@ -45,7 +46,6 @@
   import org.jboss.portal.portlet.spi.WindowContext;
   import org.jboss.portal.portlet.state.AccessMode;
   import org.jboss.portal.server.util.HTTPStreamInfo;
  -import org.jboss.portal.portlet.Parameters;
   import org.jboss.portal.test.wsrp.TestWSRPProducerImpl;
   import org.jboss.portal.wsrp.WSRPConstants;
   import org.jboss.portal.wsrp.consumer.ProducerSessionInformation;
  @@ -74,7 +74,7 @@
   
   /**
    * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
  - * @version $Revision: 1.19 $
  + * @version $Revision: 1.20 $
    * @since 2.4 (May 4, 2006)
    */
   public class MarkupTestCase extends V1ConsumerBaseTest
  @@ -90,7 +90,15 @@
   
         consumer.invoke(render);
   
  -      checkRenderResult(render, "portlet1:view:maximized");
  +      FragmentResult result = checkRenderResult(render, "portlet1:view:maximized");
  +      assertEquals(15, result.getExpirationSecs());
  +
  +      render = createRenderInvocation(SOF.PORTLET_HANDLE_2);
  +
  +      consumer.invoke(render);
  +
  +      result = checkRenderResult(render, "portlet2:0:view:maximized");
  +      assertEquals(0, result.getExpirationSecs());
      }
   
      public void testAction() throws Exception
  @@ -151,13 +159,14 @@
         assertEquals(TestWSRPProducerImpl.USER_COOKIE, sessionInfo.getUserCookie());
      }
   
  -   private void checkRenderResult(RenderInvocation render, String markup)
  +   private FragmentResult checkRenderResult(RenderInvocation render, String markup)
      {
         Result result = render.getResult();
         assertNotNull(result);
         assertTrue(result instanceof FragmentResult);
         FragmentResult fragment = (FragmentResult)result;
         assertEquals(markup, fragment.getChars().toString());
  +      return fragment;
      }
   
      private RenderInvocation createRenderInvocation(String portletHandle)
  @@ -357,7 +366,7 @@
            return id;
         }
   
  -      public void portletCloned( String cloneId)
  +      public void portletCloned(String cloneId)
         {
            //nothing
         }