Author: ppitonak(a)redhat.com Date: 2011-02-23 07:34:19 -0500 (Wed, 23 Feb 2011) New Revision: 21887 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarBasic.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarModel.java Log: tests for rich:calendar fixed Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarBasic.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarBasic.java 2011-02-23 06:50:04 UTC (rev 21886) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarBasic.java 2011-02-23 12:34:19 UTC (rev 21887) @@ -23,7 +23,6 @@ import java.text.ParseException; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; -import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -33,7 +32,6 @@ import java.net.URL; import java.text.SimpleDateFormat; import java.util.Date; -import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.testng.annotations.Test; Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarModel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarModel.java 2011-02-23 06:50:04 UTC (rev 21886) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarModel.java 2011-02-23 12:34:19 UTC (rev 21887) @@ -31,7 +31,6 @@ import java.text.SimpleDateFormat; import java.util.Date; - import org.testng.annotations.Test; /** @@ -50,7 +49,9 @@ @Test public void testClasses() { selenium.click(input); + String month = selenium.getText(monthLabel); selenium.click(nextMonthButton); + waitGui.failWith("Month did not change.").waitForChange(month, retrieveText.locator(monthLabel)); for (int i = 7; i < 28; i++) { switch (i % 7) { @@ -75,11 +76,13 @@ @Override public void testApplyButton() { selenium.click(input); + String month = selenium.getText(monthLabel); selenium.click(nextMonthButton); + waitGui.failWith("Month did not change.").waitForChange(month, retrieveText.locator(monthLabel)); selenium.click(cellDay.format(17)); String day = selenium.getText(cellDay.format(17)); - String month = selenium.getText(monthLabel); + month = selenium.getText(monthLabel); String selectedDate = null; try {