[richfaces-svn-commits] JBoss Rich Faces SVN: r11744 - 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-12 12:14:23 -0500 (Fri, 12 Dec 2008)
New Revision: 11744

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:
https://jira.jboss.org/jira/browse/RF-5256

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-12 15:12:45 UTC (rev 11743)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java	2008-12-12 17:14:23 UTC (rev 11744)
@@ -225,6 +225,7 @@
         currentDate = new Date();
         locale = Locale.US;
         required = false;
+        enableManualInput = false;
     }
 
     public String resetAction() {
@@ -502,4 +503,22 @@
         isPopup = false;
     }
 
+    private boolean enableManualInput;
+
+    /**
+     * Gets value of enableManualInput field.
+     * @return value of enableManualInput field
+     */
+    public boolean isEnableManualInput() {
+        return enableManualInput;
+    }
+
+    /**
+     * Set a new value for enableManualInput field.
+     * @param enableManualInput a new value for enableManualInput field
+     */
+    public void setEnableManualInput(boolean enableManualInput) {
+        this.enableManualInput = enableManualInput;
+    }
+
 }

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-12 15:12:45 UTC (rev 11743)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java	2008-12-12 17:14:23 UTC (rev 11744)
@@ -354,14 +354,14 @@
     		}
     	}
     }
-    
+
     @Test
     public void testRenderedAttribute(Template template) {
     	AutoTester tester = getAutoTester(this);
     	tester.renderPage(template, RESET_METHOD);
     	tester.testRendered();
     }
-    
+
     @Test
     public void testInternationalization(Template template) {
     	renderPage(template, RESET_METHOD);
@@ -378,16 +378,16 @@
     	testWeekDays();
        
     }
-    
+
     @Test
-    public void testLinitToListAttribute(Template template) {
+    public void testLimitToListAttribute(Template template) {
     	AutoTester tester = getAutoTester(this);
     	tester.renderPage(template, RESET_METHOD);
     	calendarId = tester.getClientId(AutoTester.COMPONENT_ID, template);
     	calendarHeaderId = calendarId + "Header";
     	tester.testLimitToList();
     }
-    
+
     @Test
     public void testReRenderAttribute(Template template) {
     	AutoTester tester = getAutoTester(this);
@@ -413,7 +413,7 @@
     	calendarId = tester.getClientId(AutoTester.COMPONENT_ID, template);
     	tester.testValidatorAndValidatorMessageAttributes();
     }
-    
+
     @Test
     public void testClientMode(Template template) {
     	renderPage(template, RESET_METHOD);
@@ -1082,6 +1082,21 @@
         ajaxSetup();
     }
 
+    @Test
+    public void testLabelAttribute(Template template) {
+        renderPage(template, null);
+        initIds(getParentId());
+
+        String label = "Calendar";
+        writeStatus("Check 'label' attribute");
+
+        writeStatus("Set calendar input to something low-recalling date. Error message shown up has to be peppered with given label (Calendar)");
+        setValueById(inputDateId, "imnotdatetrustme");
+        clickAjaxCommandAndWait(ajaxSubmitId);
+        String msg = selenium.getText(calendarMessageId);
+        Assert.assertTrue(msg.matches(".*" + label + ".*"), "Error message does not contain defined label: Calendar");
+    }
+
     private void setPopup(boolean isPopup) {
         runScript("$('" + isPopupId + "').checked=" + isPopup);
     }