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

[Julien Viet]

  User: julien  
  Date: 06/08/22 10:08:54

  Modified:    portlet/src/main/org/jboss/portal/portlet/test  
                        TestPortletInvoker.java ValueMapAssert.java
  Log:
  - refactored the ValueMap to PropertyMap and moved it in org.jboss.portal.portlet.state package
  - introduced TypedMap that is super type of ParameterMap and is reused for the PropertyMap
  
  Revision  Changes    Path
  1.11      +4 -6      jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TestPortletInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- TestPortletInvoker.java	31 Jul 2006 19:29:55 -0000	1.10
  +++ TestPortletInvoker.java	22 Aug 2006 14:08:54 -0000	1.11
  @@ -23,12 +23,10 @@
   
   import org.jboss.portal.common.invocation.InterceptorStack;
   import org.jboss.portal.common.system.AbstractJBossService;
  -import org.jboss.portal.common.value.ValueMap;
  +import org.jboss.portal.portlet.state.PropertyMap;
   import org.jboss.portal.portlet.Portlet;
   import org.jboss.portal.portlet.PortletInvoker;
   import org.jboss.portal.portlet.PortletInvokerException;
  -import org.jboss.portal.portlet.NoSuchPortletException;
  -import org.jboss.portal.portlet.info.PortletInfo;
   import org.jboss.portal.portlet.invocation.PortletInvocation;
   
   import java.util.Set;
  @@ -37,7 +35,7 @@
    * A simple consumer.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    */
   public class TestPortletInvoker extends AbstractJBossService implements PortletInvoker
   {
  @@ -153,12 +151,12 @@
         producer.destroyClone(portletId);
      }
   
  -   public ValueMap getProperties(String portletId) throws PortletInvokerException
  +   public PropertyMap getProperties(String portletId) throws PortletInvokerException
      {
         return producer.getProperties(portletId);
      }
   
  -   public void setProperties(String portletId, ValueMap properties) throws PortletInvokerException
  +   public void setProperties(String portletId, PropertyMap properties) throws PortletInvokerException
      {
         producer.setProperties(portletId, properties);
      }
  
  
  
  1.2       +6 -6      jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/ValueMapAssert.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ValueMapAssert.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/ValueMapAssert.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ValueMapAssert.java	30 Jul 2006 12:36:23 -0000	1.1
  +++ ValueMapAssert.java	22 Aug 2006 14:08:54 -0000	1.2
  @@ -22,7 +22,7 @@
   package org.jboss.portal.portlet.test;
   
   import junit.framework.Assert;
  -import org.jboss.portal.common.value.ValueMap;
  +import org.jboss.portal.portlet.state.PropertyMap;
   import org.jboss.portal.common.value.Value;
   
   import java.util.HashSet;
  @@ -30,11 +30,11 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class ValueMapAssert extends Assert
   {
  -   public static void assertEquals(ValueMap vm1, ValueMap vm2)
  +   public static void assertEquals(PropertyMap vm1, PropertyMap vm2)
      {
         if (vm1 == null)
         {
  @@ -49,12 +49,12 @@
            {
               fail("Value map should not be null");
            }
  -         assertEquals("Value maps don't have the same keys", new HashSet(vm1.getKeys()), new HashSet(vm2.getKeys()));
  -         for (Iterator i = vm1.getKeys().iterator(); i.hasNext();)
  +         assertEquals("Value maps don't have the same keys", new HashSet(vm1.keySet()), new HashSet(vm2.keySet()));
  +         for (Iterator i = vm1.keySet().iterator(); i.hasNext();)
            {
               String key = (String)i.next();
  -            Value v1 = vm1.getValue(key);
  -            Value v2 = vm2.getValue(key);
  +            Value v1 = vm1.getProperty(key);
  +            Value v2 = vm2.getProperty(key);
               assertEquals("Values for key " + key + " are not equals", v1, v2);
            }
         }