Author: nbelaevski Date: 2008-10-23 10:36:31 -0400 (Thu, 23 Oct 2008) New Revision: 10884 Added: trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/issues/ trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4507/ trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4507/CalendarDataModelItemImpl.java trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4507/CalendarModelBean.java trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/4500-4600/ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/4500-4600/rf4507.xhtml trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4507/ trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4507/Test.java Modified: trunk/test-applications/regressionArea/ trunk/test-applications/regressionArea/Seam-ear/ trunk/test-applications/regressionArea/Seam-ejb/ trunk/test-applications/regressionArea/Seam-web/src/test/resources/testng.xml trunk/test-applications/regressionArea/pom.xml Log: https://jira.jboss.org/jira/browse/RF-4507 Property changes on: trunk/test-applications/regressionArea ___________________________________________________________________ Name: svn:ignore + target Property changes on: trunk/test-applications/regressionArea/Seam-ear ___________________________________________________________________ Name: svn:ignore - target + target .project .settings Property changes on: trunk/test-applications/regressionArea/Seam-ejb ___________________________________________________________________ Name: svn:ignore - target + target .classpath .project .settings Added: trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4507/CalendarDataModelItemImpl.java =================================================================== --- trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4507/CalendarDataModelItemImpl.java (rev 0) +++ trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4507/CalendarDataModelItemImpl.java 2008-10-23 14:36:31 UTC (rev 10884) @@ -0,0 +1,49 @@ +package org.richfaces.regressionarea.issues.rf4507; + +import org.richfaces.model.CalendarDataModelItem; + +/** + * @author mikalaj + * + */ +public class CalendarDataModelItemImpl implements CalendarDataModelItem { + + private Object data; + + private int day; + + public CalendarDataModelItemImpl(Object data, int day) { + super(); + this.data = data; + this.day = day; + } + + public CalendarDataModelItemImpl() { + super(); + } + + public Object getData() { + return data; + } + + public int getDay() { + return day; + } + + public String getStyleClass() { + return null; + } + + public Object getToolTip() { + return null; + } + + public boolean hasToolTip() { + return false; + } + + public boolean isEnabled() { + return true; + } + +} Added: trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4507/CalendarModelBean.java =================================================================== --- trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4507/CalendarModelBean.java (rev 0) +++ trunk/test-applications/regressionArea/Seam-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4507/CalendarModelBean.java 2008-10-23 14:36:31 UTC (rev 10884) @@ -0,0 +1,47 @@ +package org.richfaces.regressionarea.issues.rf4507; + +import java.util.Calendar; +import java.util.Date; +import java.util.Locale; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.richfaces.model.CalendarDataModel; +import org.richfaces.model.CalendarDataModelItem; + +/** + * This test case for: <a href="https://jira.jboss.org/jira/browse/RF-4507">RF-4507 - Calendar with preload + * overrides AJAX data for all preceding components</a> + * + * @author Nick Belaevski + * + */ + +@Name("rf4507") +(a)Scope(ScopeType.APPLICATION) +public class CalendarModelBean implements CalendarDataModel { + + public CalendarDataModelItem[] getData(Date[] dateArray) { + if (dateArray == null) { + return null; + } + + Calendar calendar = Calendar.getInstance(Locale.US); + CalendarDataModelItem[] items = new CalendarDataModelItem[dateArray.length]; + + for (int i = 0; i < items.length; i++) { + calendar.setTime(dateArray[i]); + items[i] = new CalendarDataModelItemImpl(calendar.get(Calendar.DAY_OF_MONTH) + "-" + + (calendar.get(Calendar.MONTH) + 1), + calendar.get(Calendar.DAY_OF_MONTH)); + } + + return items; + } + + public Object getToolTip(Date date) { + return null; + } + +} Added: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/4500-4600/rf4507.xhtml =================================================================== --- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/4500-4600/rf4507.xhtml (rev 0) +++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/4500-4600/rf4507.xhtml 2008-10-23 14:36:31 UTC (rev 10884) @@ -0,0 +1,26 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + +<ui:composition template="#{templateBean.template}"> + <ui:define name="style"> + + </ui:define> + <ui:define name="component"> + <h:form id="form"> + <a4j:commandLink value="First Link" id="link1" data="#{'firstLink'}" oncomplete="window.receivedData = data" /> + + <rich:calendar value="22-10-2008" id="calendar" popup="false" mode="ajax" dataModel="#{rf4507}"> + <h:outputText value="{data}" /> + <f:convertDateTime pattern="dd-MM-yyyy"/> + </rich:calendar> + + <a4j:commandLink value="Second Link" id="link2" data="#{'secondLink'}" oncomplete="window.receivedData = data" /> + </h:form> + </ui:define> +</ui:composition> +</html> \ No newline at end of file Added: trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4507/Test.java =================================================================== --- trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4507/Test.java (rev 0) +++ trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/rf4507/Test.java 2008-10-23 14:36:31 UTC (rev 10884) @@ -0,0 +1,59 @@ +package org.richfaces.testng.rf4507; + +import org.ajax4jsf.template.Template; +import org.richfaces.SeleniumTestBase; +import org.testng.Assert; + +public class Test extends SeleniumTestBase { + + private String getIdSelector(Template template, String id) { + return "//*[@id='" + template.getPrefix() + id + "']"; + } + + private void testCalendarSwitch(Template template, int buttonPosition, String cellText) { + renderPage(template); + + AssertTextEquals(getIdSelector(template, "form:calendarDayCell6") + "/div", "5-10"); + + selenium.assignId(getIdSelector(template, "form:calendarHeader") + "//td[*[@class='rich-calendar-tool-btn']][" + buttonPosition + "]/div", "testButton"); + fireMouseEvent("testButton", "click", 0, 0, false); + waitForAjaxCompletion(); + + AssertTextEquals(getIdSelector(template, "form:calendarDayCell6") + "/div", cellText); + } + + private void testLink(Template template, String linkId, String data) throws Exception { + renderPage(template); + + Assert.assertEquals("null", selenium.getEval("window.receivedData")); + + clickAjaxCommandAndWait(getIdSelector(template, linkId)); + + Assert.assertEquals(data, selenium.getEval("window.receivedData")); + } + + @org.testng.annotations.Test + public void testNextMonth(Template template) throws Exception { + testCalendarSwitch(template, 4, "2-11"); + } + + @org.testng.annotations.Test + public void testPreviousMonth(Template template) throws Exception { + testCalendarSwitch(template, 2, "7-9"); + } + + @org.testng.annotations.Test + public void testFirstLink(Template template) throws Exception { + testLink(template, "form:link1", "firstLink"); + } + + @org.testng.annotations.Test + public void testSecondLink(Template template) throws Exception { + testLink(template, "form:link2", "secondLink"); + } + + public String getTestUrl() { + return "pages/4500-4600/rf4507.xhtml"; + } + +} Modified: trunk/test-applications/regressionArea/Seam-web/src/test/resources/testng.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-web/src/test/resources/testng.xml 2008-10-23 13:46:20 UTC (rev 10883) +++ trunk/test-applications/regressionArea/Seam-web/src/test/resources/testng.xml 2008-10-23 14:36:31 UTC (rev 10884) @@ -7,6 +7,7 @@ <parameter name="filterPrefix" value="/faces/NEKO/"/> <packages> <package name="org.richfaces.testng" /> + <package name="org.richfaces.testng.rf4507" /> </packages> </test--> <test name="FireFoxFunctionalTestsDANe"> @@ -16,6 +17,7 @@ <parameter name="browser" value="*firefox"/> <packages> <package name="org.richfaces.testng" /> + <package name="org.richfaces.testng.rf4507" /> </packages> </test> </suite> Modified: trunk/test-applications/regressionArea/pom.xml =================================================================== --- trunk/test-applications/regressionArea/pom.xml 2008-10-23 13:46:20 UTC (rev 10883) +++ trunk/test-applications/regressionArea/pom.xml 2008-10-23 14:36:31 UTC (rev 10884) @@ -62,10 +62,10 @@ <properties> <contextroot>Seam</contextroot> <earname>Seam-ear-${version}</earname> - <richversion>3.2.2.GA</richversion> + <richversion>3.3.0-SNAPSHOT</richversion> <seamversion>2.0.2.SP1</seamversion> <jsfversion>1.2_09</jsfversion> - <jbosshome>D:/Install/Java/jboss-4.2.3.GA</jbosshome> + <jbosshome>C:/tmp/jboss-4.2.2.GA</jbosshome> <jbosscontext>default</jbosscontext> </properties>