Author: nbelaevski Date: 2009-04-29 11:10:42 -0400 (Wed, 29 Apr 2009) New Revision: 13912 Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java Log: https://jira.jboss.org/jira/browse/RF-6863 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-04-29 14:57:36 UTC (rev 13911) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-04-29 15:10:42 UTC (rev 13912) @@ -876,7 +876,8 @@ } - @Test + @Test(groups=FAILURES_GROUP) + //https://jira.jboss.org/jira/browse/RF-5209 public void testListenersInAjaxMode(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId()); @@ -895,7 +896,8 @@ } - @Test + @Test(groups=FAILURES_GROUP) + //https://jira.jboss.org/jira/browse/RF-5209 public void testListenersInClientMode(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId()); @@ -1135,19 +1137,22 @@ public void testDatePatternPopupMode(Template template) { renderPage(template, RESET_METHOD2); initIds(getParentId()); + showPopup(); + String originalPattern = "MM/dd/yyyy HH:mm"; writeStatus("Check 'datePattern' attribute in popup mode"); String selectedDate = "03/03/2007 11:00"; - String expectedSelectedDate = "03/2007"; - String expectedPattern = "MM/yyyy"; + String expectedSelectedDate = "03-03-2007"; + String expectedPattern = "dd-MM-yyyy"; setValueById(selectedDateId, selectedDate); setValueById(currentDateId, ""); setValueById(datePatternId, expectedPattern); setup(); - + showPopup(); + try { writeStatus("Check calendar popup is shown up and date in the input field is in proper format"); AssertValueEquals(calendarId + "InputDate", expectedSelectedDate, "Calendar input field shows wrong date"); @@ -1474,6 +1479,7 @@ public void testBoundaryDatesMode(Template template) { renderPage(TODAY_CONTROL_AND_BOUNDARY_DATES_MODES_TEST_URL, template, RESET_METHOD2); initIds(getParentId()); + showPopup(); String selectedDateId = getParentId() + FORM_ID + "selectedDate"; String currentDateId = getParentId() + FORM_ID + "currentDate"; @@ -1491,6 +1497,7 @@ writeStatus("Check 'inactive' (default) mode"); selenium.select(boundaryDatesModeId, "inactive"); + showPopup(); String expectedSelectedDate = selenium.getValue(inputDateId); String expectedCurrentDate = selenium.getText(currentDateHeaderXpath); @@ -1510,6 +1517,7 @@ writeStatus("Check 'scroll' mode"); selenium.select(boundaryDatesModeId, "scroll"); + showPopup(); writeStatus("Click a day from next month, the month has to be scrolled to the next month, but selected date stays untouched"); clickById(firstMarCellId); actualSelectedDate = selenium.getValue(inputDateId); @@ -1529,6 +1537,7 @@ writeStatus("Check 'select' mode"); selenium.select(boundaryDatesModeId, "select"); + showPopup(); writeStatus("Click a day from next month: 1) the month has to be scrolled to the next month 2) date set to selected date (1st of March)"); clickById(firstMarCellId); actualSelectedDate = selenium.getValue(inputDateId);