GTNPC-103: PortletSession.getAttributeMap(APPLICATION_SCOPE) is retur…

…ning null valued map
gatein · Apr 4, 2013 · 58edb4b · 58edb4b
1 parent 5c9e5cf
commit 58edb4b
Show file tree

Hide file tree

Showing 3 changed files with 117 additions and 7 deletions.
diff --git a/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletSessionImpl.java b/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletSessionImpl.java
@@ -209,13 +209,17 @@ public Map<String, Object> getAttributeMap()
    public Map<String, Object> getAttributeMap(int i)
    {
       Enumeration attributes = getAttributeNames(i);
-      Map<String, Object> attrs = new HashMap<String, Object>();
+      Map<String, Object> attrs = Collections.emptyMap();
       while (attributes.hasMoreElements())
       {
+         if (attrs.isEmpty())
+         {
+            attrs = new HashMap<String, Object>();
+         }
          String name = (String)attributes.nextElement();
-         attrs.put(name, getAttribute(name));
+         attrs.put(name, getAttribute(name, i));
       }
-      return Collections.unmodifiableMap(attrs);
+      return attrs.isEmpty() ? attrs : Collections.unmodifiableMap(attrs);
    }
 
    /**

diff --git a/test/core/src/main/java/org/gatein/pc/test/unit/Assert.java b/test/core/src/main/java/org/gatein/pc/test/unit/Assert.java
@@ -192,12 +192,12 @@ public static void assertEquals(String msg, Object expected, Object actual)
    {
       if (actual == null)
       {
-         if (msg == null)
-         {
-            msg = "Expected a null object";
-         }
          if (expected != null)
          {
+            if (msg == null)
+            {
+               msg = "Expected " + format(expected) + " instead of null";
+            }
             fail(msg);
          }
       }

diff --git a/...core/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletsession/AttributeMap.java b/...core/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletsession/AttributeMap.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2012 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.gatein.pc.test.portlet.jsr168.api.portletsession;
+
+import org.gatein.common.util.Tools;
+import org.gatein.pc.test.unit.Assertion;
+import org.gatein.pc.test.unit.PortletTestCase;
+import org.gatein.pc.test.unit.PortletTestContext;
+import org.gatein.pc.test.unit.actions.PortletRenderTestAction;
+import org.gatein.pc.test.unit.annotations.TestCase;
+import org.gatein.pc.test.unit.protocol.response.EndTestResponse;
+import org.gatein.pc.test.unit.protocol.response.Response;
+import org.gatein.pc.test.unit.web.UTP1;
+
+import javax.portlet.Portlet;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import java.util.Collections;
+import java.util.Map;
+
+import static org.gatein.pc.test.unit.Assert.assertEquals;
+import static org.gatein.pc.test.unit.Assert.assertTrue;
+import static org.gatein.pc.test.unit.Assert.fail;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+@TestCase({Assertion.API286_PORTLET_SESSION_4})
+public class AttributeMap
+{
+   public AttributeMap(PortletTestCase seq)
+   {
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
+      {
+         protected Response run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
+         {
+            PortletSession session = request.getPortletSession();
+
+            //
+            Map<String, Object> portletScope = session.getAttributeMap(PortletSession.PORTLET_SCOPE);
+            Map<String, Object> applicationScope = session.getAttributeMap(PortletSession.APPLICATION_SCOPE);
+
+            //
+            assertEquals(Collections.emptyMap(), portletScope);
+            assertEquals(Collections.emptyMap(), applicationScope);
+
+            //
+            session.setAttribute("portlet_key", "portlet_value", PortletSession.PORTLET_SCOPE);
+            session.setAttribute("application_key", "application_value", PortletSession.APPLICATION_SCOPE);
+
+            //
+            portletScope = session.getAttributeMap(PortletSession.PORTLET_SCOPE);
+            applicationScope = session.getAttributeMap(PortletSession.APPLICATION_SCOPE);
+
+            //
+            assertEquals(1, portletScope.size());
+            assertEquals("portlet_value", portletScope.get("portlet_key"));
+            assertEquals(null, portletScope.get("application_key"));
+            assertEquals(2, applicationScope.size());
+            assertTrue(applicationScope.containsValue("portlet_value"));
+            assertEquals("application_value", applicationScope.get("application_key"));
+
+            // Check unmodifiable
+            try
+            {
+               portletScope.remove("portlet_key");
+               fail();
+            }
+            catch (Exception ignore)
+            {
+            }
+            try
+            {
+               applicationScope.remove("application_key");
+               fail();
+            }
+            catch (Exception ignore)
+            {
+            }
+
+            //
+            return new EndTestResponse();
+         }
+      });
+   }
+}