[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/test/portlet ...

Julien Viet julien at jboss.com
Wed Jul 12 04:17:50 EDT 2006


  User: julien  
  Date: 06/07/12 04:17:50

  Modified:    portlet/src/main/org/jboss/portal/test/portlet 
                        PortletRequestDecoderTestCase.java
  Log:
  added test case for query parameter conflict with JBP parameters
  
  Revision  Changes    Path
  1.3       +82 -1     jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletRequestDecoderTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- PortletRequestDecoderTestCase.java	9 Jul 2006 12:04:17 -0000	1.2
  +++ PortletRequestDecoderTestCase.java	12 Jul 2006 08:17:50 -0000	1.3
  @@ -35,7 +35,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class PortletRequestDecoderTestCase extends TestCase
   {
  @@ -296,6 +296,76 @@
         assertNull(o.getMode());
         assertNull(o.getWindowState());
         navState.clear();
  +      params.clear();
  +
  +      // Query meta parameter
  +      params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK),"bar"}));
  +      o.decode(params);
  +      assertNull(o.getForm());
  +      assertNull(o.getInteractionState());
  +      navState.setValue(PortletRequestDecoder.META_PARAMETER, "bar");
  +      assertEquals(navState, o.getNavigationalstate());
  +      assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType());
  +      assertNull(o.getMode());
  +      assertNull(o.getWindowState());
  +      navState.clear();
  +      params.clear();
  +
  +      // Query window state parameter + window state meta parameter
  +      params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK|PortletRequestDecoder.WINDOW_STATE_MASK)}));
  +      params.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.WINDOW_STATE_PARAMETER, new String[]{WindowState.NORMAL.toString(),"bar"}));
  +      o.decode(params);
  +      assertNull(o.getForm());
  +      assertNull(o.getInteractionState());
  +      navState.setValue(PortletRequestDecoder.WINDOW_STATE_PARAMETER, "bar");
  +      assertEquals(navState, o.getNavigationalstate());
  +      assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType());
  +      assertNull(o.getMode());
  +      assertEquals(WindowState.NORMAL, o.getWindowState());
  +      navState.clear();
  +      params.clear();
  +
  +      // Query window state parameter
  +      params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK)}));
  +      params.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.WINDOW_STATE_PARAMETER, new String[]{"bar"}));
  +      o.decode(params);
  +      assertNull(o.getForm());
  +      assertNull(o.getInteractionState());
  +      navState.setValue(PortletRequestDecoder.WINDOW_STATE_PARAMETER, "bar");
  +      assertEquals(navState, o.getNavigationalstate());
  +      assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType());
  +      assertNull(o.getMode());
  +      assertNull(o.getWindowState());
  +      navState.clear();
  +      params.clear();
  +
  +      // Query mode parameter + mode meta parameter
  +      params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK|PortletRequestDecoder.MODE_MASK)}));
  +      params.put(PortletRequestDecoder.MODE_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(),"bar"}));
  +      o.decode(params);
  +      assertNull(o.getForm());
  +      assertNull(o.getInteractionState());
  +      navState.setValue(PortletRequestDecoder.MODE_PARAMETER, "bar");
  +      assertEquals(navState, o.getNavigationalstate());
  +      assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType());
  +      assertEquals(Mode.VIEW, o.getMode());
  +      assertNull(o.getWindowState());
  +      navState.clear();
  +      params.clear();
  +
  +      // Query mode parameter
  +      params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK)}));
  +      params.put(PortletRequestDecoder.MODE_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.MODE_PARAMETER, new String[]{"bar"}));
  +      o.decode(params);
  +      assertNull(o.getForm());
  +      assertNull(o.getInteractionState());
  +      navState.setValue(PortletRequestDecoder.MODE_PARAMETER, "bar");
  +      assertEquals(navState, o.getNavigationalstate());
  +      assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType());
  +      assertNull(o.getMode());
  +      assertNull(o.getWindowState());
  +      navState.clear();
  +      params.clear();
   
         // Body parameter
         params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(PortletRequestDecoder.RENDER_MASK)));
  @@ -308,6 +378,7 @@
         assertNull(o.getMode());
         assertNull(o.getWindowState());
         navState.clear();
  +      params.clear();
   
         // Query multivalued parameter
         params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(PortletRequestDecoder.RENDER_MASK)));
  @@ -321,6 +392,7 @@
         assertNull(o.getMode());
         assertNull(o.getWindowState());
         navState.clear();
  +      params.clear();
   
         // Query + Body parameter
         params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(PortletRequestDecoder.RENDER_MASK)));
  @@ -334,6 +406,7 @@
         assertNull(o.getMode());
         assertNull(o.getWindowState());
         navState.clear();
  +      params.clear();
      }
   
      public void testRenderOpaque()
  @@ -462,6 +535,8 @@
         assertNull(o.getMode());
         assertNull(o.getWindowState());
         intState.clear();
  +      params.clear();
  +      form.clear();
   
         // Query multivalued parameter
         params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(PortletRequestDecoder.ACTION_MASK)));
  @@ -475,6 +550,8 @@
         assertNull(o.getMode());
         assertNull(o.getWindowState());
         intState.clear();
  +      params.clear();
  +      form.clear();
   
         // Body parameter
         params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(PortletRequestDecoder.ACTION_MASK)));
  @@ -488,6 +565,8 @@
         assertNull(o.getMode());
         assertNull(o.getWindowState());
         form.clear();
  +      params.clear();
  +      form.clear();
   
         // Body multivalued parameter
         params.put(PortletRequestDecoder.META_PARAMETER, RequestParameter.createQuery(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(PortletRequestDecoder.ACTION_MASK)));
  @@ -501,6 +580,8 @@
         assertNull(o.getMode());
         assertNull(o.getWindowState());
         form.clear();
  +      params.clear();
  +      form.clear();
      }
   
      public void testActionOpaque()
  
  
  



More information about the jboss-cvs-commits mailing list