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

[Julien Viet]

  User: julien  
  Date: 06/08/23 08:55:02

  Modified:    portlet/src/main/org/jboss/portal/test/portlet/state 
                        StatefulPortletInvokerTestCase.java
  Log:
  updated implementation of PortletInvoker.setProperties(...) to use a list of property changes instead of a PropertyMap in order to match WSRP semantics
  
  Revision  Changes    Path
  1.5       +34 -17    jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/state/StatefulPortletInvokerTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StatefulPortletInvokerTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/state/StatefulPortletInvokerTestCase.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- StatefulPortletInvokerTestCase.java	22 Aug 2006 14:51:49 -0000	1.4
  +++ StatefulPortletInvokerTestCase.java	23 Aug 2006 12:55:02 -0000	1.5
  @@ -27,6 +27,7 @@
   import org.jboss.portal.portlet.state.producer.NoSuchStateException;
   import org.jboss.portal.portlet.state.PropertyMap;
   import org.jboss.portal.portlet.state.SimplePropertyMap;
  +import org.jboss.portal.portlet.state.PropertyChange;
   import org.jboss.portal.portlet.NoSuchPortletException;
   import org.jboss.portal.portlet.InvalidPortletIdException;
   import org.jboss.portal.portlet.test.ValueMapAssert;
  @@ -40,7 +41,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public class StatefulPortletInvokerTestCase extends TestCase
   {
  @@ -502,7 +503,7 @@
      {
         try
         {
  -         invoker.setProperties(null, new SimplePropertyMap());
  +         invoker.setProperties(null, new PropertyChange[0]);
            fail("Was expecting an IllegalArgumentException");
         }
         catch (IllegalArgumentException expected)
  @@ -529,7 +530,7 @@
         String popId = invoker.wrapPOPId("PortletId");
         try
         {
  -         invoker.setProperties(popId, new SimplePropertyMap());
  +         invoker.setProperties(popId, new PropertyChange[0]);
            fail("Was expecting an InvalidPortletIdException");
         }
         catch (InvalidPortletIdException expected)
  @@ -542,7 +543,7 @@
         String ccpId = invoker.wrapCCPId("1");
         try
         {
  -         invoker.setProperties(ccpId, new SimplePropertyMap());
  +         invoker.setProperties(ccpId, new PropertyChange[0]);
            fail("Was expecting a NoSuchPortletException");
         }
         catch (NoSuchPortletException expected)
  @@ -552,28 +553,44 @@
   
      public void testSetCCPProperties() throws Exception
      {
  -      String stateId = stateStore.createState("PortletId", new SimplePropertyMap());
  +      SimplePropertyMap initialProps = new SimplePropertyMap();
  +      initialProps.setProperty("override_update", new StringValue("override_update_clone_value"));
  +      initialProps.setProperty("override_reset", new StringValue("override_reset_clone_value"));
  +      initialProps.setProperty("dynamic_update", new StringValue("dynamic_update_clone_value"));
  +      initialProps.setProperty("dynamic_reset", new StringValue("dynamic_reset_clone_value"));
  +      String stateId = stateStore.createState("PortletId", initialProps);
         nextInvoker.addPortlet(new PortletSupport("PortletId")
         {
            {
  -            info.getPreferencesSupport().addPreference("abc", new StringValue("def"));
  -            info.getPreferencesSupport().addPreference("ghi", new StringValue("jkl"));
  -            info.getPreferencesSupport().addPreference("mno", new StringValue("pqr"), Boolean.TRUE);
  -            info.getPreferencesSupport().addPreference("stu", new StringValue("vwx"), Boolean.TRUE);
  +            info.getPreferencesSupport().addPreference("override_update", new StringValue("override_update_portlet_value"));
  +            info.getPreferencesSupport().addPreference("override_reset", new StringValue("override_reset_portlet_value"));
  +            info.getPreferencesSupport().addPreference("override_create", new StringValue("override_create_portlet_value"));
  +            info.getPreferencesSupport().addPreference("readonly_create", new StringValue("readonly_create_portlet_value"), Boolean.TRUE);
            }
         });
         String ccpId = invoker.wrapCCPId(stateId);
  -      SimplePropertyMap newProperties = new SimplePropertyMap();
  -      newProperties.setProperty("abc", new StringValue("def"));
  -      newProperties.setProperty("ghi", new StringValue("_jkl"));
  -      newProperties.setProperty("mno", new StringValue("pqr"));
  -      newProperties.setProperty("stu", new StringValue("_vwx"));
  -      invoker.setProperties(ccpId, newProperties);
  +
  +      //
  +      PropertyChange[] changes = new PropertyChange[]
  +      {
  +         PropertyChange.newUpdate("override_update", new StringValue("override_update_clone_value_2")),
  +         PropertyChange.newReset("override_reset"),
  +         PropertyChange.newUpdate("override_create", new StringValue("override_create_clone_value_2")),
  +         PropertyChange.newUpdate("dynamic_update", new StringValue("dynamic_update_clone_value_2")),
  +         PropertyChange.newReset("dynamic_reset"),
  +         PropertyChange.newUpdate("dynamic_create", new StringValue("dynamic_create_clone_value_2")),
  +         PropertyChange.newUpdate("readonly_create", new StringValue("readonly_create_clone_value_2")),
  +      };
  +      invoker.setProperties(ccpId, changes);
  +
  +      //
         State state = stateStore.loadState(stateId);
         PropertyMap props = state.getProperties();
         PropertyMap expectedProps = new SimplePropertyMap();
  -      expectedProps.setProperty("abc", new StringValue("def"));
  -      expectedProps.setProperty("ghi", new StringValue("_jkl"));
  +      expectedProps.setProperty("override_update", new StringValue("override_update_clone_value_2"));
  +      expectedProps.setProperty("override_create", new StringValue("override_create_clone_value_2"));
  +      expectedProps.setProperty("dynamic_update", new StringValue("dynamic_update_clone_value_2"));
  +      expectedProps.setProperty("dynamic_create", new StringValue("dynamic_create_clone_value_2"));
         ValueMapAssert.assertEquals(expectedProps, props);
      }