svn commit: r1124387 - in /myfaces/core/branches/1.1.x/api/src: main/java/javax/faces/application/FacesMessage.java test/java/javax/faces/application/FacesMessageTest.java

[ja...@apache.org]

Author: jakobk
Date: Wed May 18 19:16:56 2011
New Revision: 1124387

URL: http://svn.apache.org/viewvc?rev=1124387&view=rev
Log:
MYFACES-3140 FacesMessage.VALUES is not ordered properly (merge changes in 1.1.x branch)

Modified:
    myfaces/core/branches/1.1.x/api/src/main/java/javax/faces/application/FacesMessage.java
    myfaces/core/branches/1.1.x/api/src/test/java/javax/faces/application/FacesMessageTest.java

Modified: myfaces/core/branches/1.1.x/api/src/main/java/javax/faces/application/FacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.1.x/api/src/main/java/javax/faces/application/FacesMessage.java?rev=1124387&r1=1124386&r2=1124387&view=diff
==============================================================================
--- myfaces/core/branches/1.1.x/api/src/main/java/javax/faces/application/FacesMessage.java (original)
+++ myfaces/core/branches/1.1.x/api/src/main/java/javax/faces/application/FacesMessage.java Wed May 18 19:16:56 2011
@@ -55,8 +55,11 @@ public class FacesMessage
         map.put(SEVERITY_WARN.toString(), SEVERITY_WARN);
         map.put(SEVERITY_ERROR.toString(), SEVERITY_ERROR);
         map.put(SEVERITY_FATAL.toString(), SEVERITY_FATAL);
-        VALUES = Collections.unmodifiableList(new ArrayList(map.values()));
         VALUES_MAP = Collections.unmodifiableMap(map);
+
+        List severityList = new ArrayList(map.values());
+        Collections.sort(severityList); // the JSF spec requires it to be sorted
+        VALUES = Collections.unmodifiableList(severityList);
     }
 
     private FacesMessage.Severity _severity;

Modified: myfaces/core/branches/1.1.x/api/src/test/java/javax/faces/application/FacesMessageTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.1.x/api/src/test/java/javax/faces/application/FacesMessageTest.java?rev=1124387&r1=1124386&r2=1124387&view=diff
==============================================================================
--- myfaces/core/branches/1.1.x/api/src/test/java/javax/faces/application/FacesMessageTest.java (original)
+++ myfaces/core/branches/1.1.x/api/src/test/java/javax/faces/application/FacesMessageTest.java Wed May 18 19:16:56 2011
@@ -21,6 +21,10 @@ package javax.faces.application;
 
 import junit.framework.TestCase;
 
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
 public class FacesMessageTest extends TestCase {
 
     public static void main(String[] args) {
@@ -168,4 +172,28 @@ public class FacesMessageTest extends Te
         assertEquals(0, FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_ERROR));
         assertEquals(0, FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_FATAL));
     }
+
+    public void testSeverityValues()
+    {
+        // JSF spec requires this list to be sorted by ordinal
+        for (int i = 0, sz = FacesMessage.VALUES.size(); i < sz; i++)
+        {
+            FacesMessage.Severity severity = (FacesMessage.Severity) FacesMessage.VALUES.get(i);
+            assertEquals(i + 1, severity.getOrdinal());
+        }
+    }
+
+    public void testSeverityValuesMap()
+    {
+        Map severityMap = FacesMessage.VALUES_MAP;
+        Set entrySet = severityMap.entrySet();
+
+        for (Iterator it = entrySet.iterator(); it.hasNext(); )
+        {
+            Map.Entry e = (Map.Entry) it.next();
+
+            assertEquals(e.getKey(), e.getValue().toString());
+        }
+    }
+
 }