[richfaces-svn-commits] JBoss Rich Faces SVN: r11809 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/calendar and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: dsvyatobatsko
Date: 2008-12-16 08:41:37 -0500 (Tue, 16 Dec 2008)
New Revision: 11809

Modified:
   trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java
   trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/showAttributesTest.xhtml
   trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
Log:
https://jira.jboss.org/jira/browse/RF-5352

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-16 13:30:13 UTC (rev 11808)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java	2008-12-16 13:41:37 UTC (rev 11809)
@@ -234,6 +234,7 @@
         required = false;
         enableManualInput = false;
         NULLModel = false;
+        firstWeekDay = 0;
     }
 
     public String resetAction() {
@@ -452,6 +453,7 @@
         showInput = true;
         showWeekDaysBar = true;
         showWeeksBar = true;
+        firstWeekDay = 0;
     }
 
     private String todayControlMode = "select";
@@ -532,4 +534,22 @@
         this.enableManualInput = enableManualInput;
     }
 
+    private int firstWeekDay = 0;
+
+    /**
+     * Gets value of firstWeekDay field.
+     * @return value of firstWeekDay field
+     */
+    public int getFirstWeekDay() {
+        return firstWeekDay;
+    }
+
+    /**
+     * Set a new value for firstWeekDay field.
+     * @param firstWeekDay a new value for firstWeekDay field
+     */
+    public void setFirstWeekDay(int firstWeekDay) {
+        this.firstWeekDay = firstWeekDay;
+    }
+    
 }

Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/showAttributesTest.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-16 13:30:13 UTC (rev 11808)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java	2008-12-16 13:41:37 UTC (rev 11809)
@@ -166,6 +166,8 @@
 
     String calendarMessageId;
 
+    String firstWeekDayId;
+
     void initIds(String parentId) {
         calendarId = parentId + FORM_ID + "calendar";
         calendarHeaderId = calendarId + "Header";
@@ -207,6 +209,7 @@
         applyButtonXpath = "//td[@id='" + calendarFooterId + "']/table/tbody/tr/td[6]";
         cleanButtonXPath = "//td[@id='"+calendarFooterId+"']/table/tbody/tr/td[2]";
         calendarMessageId = parentId + FORM_ID + "calendarMsg";
+        firstWeekDayId =parentId + FORM_ID + "firstWeekDay";
     }
 
     String getStatus() {
@@ -1146,6 +1149,34 @@
     }
 
     @Test
+    public void testFirstWeekDay(Template template) {
+        renderPage(SHOW_ATTRIBURES_TEST_URL, template, INIT_SHOW_ATTRIBUTES_TEST);
+        initIds(getParentId());
+
+        String firstWeekDayCellId = calendarId + "WeekDayCell0";
+        Locale locale = new Locale(selenium.getText(getParentId() + FORM_ID + "locale"));
+        DateFormatSymbols symbols = new DateFormatSymbols(locale);
+        Calendar cal = Calendar.getInstance(locale);
+
+        writeStatus("Check 'firstWeekDay' attribute");
+        writeStatus("Set first firstWeekDay to 5 day. 'FirstWeekDay' ranges from 0 to 6 for instance it is Friday in USA and Saturday (samedi) in France");
+        selenium.type(firstWeekDayId, "5");
+
+        int weekday = Integer.parseInt(selenium.getValue(firstWeekDayId));
+        String weekDayShortName = symbols.getShortWeekdays()[weekday + cal.getFirstDayOfWeek()];
+
+        writeStatus("Non-popup mode");
+        check(showPopupId, false);
+        AssertTextEquals(firstWeekDayCellId, weekDayShortName, "It looks as if 'firstWeekDay' attribute doesn't work");
+
+        writeStatus("Popup mode");
+        check(showPopupId, true);
+        showPopup();
+
+        AssertTextEquals(firstWeekDayCellId, weekDayShortName, "It looks as if 'firstWeekDay' attribute doesn't work");
+    }    
+
+    @Test
     public void testTodayControlMode(Template template) {
         renderPage(TODAY_CONTROL_MODE_URL, template, null);
         initIds(getParentId());