Author: julien(a)jboss.com Date: 2008-04-12 08:49:44 -0400 (Sat, 12 Apr 2008) New Revision: 10548 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/portlet/PortletRequestDecoderTestCase.java Log: refactored PortletRequestDecoderTestCase Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/portlet/PortletRequestDecoderTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/portlet/PortletRequestDecoderTestCase.java 2008-04-12 10:36:56 UTC (rev 10547) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/portlet/PortletRequestDecoderTestCase.java 2008-04-12 12:49:44 UTC (rev 10548) @@ -28,6 +28,7 @@ import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.OpaqueStateString; import org.jboss.portal.portlet.ParametersStateString; +import org.jboss.portal.portlet.StateString; import java.util.HashMap; import java.util.Map; @@ -50,7 +51,6 @@ return new String[]{s}; } - public void testCorruped() { Map queryParams = new HashMap(); @@ -58,103 +58,55 @@ PortletRequestDecoder o = new PortletRequestDecoder(); // Action + Mode - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.MODE_MASK))); - o.decode(queryParams, null); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - } - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.MODE_MASK))); - bodyParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); - o.decode(queryParams, bodyParams); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - bodyParams.clear(); - } + queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.MODE_MASK))); + assertFail(o, queryParams, null); + queryParams.clear(); + // + queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.MODE_MASK))); + bodyParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); + assertFail(o, queryParams, bodyParams); + queryParams.clear(); + bodyParams.clear(); + // Action + WindowState - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.WINDOW_STATE_MASK))); - o.decode(queryParams, null); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - } - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.WINDOW_STATE_MASK))); - bodyParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); - o.decode(queryParams, bodyParams); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - bodyParams.clear(); - } + queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.WINDOW_STATE_MASK))); + assertFail(o, queryParams, null); + queryParams.clear(); + // + queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.WINDOW_STATE_MASK))); + bodyParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); + assertFail(o, queryParams, bodyParams); + queryParams.clear(); + bodyParams.clear(); + // Render + Mode - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.MODE_MASK))); - o.decode(queryParams, null); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - } - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.MODE_MASK))); - bodyParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); - o.decode(queryParams, bodyParams); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - bodyParams.clear(); - } + queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.MODE_MASK))); + assertFail(o, queryParams, null); + queryParams.clear(); + // + queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.MODE_MASK))); + bodyParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); + assertFail(o, queryParams, bodyParams); + queryParams.clear(); + bodyParams.clear(); + // Render + WindowState - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.WINDOW_STATE_MASK))); - o.decode(queryParams, bodyParams); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - } - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.WINDOW_STATE_MASK))); - bodyParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); - o.decode(queryParams, bodyParams); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - bodyParams.clear(); - } + queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.WINDOW_STATE_MASK))); + assertFail(o, queryParams, bodyParams); + queryParams.clear(); + + // + queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.WINDOW_STATE_MASK))); + bodyParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); + assertFail(o, queryParams, bodyParams); + queryParams.clear(); + bodyParams.clear(); } - + public void testNav() { Map queryParams = new HashMap(); @@ -163,84 +115,48 @@ // Empty o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertNav(o, null, null); queryParams.clear(); // Query mode queryParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertEquals(Mode.VIEW, o.getMode()); - assertNull(o.getWindowState()); + assertNav(o, Mode.VIEW, null); queryParams.clear(); // Query mode two values queryParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(), Mode.EDIT.toString()}); o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertEquals(Mode.VIEW, o.getMode()); - assertNull(o.getWindowState()); + assertNav(o, Mode.VIEW, null); queryParams.clear(); // Body mode bodyParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertNav(o, null, null); bodyParams.clear(); // Query mode + Body mode queryParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString()}); bodyParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.EDIT.toString()}); o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertEquals(Mode.VIEW, o.getMode()); - assertNull(o.getWindowState()); + assertNav(o, Mode.VIEW, null); queryParams.clear(); bodyParams.clear(); // Query window state queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertNull(o.getMode()); - assertEquals(WindowState.NORMAL, o.getWindowState()); + assertNav(o, null, WindowState.NORMAL); queryParams.clear(); // Body window state bodyParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertNav(o, null, null); bodyParams.clear(); } - public void testRender() { Map queryParams = new HashMap(); @@ -249,40 +165,24 @@ // Empty queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE))); o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertEquals(ParametersStateString.create(), o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertRender(o, ParametersStateString.create(), null, null); queryParams.clear(); // Query mode queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.MODE_MASK))); queryParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertEquals(ParametersStateString.create(), o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertEquals(Mode.VIEW, o.getMode()); - assertNull(o.getWindowState()); + assertRender(o, ParametersStateString.create(), Mode.VIEW, null); queryParams.clear(); // Query window state queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.WINDOW_STATE_MASK))); queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertEquals(ParametersStateString.create(), o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertEquals(WindowState.NORMAL, o.getWindowState()); + assertRender(o, ParametersStateString.create(), null, WindowState.NORMAL); queryParams.clear(); } - public void testRenderNonOpaque() { Map queryParams = new HashMap(); @@ -294,26 +194,16 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE))); queryParams.put("foo", asStringArray("bar")); o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); navState.setValue("foo", "bar"); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertRender(o, navState, null, null); navState.clear(); queryParams.clear(); // Query meta parameter queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_PHASE), "bar"}); o.decode(queryParams, null); - 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()); + assertRender(o, navState, null, null); navState.clear(); queryParams.clear(); @@ -321,13 +211,8 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.WINDOW_STATE_MASK)}); queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, new String[]{WindowState.NORMAL.toString(), "bar"}); o.decode(queryParams, null); - 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()); + assertRender(o, navState, null, WindowState.NORMAL); navState.clear(); queryParams.clear(); @@ -335,13 +220,8 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_PHASE)}); queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, new String[]{"bar"}); o.decode(queryParams, null); - 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()); + assertRender(o, navState, null, null); navState.clear(); queryParams.clear(); @@ -349,13 +229,8 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.MODE_MASK)}); queryParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(), "bar"}); o.decode(queryParams, null); - 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()); + assertRender(o, navState, Mode.VIEW, null); navState.clear(); queryParams.clear(); @@ -363,13 +238,8 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_PHASE)}); queryParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{"bar"}); o.decode(queryParams, null); - 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()); + assertRender(o, navState, null, null); navState.clear(); queryParams.clear(); @@ -377,12 +247,7 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE))); bodyParams.put("foo", asStringArray("bar2")); o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertRender(o, navState, null, null); navState.clear(); queryParams.clear(); bodyParams.clear(); @@ -391,13 +256,8 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE))); queryParams.put("foo", new String[]{"bar1", "bar2"}); o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); navState.setValues("foo", new String[]{"bar1", "bar2"}); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertRender(o, navState, null, null); navState.clear(); queryParams.clear(); @@ -406,19 +266,13 @@ queryParams.put("foo", new String[]{"bar1"}); bodyParams.put("foo", new String[]{"bar2"}); o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); navState.setValue("foo", "bar1"); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertRender(o, navState, null, null); navState.clear(); queryParams.clear(); bodyParams.clear(); } - public void testRenderOpaque() { Map queryParams = new HashMap(); @@ -428,36 +282,21 @@ // Empty queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.OPAQUE_MASK))); o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertRender(o, null, null, null); queryParams.clear(); // Query nav state queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.OPAQUE_MASK))); queryParams.put(PortletRequestDecoder.NAVIGATIONAL_STATE_PARAMETER, asStringArray("navstatevalue")); o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertEquals(new OpaqueStateString("navstatevalue"), o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertRender(o, new OpaqueStateString("navstatevalue"), null, null); queryParams.clear(); // Body nav state queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.OPAQUE_MASK))); bodyParams.put(PortletRequestDecoder.NAVIGATIONAL_STATE_PARAMETER, asStringArray("navstatevalue")); o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertRender(o, null, null, null); queryParams.clear(); bodyParams.clear(); @@ -465,29 +304,18 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.OPAQUE_MASK))); queryParams.put(PortletRequestDecoder.INTERACTION_STATE_PARAMETER, asStringArray("intstatevalue")); o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertRender(o, null, null, null); queryParams.clear(); // Body int state is ignored queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_PHASE | PortletRequestDecoder.OPAQUE_MASK))); bodyParams.put(PortletRequestDecoder.INTERACTION_STATE_PARAMETER, asStringArray("intstatevalue")); o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertRender(o, null, null, null); queryParams.clear(); bodyParams.clear(); } - public void testAction() { Map queryParams = new HashMap(); @@ -496,36 +324,21 @@ // Empty queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE))); o.decode(queryParams, null); - assertEquals(new ParameterMap(), o.getForm()); - assertEquals(ParametersStateString.create(), o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertAction(o, null, ParametersStateString.create(), new ParameterMap(), null, null); queryParams.clear(); // Query mode queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.MODE_MASK))); queryParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); o.decode(queryParams, null); - assertEquals(new ParameterMap(), o.getForm()); - assertEquals(ParametersStateString.create(), o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertEquals(Mode.VIEW, o.getMode()); - assertNull(o.getWindowState()); + assertAction(o, null, ParametersStateString.create(), new ParameterMap(), Mode.VIEW, null); queryParams.clear(); // Query window state queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.WINDOW_STATE_MASK))); queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); o.decode(queryParams, null); - assertEquals(new ParameterMap(), o.getForm()); - assertEquals(ParametersStateString.create(), o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertEquals(WindowState.NORMAL, o.getWindowState()); + assertAction(o, null, ParametersStateString.create(), new ParameterMap(), null, WindowState.NORMAL); queryParams.clear(); } @@ -542,13 +355,8 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE))); queryParams.put("foo", asStringArray("bar")); o.decode(queryParams, null); - assertEquals(form, o.getForm()); intState.setValue("foo", "bar"); - assertEquals(intState, o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertAction(o, null, intState, form, null, null); intState.clear(); queryParams.clear(); form.clear(); @@ -557,13 +365,8 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE))); queryParams.put("foo", new String[]{"bar1", "bar2"}); o.decode(queryParams, null); - assertEquals(form, o.getForm()); intState.setValues("foo", new String[]{"bar1", "bar2"}); - assertEquals(intState, o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertAction(o, null, intState, form, null, null); intState.clear(); queryParams.clear(); form.clear(); @@ -573,12 +376,7 @@ bodyParams.put("foo", asStringArray("bar")); o.decode(queryParams, bodyParams); form.setValue("foo", "bar"); - assertEquals(form, o.getForm()); - assertEquals(intState, o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertAction(o, null, intState, form, null, null); form.clear(); queryParams.clear(); bodyParams.clear(); @@ -589,12 +387,7 @@ bodyParams.put("foo", new String[]{"bar1", "bar2"}); o.decode(queryParams, bodyParams); form.setValues("foo", new String[]{"bar1", "bar2"}); - assertEquals(form, o.getForm()); - assertEquals(intState, o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertAction(o, null, intState, form, null, null); form.clear(); queryParams.clear(); bodyParams.clear(); @@ -611,36 +404,21 @@ // Empty queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.OPAQUE_MASK))); o.decode(queryParams, null); - assertEquals(new ParameterMap(), o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertAction(o, null, null, new ParameterMap(), null, null); queryParams.clear(); // Query nav state queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.OPAQUE_MASK))); queryParams.put(PortletRequestDecoder.NAVIGATIONAL_STATE_PARAMETER, asStringArray("navstatevalue")); o.decode(queryParams, null); - assertEquals(new ParameterMap(), o.getForm()); - assertNull(o.getInteractionState()); - assertEquals(new OpaqueStateString("navstatevalue"), o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertAction(o, new OpaqueStateString("navstatevalue"), null, new ParameterMap(), null, null); queryParams.clear(); // Query int state queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.OPAQUE_MASK))); queryParams.put(PortletRequestDecoder.INTERACTION_STATE_PARAMETER, asStringArray("intstatevalue")); o.decode(queryParams, null); - assertEquals(new ParameterMap(), o.getForm()); - assertEquals(new OpaqueStateString("intstatevalue"), o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertAction(o, null, new OpaqueStateString("intstatevalue"), new ParameterMap(), null, null); queryParams.clear(); // Body parameters @@ -654,13 +432,83 @@ form.setValue("foo1", "bar1"); form.setValues("foo2", new String[]{"bar2", "bar3"}); form.setValues("foo3", new String[]{"bar5"}); - assertEquals(form, o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); + assertAction(o, null, null, form, null, null); queryParams.clear(); bodyParams.clear(); } + + private void assertAction( + PortletRequestDecoder decoder, + StateString expectedNavigationalState, + StateString expectedInteractionState, + ParameterMap expectedForm, + Mode expectedMode, + WindowState expectedWindowState + ) + { + assertEquals(PortletRequestDecoder.ACTION_TYPE, decoder.getType()); + assertEquals(expectedNavigationalState, decoder.getNavigationalState()); + assertEquals(expectedInteractionState, decoder.getInteractionState()); + assertEquals(expectedForm, decoder.getForm()); + assertEquals(expectedMode, decoder.getMode()); + assertEquals(expectedWindowState, decoder.getWindowState()); + + // + assertNull(decoder.getResourceId()); + assertNull(decoder.getResourceState()); + } + + + private void assertRender( + PortletRequestDecoder decoder, + StateString expectedNavigationalState, + Mode expectedMode, + WindowState expectedWindowState + ) + { + assertEquals(PortletRequestDecoder.RENDER_TYPE, decoder.getType()); + assertEquals(expectedNavigationalState, decoder.getNavigationalState()); + assertEquals(expectedMode, decoder.getMode()); + assertEquals(expectedWindowState, decoder.getWindowState()); + + // + assertNull(decoder.getForm()); + assertNull(decoder.getInteractionState()); + assertNull(decoder.getResourceId()); + assertNull(decoder.getResourceState()); + } + + private void assertNav( + PortletRequestDecoder decoder, + Mode expectedMode, + WindowState expectedWindowState + ) + { + assertEquals(PortletRequestDecoder.NAV_TYPE, decoder.getType()); + assertEquals(expectedMode, decoder.getMode()); + assertEquals(expectedWindowState, decoder.getWindowState()); + + // + assertNull(decoder.getNavigationalState()); + assertNull(decoder.getForm()); + assertNull(decoder.getInteractionState()); + assertNull(decoder.getResourceId()); + assertNull(decoder.getResourceState()); + } + + private void assertFail( + PortletRequestDecoder decoder, + Map queryParams, + Map bodyParams) + { + try + { + queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_PHASE | PortletRequestDecoder.MODE_MASK))); + decoder.decode(queryParams, bodyParams); + fail(); + } + catch (IllegalArgumentException expected) + { + } + } } \ No newline at end of file