From richfaces-svn-commits at lists.jboss.org Wed Oct 19 09:04:06 2011
Content-Type: multipart/mixed; boundary="===============8663223251848294267=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r22825 - in
 modules/tests/metamer/trunk:
 ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab and 1
 other directory.
Date: Wed, 19 Oct 2011 09:04:06 -0400
Message-ID: <201110191304.p9JD46Ap027267@svn01.web.mwc.hst.phx2.redhat.com>

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

Author: ppitonak(a)redhat.com
Date: 2011-10-19 09:04:06 -0400 (Wed, 19 Oct 2011)
New Revision: 22825

Modified:
   modules/tests/metamer/trunk/application/src/main/java/org/richfaces/test=
s/metamer/bean/rich/RichTabBean.java
   modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes=
ts/metamer/ftest/richTab/TestRichTab.java
Log:
sample for rich:tab fixed
added test for rich:tab's attribute action


Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfac=
es/tests/metamer/bean/rich/RichTabBean.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/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/bean/rich/RichTabBean.java	2011-10-19 11:26:07 UTC (rev 22824)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/bean/rich/RichTabBean.java	2011-10-19 13:04:06 UTC (rev 22825)
@@ -34,7 +34,7 @@
 =

 /**
  * Managed bean for rich:tab.
- *
+ * =

  * @author <a href=3D"mailto:ppitonak(a)redhat.com">Pavol Pitonak</a>
  * @version $Revision$
  */
@@ -61,6 +61,8 @@
         attributes.setAttribute("rendered", true);
 =

         // will be tested in another way
+        attributes.remove("action");
+        attributes.remove("actionListener");
         attributes.remove("converter");
     }
 =


Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa=
ces/tests/metamer/ftest/richTab/TestRichTab.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/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/richTab/TestRichTab.java	2011-10-19 11:26:07 UTC (rev 228=
24)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/richTab/TestRichTab.java	2011-10-19 13:04:06 UTC (rev 228=
25)
@@ -52,7 +52,8 @@
 public class TestRichTab extends AbstractMetamerTest {
 =

     private static final JQueryLocator PHASE_FORMAT =3D jq("div#phasesPane=
l li:eq({0})");
-    private static final String PHASE_LISTENER_LOG =3D "* action listener =
invoked";
+    private static final String ACTION_LOG =3D "* action invoked";
+    private static final String ACTION_LISTENER_LOG =3D "* action listener=
 invoked";
 =

     private JQueryLocator panel =3D pjq("div[id$=3DtabPanel]");
     private JQueryLocator[] itemContents =3D { pjq("div[id$=3Dtab1] > div.=
rf-tab-cnt"),
@@ -75,6 +76,22 @@
 =

     @Test
     @IssueTracking("https://issues.jboss.org/browse/RF-11427")
+    public void testAction() {
+        retrieveRequestTime.initializeValue();
+        selenium.click(pjq("input[id$=3DnextTabButton]"));
+        waitAjax.waitForChange(retrieveRequestTime);
+
+        retrieveRequestTime.initializeValue();
+        selenium.click(pjq("input[id$=3DprevTabButton]"));
+        waitAjax.waitForChange(retrieveRequestTime);
+
+        waitGui.failWith(
+            "Expected <" + ACTION_LOG + ">, found <" + selenium.getText(PH=
ASE_FORMAT.format(6)) + ">").until(
+            textEquals.locator(PHASE_FORMAT.format(6)).text(ACTION_LOG));
+    }
+    =

+    @Test
+    @IssueTracking("https://issues.jboss.org/browse/RF-11427")
     public void testActionListener() {
         retrieveRequestTime.initializeValue();
         selenium.click(pjq("input[id$=3DnextTabButton]"));
@@ -85,8 +102,8 @@
         waitAjax.waitForChange(retrieveRequestTime);
 =

         waitGui.failWith(
-            "Expected <" + PHASE_LISTENER_LOG + ">, found <" + selenium.ge=
tText(PHASE_FORMAT.format(5)) + ">").until(
-            textEquals.locator(PHASE_FORMAT.format(5)).text(PHASE_LISTENER=
_LOG));
+            "Expected <" + ACTION_LISTENER_LOG + ">, found <" + selenium.g=
etText(PHASE_FORMAT.format(5)) + ">").until(
+            textEquals.locator(PHASE_FORMAT.format(5)).text(ACTION_LISTENE=
R_LOG));
     }
 =

     @Test


--===============8663223251848294267==--