From seam-commits at lists.jboss.org Thu May 27 13:56:17 2010
Content-Type: multipart/mixed; boundary="===============4554596957278752886=="
MIME-Version: 1.0
From: seam-commits at lists.jboss.org
To: seam-commits at lists.jboss.org
Subject: [seam-commits] Seam SVN: r12874 - in
 modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces: status and 1
 other directory.
Date: Thu, 27 May 2010 13:56:17 -0400
Message-ID: <201005271756.o4RHuHCM001291@svn01.web.mwc.hst.phx2.redhat.com>

--===============4554596957278752886==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: lincolnthree
Date: 2010-05-27 13:56:16 -0400 (Thu, 27 May 2010)
New Revision: 12874

Modified:
   modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/PhaseTestBas=
e.java
   modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/status/Messa=
gesAdapterTest.java
Log:
Updated messages API and tests

Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/Phase=
TestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/PhaseTestBa=
se.java	2010-05-27 17:54:30 UTC (rev 12873)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/PhaseTestBa=
se.java	2010-05-27 17:56:16 UTC (rev 12874)
@@ -24,13 +24,14 @@
 import java.util.ArrayList;
 import java.util.List;
 =

+import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
 import javax.inject.Inject;
 =

 import org.jboss.seam.faces.event.PhaseEventBridge;
-import org.jboss.test.faces.mock.context.MockFacesContext;
 import org.jboss.test.faces.mock.lifecycle.MockLifecycle;
+import org.jboss.test.faces.stub.faces.StubFacesContext;
 =

 /**
  * @author <a href=3D"mailto:lincolnbaxter(a)gmail.com">Lincoln Baxter, II=
I</a>
@@ -41,7 +42,7 @@
    @Inject
    PhaseEventBridge phaseEventBridge;
 =

-   protected MockFacesContext facesContext =3D new MockFacesContext();
+   protected FacesContext facesContext =3D new StubFacesContext();
    protected final MockLifecycle lifecycle =3D new MockLifecycle();
 =

    static List<PhaseId> ALL_PHASES =3D new ArrayList<PhaseId>()

Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/statu=
s/MessagesAdapterTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/status/Mess=
agesAdapterTest.java	2010-05-27 17:54:30 UTC (rev 12873)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/status/Mess=
agesAdapterTest.java	2010-05-27 17:56:16 UTC (rev 12874)
@@ -22,6 +22,7 @@
 package org.jboss.seam.faces.status;
 =

 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 =

 import javax.faces.event.PhaseId;
@@ -39,7 +40,7 @@
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
-import org.jboss.test.faces.mock.context.MockFacesContext;
+import org.jboss.test.faces.stub.faces.StubFacesContext;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,35 +61,38 @@
    @Inject
    Messages messages;
 =

+   String text =3D "Hey! This is a message";
+
    @Before
    public void before()
    {
-      facesContext =3D new MockFacesContext();
-      facesContext.getControl().resetToNice();
-      facesContext.getControl().replay();
+      facesContext =3D new StubFacesContext();
    }
 =

    @Test
    public void testMessagesAreTransferredBeforeRenderResponse()
    {
-      messages.add(messages.info("Hey! This is a message"));
+      messages.add(messages.info(text));
       assertEquals(1, messages.getAll().size());
 =

       fireBeforePhase(PhaseId.RENDER_RESPONSE);
 =

       assertTrue(messages.getAll().isEmpty());
-      // assertNotNull(facesContext.getMessages());
+      assertNotNull(facesContext.getMessages());
+      assertEquals(text, facesContext.getMessages().next().getSummary());
+
    }
 =

    @Test
    public void testMessageTargetsTransferredToFacesMessageComponentId()
    {
-      messages.add(messages.info("Hey! This is a message").targets("compon=
ent"));
+      messages.add(messages.info(text).targets("component"));
       assertEquals(1, messages.getAll().size());
 =

       fireBeforePhase(PhaseId.RENDER_RESPONSE);
 =

       assertTrue(messages.getAll().isEmpty());
-      // assertNotNull(facesContext.getMessages("component"));
+      assertNotNull(facesContext.getMessages("component"));
+      assertEquals(text, facesContext.getMessages("component").next().getS=
ummary());
    }
 }


--===============4554596957278752886==--