Author: alevkovsky Date: 2009-01-12 10:17:12 -0500 (Mon, 12 Jan 2009) New Revision: 12224 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/calendarTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java Log: Fix Calendar selenium tests Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java 2009-01-12 14:17:15 UTC (rev 12223) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java 2009-01-12 15:17:12 UTC (rev 12224) @@ -538,6 +538,7 @@ } public void initRequiredTest() { + reset(); required = true; selectedDate = null; isPopup = false; Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/calendarTest.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-01-12 14:17:15 UTC (rev 12223) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-01-12 15:17:12 UTC (rev 12224) @@ -516,16 +516,19 @@ renderPage(template, RESET_METHOD); initIds(getParentId()); - setPopup(true); - String changeLocaleButtonId = getParentId() + CONTROLS_FORM_ID + "testLocale"; - clickCommandAndWait(changeLocaleButtonId); + // Failed due to bug https://jira.jboss.org/jira/browse/RF-5330 + Assert.fail("https://jira.jboss.org/jira/browse/RF-5330"); + +// setPopup(true); +// String changeLocaleButtonId = getParentId() + CONTROLS_FORM_ID + "testLocale"; +// clickCommandAndWait(changeLocaleButtonId); +// +// showPopup(); +// showTimeSelectionWindow(); +// +// testInternatialization("_ru"); +// testWeekDays(); - showPopup(); - showTimeSelectionWindow(); - - testInternatialization("_ru"); - testWeekDays(); - } @Test @@ -718,16 +721,19 @@ public void testInternationalization(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId()); - - setPopup(true); - String changeLocaleButtonId = getParentId() + CONTROLS_FORM_ID + "testLocale"; - clickCommandAndWait(changeLocaleButtonId); - showPopup(); - showTimeSelectionWindow(); + // Failed due to bug https://jira.jboss.org/jira/browse/RF-5330 + Assert.fail("https://jira.jboss.org/jira/browse/RF-5330"); - testInternatialization("_ru"); - testWeekDays(); +// setPopup(true); +// String changeLocaleButtonId = getParentId() + CONTROLS_FORM_ID + "testLocale"; +// clickCommandAndWait(changeLocaleButtonId); +// +// showPopup(); +// showTimeSelectionWindow(); +// +// testInternatialization("_ru"); +// testWeekDays(); } @@ -1608,7 +1614,7 @@ @Test public void testLabelAttribute(Template template) { - renderPage(template, null); + renderPage(template, RESET_METHOD); initIds(getParentId()); String label = "Calendar";