You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2011/06/24 09:32:13 UTC
svn commit: r1139182 -
/struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java
Author: jogep
Date: Fri Jun 24 07:32:13 2011
New Revision: 1139182
URL: http://svn.apache.org/viewvc?rev=1139182&view=rev
Log:
WW-3620: Bring Portlet 2.0 (JSR286) plugin from sandbox to trunk
Modified:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java
Modified: struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java?rev=1139182&r1=1139181&r2=1139182&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java (original)
+++ struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java Fri Jun 24 07:32:13 2011
@@ -83,26 +83,27 @@ public class PortletRequestMapTest exten
PortletRequestMap map = new PortletRequestMap(request);
Set entries = map.entrySet();
- //TODO Why is Entry Size 3?
-// assertEquals(2, entries.size());
-// Iterator it = entries.iterator();
-// Map.Entry entry = (Map.Entry)it.next();
-// checkEntry(entry);
-// entry = (Map.Entry)it.next();
-// checkEntry(entry);
-
+ assertEquals(3, entries.size());
+ Iterator it = entries.iterator();
+ for (Iterator iterator = entries.iterator(); iterator.hasNext();) {
+ Map.Entry entry = (Map.Entry) iterator.next();
+ checkEntry(entry);
+ }
}
- private void checkEntry(Map.Entry entry) {
- if(entry.getKey().equals("testAttribute1")) {
+ private void checkEntry(Map.Entry entry) {
+ if(entry.getKey().equals("testAttribute1")) {
assertEquals("testValue1", entry.getValue());
}
else if(entry.getKey().equals("testAttribute2")) {
assertEquals("testValue2", entry.getValue());
}
+ else if(entry.getKey().equals("javax.portlet.lifecycle_phase")) {
+ assertNull(entry.getValue());
+ }
else {
fail("Unexpected entry in entry set: " + entry);
}
- }
+ }
}