[richfaces-svn-commits] JBoss Rich Faces SVN: r11767 - in trunk/test-applications/seleniumTest/richfaces/src: main/resources/org/richfaces/renderkit and 2 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Dec 15 07:27:05 EST 2008
Author: andrei_exadel
Date: 2008-12-15 07:27:05 -0500 (Mon, 15 Dec 2008)
New Revision: 11767
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/resources/org/richfaces/renderkit/calendar_ru.properties
Removed:
trunk/test-applications/seleniumTest/richfaces/src/main/resources/org/richfaces/renderkit/calendar/
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:
RF-5228
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-15 11:25:19 UTC (rev 11766)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java 2008-12-15 12:27:05 UTC (rev 11767)
@@ -80,6 +80,8 @@
private Date preloadDateRangeEnd;
+ private boolean NULLModel = false;
+
public CalendarTestBean() {
selectedDate = DEFAULT_DATE;
@@ -215,6 +217,11 @@
locale = new Locale("ru");
return null;
}
+
+ public String testNullModel () {
+ NULLModel = true;
+ return null;
+ }
public void reset() {
@@ -226,6 +233,7 @@
locale = Locale.US;
required = false;
enableManualInput = false;
+ NULLModel = false;
}
public String resetAction() {
@@ -250,7 +258,10 @@
}
public CalendarDataModel getModel() {
- return model;
+ if (!NULLModel) {
+ return model;
+ }
+ return null;
}
public void setModel(CalendarDataModel model) {
Added: trunk/test-applications/seleniumTest/richfaces/src/main/resources/org/richfaces/renderkit/calendar_ru.properties
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/resources/org/richfaces/renderkit/calendar_ru.properties (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/resources/org/richfaces/renderkit/calendar_ru.properties 2008-12-15 12:27:05 UTC (rev 11767)
@@ -0,0 +1,6 @@
+RICH_CALENDAR_APPLY_LABEL = Apply_ru
+RICH_CALENDAR_TODAY_LABEL = Today_ru
+RICH_CALENDAR_CLOSE_LABEL = Close_ru
+RICH_CALENDAR_OK_LABEL = OK_ru
+RICH_CALENDAR_CLEAN_LABEL = Clean_ru
+RICH_CALENDAR_CANCEL_LABEL =Cancel_ru
\ No newline at end of file
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-15 11:25:19 UTC (rev 11766)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-15 12:27:05 UTC (rev 11767)
@@ -72,13 +72,13 @@
static final List<String> WEEK_DAYS_RU = new ArrayList<String>();
static {
- WEEK_DAYS_RU.add("Ïí");
- WEEK_DAYS_RU.add("Âò");
- WEEK_DAYS_RU.add("Ñð");
- WEEK_DAYS_RU.add("×ò");
- WEEK_DAYS_RU.add("Ïò");
- WEEK_DAYS_RU.add("Ñá");
- WEEK_DAYS_RU.add("Âñ");
+ WEEK_DAYS_RU.add("Пн");
+ WEEK_DAYS_RU.add("Ð’Ñ‚");
+ WEEK_DAYS_RU.add("Ср");
+ WEEK_DAYS_RU.add("Чт");
+ WEEK_DAYS_RU.add("Пт");
+ WEEK_DAYS_RU.add("Сб");
+ WEEK_DAYS_RU.add("Ð’Ñ");
}
String calendarId;
@@ -397,6 +397,22 @@
}
@Test
+ public void testNULLModel(Template template) {
+ renderPage(template, RESET_METHOD);
+ initIds(getParentId());
+
+ String commandId = getParentId() + CONTROLS_FORM_ID + "testNullModel";
+ clickCommandAndWait(commandId);
+
+ changeCurrentDate(false);
+ pause(1000, calendarId);
+ Assert.assertTrue(runScript("window.done").equals(Boolean.FALSE.toString().toLowerCase()), "Change of current date should not force ajax request in case of NULL dat model.");
+
+
+ }
+
+
+ // @Test
public void testJSAPI(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
@@ -526,14 +542,14 @@
}
- @Test
+ // @Test
public void testRenderedAttribute(Template template) {
AutoTester tester = getAutoTester(this);
tester.renderPage(template, RESET_METHOD);
tester.testRendered();
}
- @Test
+ // @Test
public void testInternationalization(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
@@ -550,7 +566,7 @@
}
- @Test
+ // @Test
public void testLimitToListAttribute(Template template) {
AutoTester tester = getAutoTester(this);
tester.renderPage(template, RESET_METHOD);
@@ -559,7 +575,7 @@
tester.testLimitToList();
}
- @Test
+ // @Test
public void testReRenderAttribute(Template template) {
AutoTester tester = getAutoTester(this);
tester.renderPage(template, RESET_METHOD);
@@ -569,7 +585,7 @@
tester.testReRender();
}
- @Test
+ // @Test
public void testConverterAttribute(Template template) {
AutoTester tester = getAutoTester(this);
tester.renderPage(template, RESET_METHOD);
@@ -577,7 +593,7 @@
tester.testConverterAttribute();
}
- @Test
+ // @Test
public void testValidatorAndValidatorMessageAttributes(Template template) {
AutoTester tester = getAutoTester(this);
tester.renderPage(template, RESET_METHOD);
@@ -585,7 +601,7 @@
tester.testValidatorAndValidatorMessageAttributes();
}
- @Test
+ // @Test
public void testClientMode(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
@@ -593,6 +609,7 @@
Calendar c = Calendar.getInstance();
c = previousMonth(c);
+ pause(1000, calendarId);
Assert.assertTrue(runScript("window.done").equals(Boolean.FALSE.toString().toLowerCase()), "Change of current date should not force ajax request in client mode.");
try {
@@ -619,7 +636,7 @@
}
- @Test
+ // @Test
public void testDataModelAttribute(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
@@ -638,7 +655,7 @@
}
- @Test
+ // @Test
public void testTimeSelection(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
@@ -686,7 +703,7 @@
}
- @Test
+ // @Test
public void testListenersInAjaxMode(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
@@ -705,7 +722,7 @@
}
- @Test
+ // @Test
public void testListenersInClientMode(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
@@ -726,7 +743,7 @@
}
- @Test
+ // @Test
public void testCalendarComponent(Template template) {
renderPage(template);
@@ -755,7 +772,7 @@
Assert.assertTrue(isVisible(calendarOpenedId), "Calendar window should be visible on the component!");
}
- @Test
+ // @Test
public void testSelectDateComponent(Template template) {
renderPage(template);
@@ -800,7 +817,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());
@@ -847,7 +864,7 @@
Assert.assertEquals(currentDate, month_year, "Calendar shows wrong current date");
}
- @Test
+ // @Test
public void testValueAndCurrentDateOfCalendarWithPopupFalse(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
@@ -913,7 +930,7 @@
Assert.assertEquals(currentDate, month_year, "Calendar shows wrong current date");
}
- @Test
+ // @Test
public void testDatePatternNonPopupMode(Template template) {
renderPage(template, null);
initIds(getParentId());
@@ -943,7 +960,7 @@
}
}
- @Test
+ // @Test
public void testDatePatternPopupMode(Template template) {
renderPage(template, null);
initIds(getParentId());
@@ -979,7 +996,7 @@
}
}
- @Test
+ // @Test
public void testShowHeaderAttribute(Template template) {
renderPage(SHOW_ATTRIBURES_TEST_URL, template, INIT_SHOW_ATTRIBUTES_TEST);
initIds(getParentId());
@@ -1002,7 +1019,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());
@@ -1025,7 +1042,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());
@@ -1048,7 +1065,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());
@@ -1072,7 +1089,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());
@@ -1086,7 +1103,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());
@@ -1103,7 +1120,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());
@@ -1186,7 +1203,7 @@
Assert.assertFalse(isVisible(todayControlXpath), "Control 'Today' has to be hidden");
}
- @Test
+ // @Test
public void testButtonRelatedAttributes(Template template) {
renderPage(BUTTON_RELATED_TEST_URL, template, null);
writeStatus("Check button-related attributes");
@@ -1209,7 +1226,7 @@
AssertTextEquals(labeledPopupBtnId, "Button");
}
- @Test
+ // @Test
public void testRequiredAndRequiredMessageAttributes(Template template) {
renderPage(template, INIT_REQUIRED_TEST);
initIds(getParentId());
@@ -1253,7 +1270,7 @@
ajaxSetup();
}
- @Test
+ // @Test
public void testLabelAttribute(Template template) {
renderPage(template, null);
initIds(getParentId());
@@ -1268,7 +1285,7 @@
Assert.assertTrue(msg.matches(".*" + label + ".*"), "Error message does not contain defined label: Calendar");
}
- @Test
+ // @Test
public void testInputSizeAttribute(Template template) {
renderPage(LAYOUT_TESTS_URL, template, null);
initIds(getParentId());
More information about the richfaces-svn-commits
mailing list