From richfaces-svn-commits at lists.jboss.org Tue Nov 22 06:48:38 2011
Content-Type: multipart/mixed; boundary="===============5627049461005588404=="
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: r22970 -
 modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn.
Date: Tue, 22 Nov 2011 06:48:37 -0500
Message-ID: <201111221148.pAMBmbNB016671@svn01.web.mwc.hst.phx2.redhat.com>

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

Author: ppitonak(a)redhat.com
Date: 2011-11-22 06:48:37 -0500 (Tue, 22 Nov 2011)
New Revision: 22970

Modified:
   modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes=
ts/metamer/ftest/richColumn/TestColumnComparator.java
   modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes=
ts/metamer/ftest/richColumn/TestColumnFiltering.java
   modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes=
ts/metamer/ftest/richColumn/TestColumnSimple.java
   modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes=
ts/metamer/ftest/richColumn/TestColumnSorting.java
Log:
tests for rich:column fixed


Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa=
ces/tests/metamer/ftest/richColumn/TestColumnComparator.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/richColumn/TestColumnComparator.java	2011-11-22 10:58:06 =
UTC (rev 22969)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/richColumn/TestColumnComparator.java	2011-11-22 11:48:37 =
UTC (rev 22970)
@@ -31,7 +31,6 @@
  * @author <a href=3D"mailto:lfryc(a)redhat.com">Lukas Fryc</a>
  * @version $Revision$
  */
-(a)Test
 public class TestColumnComparator extends AbstractColumnSortingTest {
 =

     @Override

Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa=
ces/tests/metamer/ftest/richColumn/TestColumnFiltering.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/richColumn/TestColumnFiltering.java	2011-11-22 10:58:06 U=
TC (rev 22969)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/richColumn/TestColumnFiltering.java	2011-11-22 11:48:37 U=
TC (rev 22970)
@@ -49,12 +49,12 @@
     JQueryLocator tableWithFilter =3D pjq("table.rf-dt[id$=3DrichDataTable=
1]");
     JQueryLocator tableWithFilterExpression =3D pjq("table.rf-dt[id$=3Dric=
hDataTable2]");
     RichColumnBean richColumnBean =3D new RichColumnBean();
-    =

+
     @Override
     public URL getTestUrl() {
         return buildUrl(contextPath, "faces/components/richColumn/filterin=
g.xhtml");
     }
-    =

+
     @Test
     public void testFilterAttribute() {
         model.setRoot(tableWithFilter);
@@ -88,7 +88,7 @@
             assertEqualsCapitals(actualCapitals, expectedCapitals);
         }
     }
-    =

+
     private void assertEqualsCapitals(Collection<Capital> actualCapitals, =
Collection<Capital> expectedCapitals) {
         assertEquals(actualCapitals.size(), expectedCapitals.size());
 =


Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa=
ces/tests/metamer/ftest/richColumn/TestColumnSimple.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/richColumn/TestColumnSimple.java	2011-11-22 10:58:06 UTC =
(rev 22969)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/richColumn/TestColumnSimple.java	2011-11-22 11:48:37 UTC =
(rev 22970)
@@ -31,6 +31,7 @@
 import java.net.URL;
 =

 import org.jboss.test.selenium.locator.JQueryLocator;
+import org.jboss.test.selenium.request.RequestType;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 =

@@ -55,6 +56,8 @@
 =

         assertEquals(selenium.getAttribute(headerCell(1, 1).getAttribute(C=
OLSPAN)), "2");
         assertEquals(selenium.getAttribute(headerCell(2, 2).getAttribute(R=
OWSPAN)), "2");
+
+        columnAttributes.setRequestType(RequestType.HTTP);
     }
 =

     @Test

Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa=
ces/tests/metamer/ftest/richColumn/TestColumnSorting.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/richColumn/TestColumnSorting.java	2011-11-22 10:58:06 UTC=
 (rev 22969)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/richColumn/TestColumnSorting.java	2011-11-22 11:48:37 UTC=
 (rev 22970)
@@ -31,7 +31,6 @@
  * @author <a href=3D"mailto:lfryc(a)redhat.com">Lukas Fryc</a>
  * @version $Revision$
  */
-(a)Test
 public class TestColumnSorting extends AbstractColumnSortingTest {
 =

     @Override


--===============5627049461005588404==--