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

[Chris Laprun]

  User: claprun 
  Date: 06/08/08 16:56:58

  Modified:    wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer 
                        MarkupTestCase.java
  Log:
  - Added tests in testInitCookie to test things are right when we don't want cookies to be initialized.
  - Removed unused (and un-initialized) consumerProxy.
  - Added test to check that we do have a producer Id for the consumer.
  
  Revision  Changes    Path
  1.22      +18 -4     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.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- MarkupTestCase.java	8 Aug 2006 04:29:27 -0000	1.21
  +++ MarkupTestCase.java	8 Aug 2006 20:56:58 -0000	1.22
  @@ -37,7 +37,7 @@
   
   /**
    * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
  - * @version $Revision: 1.21 $
  + * @version $Revision: 1.22 $
    * @since 2.4 (May 4, 2006)
    */
   public class MarkupTestCase extends V1ConsumerBaseTest
  @@ -109,7 +109,7 @@
   
      public void testInitCookie() throws Exception
      {
  -      producer.setRequiresInitCookie(CookieProtocol.perUser);
  +      // first test that we don't initialize cookies if we don't need it
         RenderInvocation render = createRenderInvocation(SOF.PORTLET_HANDLE_1);
         TestInvocationContext invocationContext = (TestInvocationContext)render.getContext();
         HttpSession session = invocationContext.mockRequest.getSession();
  @@ -119,10 +119,24 @@
   
         ProducerSessionInformation sessionInfo = consumer.getProducerSessionInformationFrom(session);
         assertFalse(sessionInfo.isPerGroupCookies());
  -      assertTrue(sessionInfo.isUserCookiesInitialized());
  +      assertFalse(sessionInfo.isUserCookiesInitialized());
         String userCookie = sessionInfo.getUserCookie();
  +      assertNull(userCookie);
  +
  +      // now require cookie initialization and check that everything went well
  +      producer.setRequiresInitCookie(CookieProtocol.perUser);
  +      render = createRenderInvocation(SOF.PORTLET_HANDLE_1);
  +      invocationContext = (TestInvocationContext)render.getContext();
  +      session = invocationContext.mockRequest.getSession();
  +      producer.setResponse(invocationContext.mockResponse);
  +
  +      consumer.invoke(render);
  +
  +      sessionInfo = consumer.getProducerSessionInformationFrom(session);
  +      assertFalse(sessionInfo.isPerGroupCookies());
  +      assertTrue(sessionInfo.isUserCookiesInitialized());
  +      userCookie = sessionInfo.getUserCookie();
         assertNotNull(userCookie);
  -      assertEquals(TestWSRPProducerImpl.USER_COOKIE, userCookie);
      }
   
      private FragmentResult checkRenderResult(RenderInvocation render, String markup)