From richfaces-svn-commits at lists.jboss.org Wed Apr 6 09:16:27 2011
Content-Type: multipart/mixed; boundary="===============2754130561313826444=="
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: r22381 - in
modules/tests/metamer/trunk: application/src/main/webapp/templates and 1
other directories.
Date: Wed, 06 Apr 2011 09:16:26 -0400
Message-ID: <201104061316.p36DGQC7007694@svn01.web.mwc.hst.phx2.redhat.com>
--===============2754130561313826444==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ppitonak(a)redhat.com
Date: 2011-04-06 09:16:26 -0400 (Wed, 06 Apr 2011)
New Revision: 22381
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richCo=
llapsibleSubTable.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richLi=
st.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/test=
s/metamer/Template.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes=
ts/metamer/ftest/AbstractMetamerTest.java
Log:
https://issues.jboss.org/browse/RFPL-946
added two new templates - rich:collapsibleSubTable, rich:list
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfac=
es/tests/metamer/Template.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/Template.java 2011-04-06 13:15:36 UTC (rev 22380)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/Template.java 2011-04-06 13:16:26 UTC (rev 22381)
@@ -33,9 +33,11 @@
PLAIN("plain", "Plain", ""),
REDDIV("redDiv", "Red div", ""),
BLUEDIV("blueDiv", "Blue div", ""),
+ RICHCOLLAPSIBLESUBTABLE("richCollapsibleSubTable", "Rich Collapsible S=
ub Table", "containerRichCollapsibleSubTable:2:"),
RICHDATATABLE("richDataTable", "Rich Data Table", "containerRichDataTa=
ble:2:"),
RICHDATAGRID("richDataGrid", "Rich Data Grid", "containerRichDataGrid:=
1:"),
RICHEXTENDEDDATATABLE("richExtendedDataTable", "Rich Extended Data Tab=
le", "containerRichExtendedDataTable:2:"),
+ RICHLIST("richList", "Rich List", "containerRichList:2:"),
HDATATABLE("hDataTable", "JSF Data Table", "containerHDataTable:2:"),
UIREPEAT("uiRepeat", "UI Repeat", "containerUiRepeat:1:"),
A4JREPEAT("a4jRepeat", "A4J Repeat", "containerA4JRepeat:1:");
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/ri=
chCollapsibleSubTable.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/webapp/templates/richC=
ollapsibleSubTable.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richC=
ollapsibleSubTable.xhtml 2011-04-06 13:16:26 UTC (rev 22381)
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+ Rich Collapible Sub Table
+
+
+
+
+
+
+
+
+
+
+
+ Column 1
+
+ #{containerRichCollapsibleSubTableItem}
+
+
+
+
+ Column 2
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/ri=
chList.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/webapp/templates/richL=
ist.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richL=
ist.xhtml 2011-04-06 13:16:26 UTC (rev 22381)
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+ Rich List
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa=
ces/tests/metamer/ftest/AbstractMetamerTest.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/AbstractMetamerTest.java 2011-04-06 13:15:36 UTC (rev 223=
80)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/AbstractMetamerTest.java 2011-04-06 13:16:26 UTC (rev 223=
81)
@@ -89,13 +89,14 @@
protected TextRetriever retrieveStatusChecker =3D retrieveText.locator=
(jq("#statusCheckerOutput"));
protected PhaseInfo phaseInfo =3D new PhaseInfo();
protected LocatorReference attributesRoot =3D new Locat=
orReference(
- pjq("span[id$=3D:attributes:panel]"));
+ pjq("span[id$=3D:attributes:panel]"));
/**
* timeout in miliseconds
*/
public static final long TIMEOUT =3D 5000;
@Inject
- @Templates({ "plain", "richDataTable", "a4jRepeat", "hDataTable", "uiR=
epeat" })
+ @Templates({"plain", "richDataTable", "richCollapsibleSubTable", "rich=
ExtendedDataTable", "richDataGrid", "richList",
+ "a4jRepeat", "hDataTable", "uiRepeat"})
private TemplatesList template;
=
/**
@@ -204,7 +205,7 @@
selenium.fireEvent(element, event);
=
waitGui.failWith("Attribute on" + attributeName + " does not work =
correctly").until(
- new EventFiredCondition(event));
+ new EventFiredCondition(event));
}
=
/**
@@ -279,9 +280,9 @@
public void testRequestEventsAfter(String... events) {
String[] actualEvents =3D selenium.getEval(new JavaScript("window.=
metamerEvents")).split(" ");
assertEquals(
- actualEvents,
- events,
- format("The events ({0}) don't came in right order ({1})", Arr=
ays.deepToString(actualEvents),
+ actualEvents,
+ events,
+ format("The events ({0}) don't came in right order ({1})",=
Arrays.deepToString(actualEvents),
Arrays.deepToString(events)));
}
=
@@ -297,9 +298,9 @@
=
String[] actualEvents =3D list.toArray(new String[list.size()]);
assertEquals(
- actualEvents,
- events,
- format("The events ({0}) don't came in right order ({1})", Arr=
ays.deepToString(actualEvents),
+ actualEvents,
+ events,
+ format("The events ({0}) don't came in right order ({1})",=
Arrays.deepToString(actualEvents),
Arrays.deepToString(events)));
}
=
@@ -398,7 +399,7 @@
selenium.waitForPageToLoad();
=
assertTrue(selenium.getAttribute(attr).contains(value), "Attribute=
" + attribute + " should contain \"" + value
- + "\".");
+ + "\".");
}
=
/**
--===============2754130561313826444==--