Author: ppitonak(a)redhat.com
Date: 2011-02-01 07:29:00 -0500 (Tue, 01 Feb 2011)
New Revision: 21354
Modified:
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCalendarBean.properties
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java
Log:
* test and sample for calendar fixed
Modified:
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCalendarBean.properties
===================================================================
---
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCalendarBean.properties 2011-02-01
12:06:30 UTC (rev 21353)
+++
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCalendarBean.properties 2011-02-01
12:29:00 UTC (rev 21354)
@@ -3,14 +3,14 @@
attr.boundaryDatesMode.select=select
attr.boundaryDatesMode.null=
+attr.buttonDisabledIcon.star=/resources/images/star.png
+attr.buttonDisabledIcon.heart=/resources/images/heart.png
+attr.buttonDisabledIcon.null=
+
attr.buttonIcon.star=/resources/images/star.png
attr.buttonIcon.heart=/resources/images/heart.png
attr.buttonIcon.null=
-attr.buttonIconDisabled.star=/resources/images/star.png
-attr.buttonIconDisabled.heart=/resources/images/heart.png
-attr.buttonIconDisabled.null=
-
attr.dayClassFunction.yellowTuesdays=yellowTuesdays
attr.dayClassFunction.aquaWeekends=aquaWeekends
attr.dayClassFunction.null=
@@ -40,4 +40,4 @@
attr.todayControlMode.scroll=scroll
attr.todayControlMode.select=select
attr.todayControlMode.hidden=hidden
-attr.todayControlMode.null=
\ No newline at end of file
+attr.todayControlMode.null=
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2011-02-01
12:06:30 UTC (rev 21353)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2011-02-01
12:29:00 UTC (rev 21354)
@@ -86,8 +86,8 @@
<rich:calendar id="calendar"
boundaryDatesMode="#{richCalendarBean.attributes['boundaryDatesMode'].value}"
buttonClass="#{richCalendarBean.attributes['buttonClass'].value}"
+
buttonDisabledIcon="#{richCalendarBean.attributes['buttonDisabledIcon'].value}"
buttonIcon="#{richCalendarBean.attributes['buttonIcon'].value}"
-
buttonIconDisabled="#{richCalendarBean.attributes['buttonIconDisabled'].value}"
buttonLabel="#{richCalendarBean.attributes['buttonLabel'].value}"
converterMessage="#{richCalendarBean.attributes['converterMessage'].value}"
currentDate="#{richCalendarBean.attributes['currentDate'].value}"
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java 2011-02-01
12:06:30 UTC (rev 21353)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java 2011-02-01
12:29:00 UTC (rev 21354)
@@ -191,18 +191,18 @@
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-10255")
- public void testButtonIconDisabled() {
+ public void testButtonDisabledIcon() {
selenium.click(pjq("input[name$=disabledInput][value=true]"));
selenium.waitForPageToLoad();
- selenium.click(pjq("td:has(label:contains(heart)) >
input[name$=buttonIconDisabledInput]"));
+ selenium.click(pjq("td:has(label:contains(heart)) >
input[name$=buttonDisabledIconInput]"));
selenium.waitForPageToLoad();
AttributeLocator attr = image.getAttribute(Attribute.SRC);
String src = selenium.getAttribute(attr);
assertTrue(src.contains("heart.png"), "Calendar's icon was not
updated.");
- selenium.click(pjq("td:has(label:contains(null)) >
input[name$=buttonIconDisabledInput]"));
+ selenium.click(pjq("td:has(label:contains(null)) >
input[name$=buttonDisabledIconInput]"));
selenium.waitForPageToLoad();
src = selenium.getAttribute(attr);
Show replies by date