You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/08/17 08:53:30 UTC
svn commit: r566942 - in /myfaces/tobago/trunk/extension/message-fix: ./
src/main/java/org/apache/myfaces/tobago/extension/fix/message/ src/test/
src/test/java/ src/test/java/org/ src/test/java/org/apache/
src/test/java/org/apache/myfaces/ src/test/jav...
Author: bommel
Date: Thu Aug 16 23:53:29 2007
New Revision: 566942
URL: http://svn.apache.org/viewvc?view=rev&rev=566942
Log:
adding FacesContextWrapper for fixing the message order problem with ri < 1.2
Added:
myfaces/tobago/trunk/extension/message-fix/src/test/
myfaces/tobago/trunk/extension/message-fix/src/test/java/
myfaces/tobago/trunk/extension/message-fix/src/test/java/org/
myfaces/tobago/trunk/extension/message-fix/src/test/java/org/apache/
myfaces/tobago/trunk/extension/message-fix/src/test/java/org/apache/myfaces/
myfaces/tobago/trunk/extension/message-fix/src/test/java/org/apache/myfaces/tobago/
myfaces/tobago/trunk/extension/message-fix/src/test/java/org/apache/myfaces/tobago/extension/
myfaces/tobago/trunk/extension/message-fix/src/test/java/org/apache/myfaces/tobago/extension/fix/
myfaces/tobago/trunk/extension/message-fix/src/test/java/org/apache/myfaces/tobago/extension/fix/message/
myfaces/tobago/trunk/extension/message-fix/src/test/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextUnitTest.java
Modified:
myfaces/tobago/trunk/extension/message-fix/pom.xml
myfaces/tobago/trunk/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContext.java
Modified: myfaces/tobago/trunk/extension/message-fix/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/message-fix/pom.xml?view=diff&rev=566942&r1=566941&r2=566942
==============================================================================
--- myfaces/tobago/trunk/extension/message-fix/pom.xml (original)
+++ myfaces/tobago/trunk/extension/message-fix/pom.xml Thu Aug 16 23:53:29 2007
@@ -39,6 +39,12 @@
<artifactId>myfaces-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.0.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>
@@ -94,5 +100,4 @@
</build>
</profile>
</profiles>
-
</project>
Modified: myfaces/tobago/trunk/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContext.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContext.java?view=diff&rev=566942&r1=566941&r2=566942
==============================================================================
--- myfaces/tobago/trunk/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContext.java (original)
+++ myfaces/tobago/trunk/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContext.java Thu Aug 16 23:53:29 2007
@@ -43,7 +43,7 @@
private FacesMessage.Severity maximumSeverity;
private boolean released = false;
- public MessageFixFacesContext(FacesContext facesContext) {
+ MessageFixFacesContext(FacesContext facesContext) {
this.facesContext = facesContext;
}
Added: myfaces/tobago/trunk/extension/message-fix/src/test/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/message-fix/src/test/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextUnitTest.java?view=auto&rev=566942
==============================================================================
--- myfaces/tobago/trunk/extension/message-fix/src/test/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextUnitTest.java (added)
+++ myfaces/tobago/trunk/extension/message-fix/src/test/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextUnitTest.java Thu Aug 16 23:53:29 2007
@@ -0,0 +1,78 @@
+package org.apache.myfaces.tobago.extension.fix.message;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.shale.test.base.AbstractJsfTestCase;
+
+import javax.faces.context.FacesContext;
+import javax.faces.application.FacesMessage;
+import java.util.Iterator;
+
+/*
+ * Date: Aug 17, 2007
+ * Time: 8:22:00 AM
+ */
+public class MessageFixFacesContextUnitTest extends AbstractJsfTestCase {
+
+ public MessageFixFacesContextUnitTest(String name) {
+ super(name);
+ }
+
+ public void testFacesContext() {
+ String[] clientIds = { "_id1", "_id2", "_id3", null };
+ FacesMessage [] messages =
+ { new FacesMessage(),
+ new FacesMessage("Test1"),
+ new FacesMessage(FacesMessage.SEVERITY_WARN, "Test2a", "Test2a Detail"),
+ new FacesMessage(FacesMessage.SEVERITY_INFO, "Test2b", "Test2b Detail"),
+ new FacesMessage( "Global Message") };
+
+ FacesContext facesContext = new MessageFixFacesContext(this.facesContext);
+ facesContext.addMessage(clientIds[0], messages[0]);
+ facesContext.addMessage(clientIds[1], messages[1]);
+ facesContext.addMessage(clientIds[2], messages[2]);
+ facesContext.addMessage(clientIds[2], messages[3]);
+ facesContext.addMessage(clientIds[3], messages[4]);
+
+ Iterator clientIdWithMessages = facesContext.getClientIdsWithMessages();
+ int index = 0;
+ while (clientIdWithMessages.hasNext()) {
+ String clientId = (String) clientIdWithMessages.next();
+ assertEquals(clientIds[index], clientId);
+ index++;
+ }
+
+ Iterator facesMessages = facesContext.getMessages();
+ index = 0;
+ while (facesMessages.hasNext()) {
+ FacesMessage facesMessage = (FacesMessage) facesMessages.next();
+ assertEquals(facesMessage, messages[index]);
+ index++;
+ }
+ index = 2;
+ facesMessages = facesContext.getMessages(clientIds[index]);
+ while (facesMessages.hasNext()) {
+ FacesMessage facesMessage = (FacesMessage) facesMessages.next();
+ assertEquals(facesMessage, messages[index]);
+ index++;
+ }
+
+ assertEquals(FacesMessage.SEVERITY_WARN, facesContext.getMaximumSeverity());
+
+ }
+}