Author: andrei_exadel Date: 2008-12-10 15:17:35 -0500 (Wed, 10 Dec 2008) New Revision: 11714 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/resources/org/ajax4jsf/message/resources_en_US.properties 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: RF-5234 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 2008-12-10 19:27:44 UTC (rev 11713) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java 2008-12-10 20:17:35 UTC (rev 11714) @@ -141,7 +141,7 @@ public void setTimeZone(TimeZone timeZone) { this.timeZone = timeZone; } - + public static Calendar getCalendar() { return Calendar.getInstance(CalendarTestBean.TIME_ZONE, CalendarTestBean.LOCALE); } @@ -208,13 +208,20 @@ mode = UICalendar.CLIENT_MODE; return null; } + + public String testLocale () { + locale = new Locale("ru"); + return null; + } + public void reset() { mode = UICalendar.AJAX_MODE; status = ""; selectedDate = new Date(); isPopup = false; currentDate = new Date(); + locale = Locale.US; } public String resetAction() { Modified: trunk/test-applications/seleniumTest/richfaces/src/main/resources/org/ajax4jsf/message/resources_en_US.properties =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/resources/org/ajax4jsf/message/resources_en_US.properties 2008-12-10 19:27:44 UTC (rev 11713) +++ trunk/test-applications/seleniumTest/richfaces/src/main/resources/org/ajax4jsf/message/resources_en_US.properties 2008-12-10 20:17:35 UTC (rev 11714) @@ -1,4 +1,10 @@ test=It is sample message from resourceBundle error=Error was occured. RICH_LIST_SHUTTLE_COPY_ALL_LABEL=Copy All Items -RICH_SHUTTLES_TOP_LABEL=Move to top \ No newline at end of file +RICH_SHUTTLES_TOP_LABEL=Move to top +RICH_CALENDAR_APPLY_LABEL = Apply_en_US +RICH_CALENDAR_TODAY_LABEL = Today_en_US +RICH_CALENDAR_CLOSE_LABEL = Close_en_US +RICH_CALENDAR_OK_LABEL = OK_en_US +RICH_CALENDAR_CLEAN_LABEL = Clean_en_US +RICH_CALENDAR_CANCEL_LABEL = Cancel_en_US 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 2008-12-10 19:27:44 UTC (rev 11713) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-10 20:17:35 UTC (rev 11714) @@ -126,6 +126,14 @@ String todayControlModeId; String todayControlXpath; + + String applyButtonXpath; + + String cleanButtonXPath; + + String closeHeaderXpath; + + void initIds(String parentId) { calendarId = parentId + FORM_ID + "calendar"; @@ -151,6 +159,7 @@ timeZoneId = parentId + CONTROLS_FORM_ID + "timeZone"; localeId = parentId + CONTROLS_FORM_ID + "locale"; currentDateHeaderXpath = "//td[@id='"+calendarHeaderId+"']/table/tbody/tr/td[3]/div"; + closeHeaderXpath = "//td[@id='"+calendarHeaderId+"']/table/tbody/tr/td[last()]/div"; popupButtonId = calendarId + "PopupButton"; inputDateId = calendarId + "InputDate"; showApplyButtonId = parentId + FORM_ID + "showApplyButton"; @@ -163,6 +172,8 @@ weekDaysBarId = calendarId + "WeekDay"; todayControlModeId = parentId + FORM_ID + "todayControlMode"; todayControlXpath = "//td[@id='" + calendarFooterId + "']/table/tbody/tr/td[5]"; + applyButtonXpath = "//td[@id='" + calendarFooterId + "']/table/tbody/tr/td[6]"; + cleanButtonXPath = "//td[@id='"+calendarFooterId+"']/table/tbody/tr/td[2]"; } String getStatus() { @@ -268,7 +279,57 @@ } } + void testInternatialization(String prefix) { + String label = selenium.getText(todayControlXpath); + String expectedLabel = ("Today" + prefix); + if (!expectedLabel.equals(label)) { + Assert.fail("Internatialization was not applied. Expected label for 'Today' button: ["+expectedLabel+"]. But was ["+label+"]"); + } + + label = selenium.getText(cleanButtonXPath); + expectedLabel = ("Clean" + prefix); + if (!expectedLabel.equals(label)) { + Assert.fail("Internatialization was not applied. Expected label for 'Clean' button: ["+expectedLabel+"]. But was ["+label+"]"); + } + + label = selenium.getText(timeSelectionOkButtonId); + expectedLabel = ("OK" + prefix); + if (!expectedLabel.equals(label)) { + Assert.fail("Internatialization was not applied. Expected label for 'OK' button: ["+expectedLabel+"]. But was ["+label+"]"); + } + + label = selenium.getText(timeSelectionCancelButtonId); + expectedLabel = ("Cancel" + prefix); + if (!expectedLabel.equals(label)) { + Assert.fail("Internatialization was not applied. Expected label for 'Cancel' button: ["+expectedLabel+"]. But was ["+label+"]"); + } + + label = selenium.getText(closeHeaderXpath); + expectedLabel = ("Close" + prefix); + if (!expectedLabel.equals(label)) { + Assert.fail("Internatialization was not applied. Expected label for 'Close' button: ["+expectedLabel+"]. But was ["+label+"]"); + } + + + + } + @Test + public void testInternationalization(Template template) { + renderPage(template, RESET_METHOD); + initIds(getParentId()); + + setPopup(true); + setup(); + + showPopup(); + showTimeSelectionWindow(); + + testInternatialization("_en_US"); + + } + + // @Test public void testLinitToListAttribute(Template template) { AutoTester tester = getAutoTester(this); tester.renderPage(template, RESET_METHOD); @@ -277,7 +338,7 @@ tester.testLimitToList(); } - @Test + //@Test public void testReRenderAttribute(Template template) { AutoTester tester = getAutoTester(this); tester.renderPage(template, RESET_METHOD); @@ -287,7 +348,7 @@ tester.testReRender(); } - @Test + //@Test public void testConverterAttribute(Template template) { AutoTester tester = getAutoTester(this); tester.renderPage(template, RESET_METHOD); @@ -295,7 +356,7 @@ tester.testConverterAttribute(); } - @Test + // @Test public void testValidatorAndValidatorMessageAttributes(Template template) { AutoTester tester = getAutoTester(this); tester.renderPage(template, RESET_METHOD); @@ -303,7 +364,7 @@ tester.testValidatorAndValidatorMessageAttributes(); } - @Test + // @Test public void testClientMode(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId()); @@ -337,7 +398,7 @@ } - @Test + //@Test public void testDataModelAttribute(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId()); @@ -356,7 +417,7 @@ } - @Test + // @Test public void testTimeSelection(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId()); @@ -404,7 +465,7 @@ } - @Test + // @Test public void testListenersInAjaxMode(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId()); @@ -423,7 +484,7 @@ } - @Test + // @Test public void testListenersInClientMode(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId()); @@ -444,7 +505,7 @@ } - @Test + // @Test public void testCalendarComponent(Template template) { renderPage(template); @@ -473,7 +534,7 @@ Assert.assertTrue(isVisible(calendarOpenedId), "Calendar window should be visible on the component!"); } - @Test + // @Test public void testSelectDateComponent(Template template) { renderPage(template); @@ -518,7 +579,7 @@ Assert.assertFalse(isVisible(calendarOpenedId), "Calendar window should NOT be visible on the component!"); } - @Test + // @Test public void testValueAndCurrentDateOfCalendarInCaseOfPopupTrue(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId()); @@ -565,7 +626,7 @@ Assert.assertEquals(currentDate, month_year, "Calendar shows wrong current date"); } - @Test + //@Test public void testValueAndCurrentDateOfCalendarWithPopupFalse(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId()); @@ -631,7 +692,7 @@ Assert.assertEquals(currentDate, month_year, "Calendar shows wrong current date"); } - @Test + // @Test public void testDatePatternNonPopupMode(Template template) { renderPage(template, null); initIds(getParentId()); @@ -661,7 +722,7 @@ } } - @Test + //@Test public void testDatePatternPopupMode(Template template) { renderPage(template, null); initIds(getParentId()); @@ -697,7 +758,7 @@ } } - @Test + // @Test public void testShowHeaderAttribute(Template template) { renderPage(SHOW_ATTRIBURES_TEST_URL, template, INIT_SHOW_ATTRIBUTES_TEST); initIds(getParentId()); @@ -720,7 +781,7 @@ AssertPresent(calendarHeaderId, "Header is not present"); } - @Test + //@Test public void testShowFooterAttribute(Template template) { renderPage(SHOW_ATTRIBURES_TEST_URL, template, INIT_SHOW_ATTRIBUTES_TEST); initIds(getParentId()); @@ -743,7 +804,7 @@ AssertPresent(calendarFooterId, "Footer is not present"); } - @Test + // @Test public void testShowWeekDaysBar(Template template) { renderPage(SHOW_ATTRIBURES_TEST_URL, template, INIT_SHOW_ATTRIBUTES_TEST); initIds(getParentId()); @@ -766,7 +827,7 @@ AssertPresent(weekDaysBarId, "Week days bar is not present"); } - @Test + // @Test public void testShowWeeksBar(Template template) { renderPage(SHOW_ATTRIBURES_TEST_URL, template, INIT_SHOW_ATTRIBUTES_TEST); initIds(getParentId()); @@ -790,7 +851,7 @@ AssertPresent(weeksBarId, "Weeks bar is not present"); } - @Test + // @Test public void testShowInput(Template template) { renderPage(SHOW_ATTRIBURES_TEST_URL, template, INIT_SHOW_ATTRIBUTES_TEST); initIds(getParentId()); @@ -804,7 +865,7 @@ AssertNotVisible(inputDateId, "Input is visible"); } - @Test + // @Test public void testShowApplyButton(Template template) { renderPage(SHOW_ATTRIBURES_TEST_URL, template, INIT_SHOW_ATTRIBUTES_TEST); initIds(getParentId()); @@ -821,7 +882,7 @@ Assert.assertFalse(isVisible(applyButtonXpath), "Apply button is visible"); } - @Test + // @Test public void testTodayControlMode(Template template) { renderPage(TODAY_CONTROL_MODE_URL, template, null); initIds(getParentId()); @@ -904,7 +965,7 @@ Assert.assertFalse(isVisible(todayControlXpath), "Control 'Today' has to be hidden"); } - @Test + //@Test public void buttonRelatedAttributesTest(Template template) { renderPage(BUTTON_RELATED_TEST_URL, template, null); writeStatus("Check button-related attributes");