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

Thu Dec 18 10:38:05 EST 2008

Author: andrei_exadel
Date: 2008-12-18 10:38:04 -0500 (Thu, 18 Dec 2008)
New Revision: 11875

Added:
   trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/testEventsAttributes.xhtml
Modified:
   trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/layout.xhtml
   trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
   trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
Log:
RF-5236

Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/layout.xhtml
===================================================================
(Binary files differ)

Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/testEventsAttributes.xhtml
===================================================================

--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/testEventsAttributes.xhtml	                        (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/testEventsAttributes.xhtml	2008-12-18 15:38:04 UTC (rev 11875)
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" 
+	xmlns:a4j="http://richfaces.org/a4j"
+	xmlns:rich="http://richfaces.org/rich"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<ui:composition template="#{templateBean.template}">	
+	<ui:define name="component">
+		<h:form id="_form">
+			<rich:calendar
+					id="calendar"
+					popup="true"
+					showInput="true"
+					enableManualInput="true"
+					oncollapse="EventQueue.fire('oncollapse')"
+					oncurrentdateselect="EventQueue.fire('oncurrentdateselect')"
+					ondatemouseout="EventQueue.fire('ondatemouseout')"
+					ondatemouseover="EventQueue.fire('ondatemouseover')"
+					ondateselect="EventQueue.fire('ondateselect')"
+					onexpand="EventQueue.fire('onexpand')"
+					oninputclick="EventQueue.fire('oninputclick')"
+					oninputchange="EventQueue.fire('oninputchange')"
+					oninputkeydown="EventQueue.fire('oninputkeydown')"
+					oninputkeypress="EventQueue.fire('oninputkeypress')"
+					oninputkeyup="EventQueue.fire('oninputkeyup')">
+			</rich:calendar>
+			
+		</h:form>
+	</ui:define>
+</ui:composition>
+</html>
\ No newline at end of file

Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java	2008-12-18 14:56:23 UTC (rev 11874)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java	2008-12-18 15:38:04 UTC (rev 11875)
@@ -1234,6 +1234,13 @@
         eventsExpected.clear();
     }
     
+    public void assertEvent(String eventExpected) {
+        String message = runScript("EventQueue.assertEvent('"+eventExpected+"')");
+        if (null != message && message.length() > 0) {
+            Assert.fail(message);
+        }
+    }
+    
     public Object assertEvents(String id, List<SeleniumEvent> eventsExpected) {
     	
     	for (SeleniumEvent ev : eventsExpected) {

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-18 14:56:23 UTC (rev 11874)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java	2008-12-18 15:38:04 UTC (rev 11875)
@@ -66,6 +66,8 @@
     static final String LAYOUT_TESTS_URL = "pages/calendar/layoutTests.xhtml";
     
     static final String IMMEDIATE_TEST_URL = "pages/calendar/testImmediate.xhtml";
+    
+    static final String EVENTS_TEST_URL = "pages/calendar/testEventsAttributes.xhtml";
 
     static final String RESET_TIME_ON_DATE_SELECTION_TEST_URL = "pages/calendar/resetTimeOnDateSelectTest.xhtml";
 
@@ -417,6 +419,46 @@
     	}
     }
     
+    @Test
+    public void testEventsAttributes(Template template) {
+    	renderPage(EVENTS_TEST_URL, template, RESET_METHOD);
+    	initIds(getParentId());
+    	List<String> events = new ArrayList<String>();
+    	
+    	showPopup();
+    	
+
+    	events.add("onexpand");
+    	events.add("ondateselect");
+    	events.add("oncollapse");
+    	
+    	changeDate();
+    	assertEvents(events);
+    	
+    	events.add("ondatemouseover");   	
+    	events.add("ondatemouseout");
+    	
+    	String weekNumId = calendarId + "WeekNum2";
+    	selenium.mouseOver("//tr[@id='" + weekNumId + "']/td[starts-with(@class, '" + availableDayCellClass + "')]");
+    	selenium.mouseOut("//tr[@id='" + weekNumId + "']/td[starts-with(@class, '" + availableDayCellClass + "')]");
+    	assertEvents(events);
+    	
+    	events.add("oncurrentdateselect");
+    	
+    	changeCurrentDate(false);
+    	assertEvents(events);
+    	
+    	type(inputDateId, "a");
+    	assertEvent("oninputchange");
+    	assertEvent("oninputkeydown");
+    	assertEvent("oninputkeypress");
+    	assertEvent("oninputkeyup");
+    	
+    	clickById(inputDateId);
+    	assertEvent("oninputclick");
+    	
+    }
+    
     @Test // Test is the same as for internationalization
     public void testLocaleAttribute(Template template) {
     	renderPage(template, RESET_METHOD);


