[richfaces-svn-commits] JBoss Rich Faces SVN: r11538 - 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-04 05:01:06 -0500 (Thu, 04 Dec 2008)
New Revision: 11538

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:
fixed typos and some stuff added

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-03 22:31:51 UTC (rev 11537)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java	2008-12-04 10:01:06 UTC (rev 11538)
@@ -203,6 +203,7 @@
         mode = UICalendar.AJAX_MODE;
         status = "";
         selectedDate = new Date();
+        isPopup = false;
     }
 
     public String resetAction() {

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-03 22:31:51 UTC (rev 11537)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java	2008-12-04 10:01:06 UTC (rev 11538)
@@ -84,7 +84,7 @@
 
     String timeZoneId;
 
-    String localId;
+    String localeId;
 
     String currentDateHeaderXpath;
 
@@ -110,7 +110,7 @@
         isPopupId  = parentId + CONTROLS_FORM_ID + "isPopup";
         datePatternId = parentId + CONTROLS_FORM_ID + "datePattern";
         timeZoneId = parentId + CONTROLS_FORM_ID + "timeZone";
-        localId = parentId + CONTROLS_FORM_ID + "local";
+        localeId = parentId + CONTROLS_FORM_ID + "locale";
         currentDateHeaderXpath = "//td[@id='"+calendarHeaderId+"']/table/tbody/tr/td[3]/div";
     }
 
@@ -334,10 +334,11 @@
 
     @Test
     public void testValueAndCurrentDateOfCalendarWithPopupFalse(Template template) {
-        renderPage(template, RESET_METHOD);
+        renderPage(template, null);
         initIds(getParentId());
         String expectedSelectedDate = "03/03/2007 11:00";
         String expectedCurrentDate = "04/04/2008 13:00";
+        setPopup(false);
 
         //1. value != null + curr_date != null
         writeStatus("Check whether the component is present and up to the mark if value and currentDate are defined");
@@ -345,6 +346,9 @@
         setValueById(currentDateId, expectedCurrentDate);
         clickCommandAndWait(setupActionId);
 
+        writeStatus("Check calendar panel has been rendered");
+        Assert.assertTrue(isVisible(calendarId), "Calendar panel is not visible");
+
         writeStatus("Check selected date");
         String date = selenium.getText(dateSelectionXpath);
         String time = selenium.getText(timeSelectionXpath);
@@ -385,15 +389,19 @@
         writeStatus("Check current month and year. Current date and value are not defined. Present (do not mix with current time 8))");
         currentDate = selenium.getText(currentDateHeaderXpath);
 
-        Locale locale = new Locale(selenium.getText(localId));
+        Locale locale = new Locale(selenium.getText(localeId));
         Date presentTime = Calendar.getInstance(locale).getTime();
         String month = DateUtils.month(presentTime, locale);
         int year = DateUtils.year(presentTime);
         String month_year = month + ", " + year;
 
-        Assert.assertEquals(currentDate, month_year, "Calendar shows wrong current date");        
+        Assert.assertEquals(currentDate, month_year, "Calendar shows wrong current date");
     }
 
+    private void setPopup(boolean isPopup) {
+        runScript("$('" + isPopupId + "').checked=" + isPopup);
+    }
+
     public String getTestUrl() {
         return "pages/calendar/calendarTest.xhtml";
     }