February 2011 - richfaces-svn-commits

JBoss Rich Faces SVN: r21713 - modules/tests/metamer/trunk/ftest/src/test/resources.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2011-02-16 16:24:59 -0500 (Wed, 16 Feb 2011) New Revision: 21713 Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml Log: disabled rich:tooltip tests since it causes hang up of Firefox (RF-10544) Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml =================================================================== --- modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml 2011-02-16 21:01:21 UTC (rev 21712) +++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml 2011-02-16 21:24:59 UTC (rev 21713) @@ -15,7 +15,7 @@ <package name="org.richfaces.tests.metamer.ftest.richTogglePanelItem" /> <package name="org.richfaces.tests.metamer.ftest.richToolbar" /> <package name="org.richfaces.tests.metamer.ftest.richToolbarGroup" /> - <package name="org.richfaces.tests.metamer.ftest.richTooltip" /> +  <package name="org.richfaces.tests.metamer.ftest.richPanelMenu" /> <package name="org.richfaces.tests.metamer.ftest.richPanelMenuGroup" /> <package name="org.richfaces.tests.metamer.ftest.richPanelMenuItem" />

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21712 - in trunk: parent and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2011-02-16 16:01:21 -0500 (Wed, 16 Feb 2011) New Revision: 21712 Modified: trunk/core/impl/pom.xml trunk/parent/pom.xml trunk/ui/misc/ui/pom.xml trunk/ui/parent/pom.xml Log: RF-10006 Fixed javadoc generation Modified: trunk/core/impl/pom.xml =================================================================== --- trunk/core/impl/pom.xml 2011-02-16 21:00:34 UTC (rev 21711) +++ trunk/core/impl/pom.xml 2011-02-16 21:01:21 UTC (rev 21712) @@ -172,23 +172,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <javadocVersion>1.5</javadocVersion> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-javadoc</id> - <phase>generate-sources</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin>  + <detectOfflineLinks>false</detectOfflineLinks> + </configuration> </plugin> </plugins> </pluginManagement> @@ -215,17 +224,12 @@ <build> <plugins> <plugin> -  <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <javadocVersion>1.5</javadocVersion> - <aggregate>true</aggregate> - </configuration> <executions> <execution> <id>generate-javadoc</id> - <phase>generate-sources</phase> + <phase>package</phase> <goals> <goal>jar</goal> </goals> @@ -236,12 +240,6 @@ </build> </profile> <profile> -  - <id>doc</id> -  - </profile> - <profile>  <id>clover</id> <build> Modified: trunk/ui/misc/ui/pom.xml =================================================================== --- trunk/ui/misc/ui/pom.xml 2011-02-16 21:00:34 UTC (rev 21711) +++ trunk/ui/misc/ui/pom.xml 2011-02-16 21:01:21 UTC (rev 21712) @@ -45,11 +45,7 @@ </plugin> </plugins> </build> - - <properties> - <assembly.projects.group>org.richfaces.ui.misc</assembly.projects.group> - </properties> - + <dependencies> <dependency> <groupId>org.richfaces.ui.common</groupId> @@ -61,99 +57,6 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>release</id> -  - <build> - <plugins> - <plugin> -  - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>deps</id> - <phase>process-sources</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <classifier>sources</classifier> - - <includeGroupIds>${assembly.projects.group}</includeGroupIds> - <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> - <excludeTransitive>true</excludeTransitive> - </configuration> - </execution> - </executions> - </plugin> -  - <plugin> -  - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.7</version> - <executions> - <execution> - <id>javadoc-jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <sourcepath>${basedir}/target/dependency</sourcepath> -  - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/dist/richf... </connection> Modified: trunk/ui/parent/pom.xml =================================================================== --- trunk/ui/parent/pom.xml 2011-02-16 21:00:34 UTC (rev 21711) +++ trunk/ui/parent/pom.xml 2011-02-16 21:01:21 UTC (rev 21712) @@ -156,23 +156,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <javadocVersion>1.5</javadocVersion> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-javadoc</id> - <phase>generate-sources</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <configuration> <aggregate>true</aggregate>

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21711 - in trunk/ui/dist: richfaces-components-ui and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2011-02-16 16:00:34 -0500 (Wed, 16 Feb 2011) New Revision: 21711 Modified: trunk/ui/dist/richfaces-components-api/pom.xml trunk/ui/dist/richfaces-components-ui/pom.xml Log: RF-10381, RF-10006 Fixed javadoc generation Modified: trunk/ui/dist/richfaces-components-api/pom.xml =================================================================== --- trunk/ui/dist/richfaces-components-api/pom.xml 2011-02-16 17:42:52 UTC (rev 21710) +++ trunk/ui/dist/richfaces-components-api/pom.xml 2011-02-16 21:00:34 UTC (rev 21711) @@ -149,8 +149,7 @@ <classifier>sources</classifier> <includeGroupIds> - org.richfaces.ui.core, org.richfaces.ui.common, org.richfaces.ui.misc, org.richfaces.ui.iteration, - org.richfaces.ui.output, org.richfaces.ui.input, org.richfaces.ui.dnd, org.richfaces.ui.validator + org.richfaces.ui.core,org.richfaces.ui.common,org.richfaces.ui.misc,org.richfaces.ui.iteration,org.richfaces.ui.output,org.richfaces.ui.input,org.richfaces.ui.dnd,org.richfaces.ui.validator </includeGroupIds> <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> <excludeTransitive>true</excludeTransitive> @@ -159,20 +158,12 @@ </executions> </plugin> <plugin> +  <artifactId>maven-javadoc-plugin</artifactId> - <version>2.7</version> - <executions> - <execution> - <id>javadoc-jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <sourcepath>${basedir}/target/dependency</sourcepath> - </configuration> - </execution> - </executions> + <configuration> + <sourcepath>${basedir}/target/dependency</sourcepath> + </configuration> </plugin> </plugins> </build> Modified: trunk/ui/dist/richfaces-components-ui/pom.xml =================================================================== --- trunk/ui/dist/richfaces-components-ui/pom.xml 2011-02-16 17:42:52 UTC (rev 21710) +++ trunk/ui/dist/richfaces-components-ui/pom.xml 2011-02-16 21:00:34 UTC (rev 21711) @@ -174,8 +174,7 @@ <classifier>sources</classifier> <includeGroupIds> - ${assembly.projects.group}.core, ${assembly.projects.group}.common, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration, - ${assembly.projects.group}.output, ${assembly.projects.group}.input, ${assembly.projects.group}.dnd, ${assembly.projects.group}.validator + ${assembly.projects.group}.core,${assembly.projects.group}.common,${assembly.projects.group}.misc,${assembly.projects.group}.iteration,${assembly.projects.group}.output,${assembly.projects.group}.input,${assembly.projects.group}.dnd,${assembly.projects.group}.validator </includeGroupIds> <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> <excludeTransitive>true</excludeTransitive> @@ -183,59 +182,13 @@ </execution> </executions> </plugin> - - <plugin> -  +  <artifactId>maven-javadoc-plugin</artifactId> - <version>2.7</version> - <executions> - <execution> - <id>javadoc-jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <sourcepath>${basedir}/target/dependency</sourcepath> - </configuration> - </execution> - </executions> + <configuration> + <sourcepath>${basedir}/target/dependency</sourcepath> + </configuration> </plugin> </plugins> </build>

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21710 - in modules/tests/metamer/trunk: application/src/main/webapp/components/richAccordion and 7 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-02-16 12:42:52 -0500 (Wed, 16 Feb 2011) New Revision: 21710 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java Log: removed hidden attributes from panels removed tests for hidden attributes Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -62,12 +62,6 @@ // will be tested in another way attributes.remove("converter"); attributes.remove("itemChangeListener"); - - // TODO remove as soon as it is added to taglib RF-10310 - attributes.setAttribute("onbeforedomupdate", null); - attributes.setAttribute("onbegin", null); - attributes.setAttribute("oncomplete", null); - } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -63,9 +63,6 @@ // will be tested in another way attributes.remove("converter"); - - // TODO remove as soon as it is added to taglib RF-10310 - attributes.setAttribute("onbegin", null); } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -61,11 +61,6 @@ // will be tested in another way attributes.remove("converter"); attributes.remove("itemChangeListener"); - - // TODO remove as soon as it is added to taglib RF-10310 - attributes.setAttribute("onbeforedomupdate", null); - attributes.setAttribute("onbegin", null); - attributes.setAttribute("oncomplete", null); } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -62,11 +62,6 @@ // will to be tested in another way attributes.remove("converter"); attributes.remove("itemChangeListener"); - - // TODO remove as soon as it is added to taglib RF-10310 - attributes.setAttribute("onbeforedomupdate", null); - attributes.setAttribute("onbegin", null); - attributes.setAttribute("oncomplete", null); } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-02-16 17:42:52 UTC (rev 21710) @@ -44,9 +44,7 @@ activeItem="#{richAccordionBean.attributes['activeItem'].value}" bypassUpdates="#{richAccordionBean.attributes['bypassUpdates'].value}" cycledSwitching="#{richAccordionBean.attributes['cycledSwitching'].value}" - data="#{richAccordionBean.attributes['data'].value}" dir="#{richAccordionBean.attributes['dir'].value}" - execute="#{richAccordionBean.attributes['execute'].value}" height="#{richAccordionBean.attributes['height'].value}" immediate="#{richAccordionBean.attributes['immediate'].value}" itemChangeListener="#{richBean.itemChangeListener}" @@ -62,12 +60,8 @@ itemInactiveLeftIcon="#{richAccordionBean.attributes['itemInactiveLeftIcon'].value}" itemInactiveRightIcon="#{richAccordionBean.attributes['itemInactiveRightIcon'].value}" lang="#{richAccordionBean.attributes['lang'].value}" - limitRender="#{richAccordionBean.attributes['limitRender'].value}" - onbeforedomupdate="#{richAccordionBean.attributes['onbeforedomupdate'].value}" onbeforeitemchange="#{richAccordionBean.attributes['onbeforeitemchange'].value}" - onbegin="#{richAccordionBean.attributes['onbegin'].value}" onclick="#{richAccordionBean.attributes['onclick'].value}" - oncomplete="#{richAccordionBean.attributes['oncomplete'].value}" ondblclick="#{richAccordionBean.attributes['ondblclick'].value}" onitemchange="#{richAccordionBean.attributes['onitemchange'].value}" onmousedown="#{richAccordionBean.attributes['onmousedown'].value}" @@ -75,9 +69,7 @@ onmouseout="#{richAccordionBean.attributes['onmouseout'].value}" onmouseover="#{richAccordionBean.attributes['onmouseover'].value}" onmouseup="#{richAccordionBean.attributes['onmouseup'].value}" - render="#{richAccordionBean.attributes['render'].value}" rendered="#{richAccordionBean.attributes['rendered'].value}" - status="#{richAccordionBean.attributes['status'].value}" style="#{richAccordionBean.attributes['style'].value}" styleClass="#{richAccordionBean.attributes['styleClass'].value}" switchType="#{richAccordionBean.attributes['switchType'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-02-16 17:42:52 UTC (rev 21710) @@ -45,9 +45,7 @@ <rich:collapsiblePanel id="collapsiblePanel" bodyClass="#{richCollapsiblePanelBean.attributes['bodyClass'].value}" bypassUpdates="#{richCollapsiblePanelBean.attributes['bypassUpdates'].value}" - data="#{richCollapsiblePanelBean.attributes['data'].value}" dir="#{richCollapsiblePanelBean.attributes['dir'].value}" - execute="#{richCollapsiblePanelBean.attributes['execute'].value}" expanded="#{richCollapsiblePanelBean.attributes['expanded'].value}" header="#{richCollapsiblePanelBean.attributes['header'].value}" headerClass="#{richCollapsiblePanelBean.attributes['headerClass'].value}" @@ -55,12 +53,8 @@ lang="#{richCollapsiblePanelBean.attributes['lang'].value}" leftCollapsedIcon="#{richCollapsiblePanelBean.attributes['leftCollapsedIcon'].value}" leftExpandedIcon="#{richCollapsiblePanelBean.attributes['leftExpandedIcon'].value}" - limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}" - onbeforedomupdate="#{richCollapsiblePanelBean.attributes['onbeforedomupdate'].value}" onbeforeswitch="#{richCollapsiblePanelBean.attributes['onbeforeswitch'].value}" - onbegin="#{richCollapsiblePanelBean.attributes['onbegin'].value}" onclick="#{richCollapsiblePanelBean.attributes['onclick'].value}" - oncomplete="#{richCollapsiblePanelBean.attributes['oncomplete'].value}" ondblclick="#{richCollapsiblePanelBean.attributes['ondblclick'].value}" onmousedown="#{richCollapsiblePanelBean.attributes['onmousedown'].value}" onmousemove="#{richCollapsiblePanelBean.attributes['onmousemove'].value}" @@ -68,11 +62,9 @@ onmouseover="#{richCollapsiblePanelBean.attributes['onmouseover'].value}" onmouseup="#{richCollapsiblePanelBean.attributes['onmouseup'].value}" onswitch="#{richCollapsiblePanelBean.attributes['onswitch'].value}" - render="#{richCollapsiblePanelBean.attributes['render'].value}" rendered="#{richCollapsiblePanelBean.attributes['rendered'].value}" rightCollapsedIcon="#{richCollapsiblePanelBean.attributes['rightCollapsedIcon'].value}" rightExpandedIcon="#{richCollapsiblePanelBean.attributes['rightExpandedIcon'].value}" - status="#{richCollapsiblePanelBean.attributes['status'].value}" style="#{richCollapsiblePanelBean.attributes['style'].value}" styleClass="#{richCollapsiblePanelBean.attributes['styleClass'].value}" switchType="#{richCollapsiblePanelBean.attributes['switchType'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-02-16 17:42:52 UTC (rev 21710) @@ -44,9 +44,7 @@ <rich:collapsiblePanel id="collapsiblePanel" bodyClass="#{richCollapsiblePanelBean.attributes['bodyClass'].value}" bypassUpdates="#{richCollapsiblePanelBean.attributes['bypassUpdates'].value}" - data="#{richCollapsiblePanelBean.attributes['data'].value}" dir="#{richCollapsiblePanelBean.attributes['dir'].value}" - execute="#{richCollapsiblePanelBean.attributes['execute'].value}" expanded="#{richCollapsiblePanelBean.attributes['expanded'].value}" header="#{richCollapsiblePanelBean.attributes['header'].value}" headerClass="#{richCollapsiblePanelBean.attributes['headerClass'].value}" @@ -54,12 +52,8 @@ lang="#{richCollapsiblePanelBean.attributes['lang'].value}" leftCollapsedIcon="#{richCollapsiblePanelBean.attributes['leftCollapsedIcon'].value}" leftExpandedIcon="#{richCollapsiblePanelBean.attributes['leftExpandedIcon'].value}" - limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}" - onbeforedomupdate="#{richCollapsiblePanelBean.attributes['onbeforedomupdate'].value}" onbeforeswitch="#{richCollapsiblePanelBean.attributes['onbeforeswitch'].value}" - onbegin="#{richCollapsiblePanelBean.attributes['onbegin'].value}" onclick="#{richCollapsiblePanelBean.attributes['onclick'].value}" - oncomplete="#{richCollapsiblePanelBean.attributes['oncomplete'].value}" ondblclick="#{richCollapsiblePanelBean.attributes['ondblclick'].value}" onmousedown="#{richCollapsiblePanelBean.attributes['onmousedown'].value}" onmousemove="#{richCollapsiblePanelBean.attributes['onmousemove'].value}" @@ -67,11 +61,9 @@ onmouseover="#{richCollapsiblePanelBean.attributes['onmouseover'].value}" onmouseup="#{richCollapsiblePanelBean.attributes['onmouseup'].value}" onswitch="#{richCollapsiblePanelBean.attributes['onswitch'].value}" - render="#{richCollapsiblePanelBean.attributes['render'].value}" rendered="#{richCollapsiblePanelBean.attributes['rendered'].value}" rightCollapsedIcon="#{richCollapsiblePanelBean.attributes['rightCollapsedIcon'].value}" rightExpandedIcon="#{richCollapsiblePanelBean.attributes['rightExpandedIcon'].value}" - status="#{richCollapsiblePanelBean.attributes['status'].value}" style="#{richCollapsiblePanelBean.attributes['style'].value}" styleClass="#{richCollapsiblePanelBean.attributes['styleClass'].value}" switchType="#{richCollapsiblePanelBean.attributes['switchType'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2011-02-16 17:42:52 UTC (rev 21710) @@ -44,20 +44,14 @@ activeItem="#{richTabPanelBean.attributes['activeItem'].value}" bypassUpdates="#{richTabPanelBean.attributes['bypassUpdates'].value}" cycledSwitching="#{richTabPanelBean.attributes['cycledSwitching'].value}" - data="#{richTabPanelBean.attributes['data'].value}" dir="#{richTabPanelBean.attributes['dir'].value}" - execute="#{richTabPanelBean.attributes['execute'].value}" headerAlignment="#{richTabPanelBean.attributes['headerAlignment'].value}" headerPosition="#{richTabPanelBean.attributes['headerPosition'].value}" immediate="#{richTabPanelBean.attributes['immediate'].value}" itemChangeListener="#{richBean.itemChangeListener}" lang="#{richTabPanelBean.attributes['lang'].value}" - limitRender="#{richTabPanelBean.attributes['limitRender'].value}" - onbeforedomupdate="#{richTabPanelBean.attributes['onbeforedomupdate'].value}" onbeforeitemchange="#{richTabPanelBean.attributes['onbeforeitemchange'].value}" - onbegin="#{richTabPanelBean.attributes['onbegin'].value}" onclick="#{richTabPanelBean.attributes['onclick'].value}" - oncomplete="#{richTabPanelBean.attributes['oncomplete'].value}" ondblclick="#{richTabPanelBean.attributes['ondblclick'].value}" onitemchange="#{richTabPanelBean.attributes['onitemchange'].value}" onmousedown="#{richTabPanelBean.attributes['onmousedown'].value}" @@ -65,9 +59,7 @@ onmouseout="#{richTabPanelBean.attributes['onmouseout'].value}" onmouseover="#{richTabPanelBean.attributes['onmouseover'].value}" onmouseup="#{richTabPanelBean.attributes['onmouseup'].value}" - render="#{richTabPanelBean.attributes['render'].value}" rendered="#{richTabPanelBean.attributes['rendered'].value}" - status="#{richTabPanelBean.attributes['status'].value}" style="#{richTabPanelBean.attributes['style'].value}" styleClass="#{richTabPanelBean.attributes['styleClass'].value}" switchType="#{richTabPanelBean.attributes['switchType'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2011-02-16 17:42:52 UTC (rev 21710) @@ -82,18 +82,12 @@ activeItem="#{richTogglePanelBean.attributes['activeItem'].value}" bypassUpdates="#{richTogglePanelBean.attributes['bypassUpdates'].value}" cycledSwitching="#{richTogglePanelBean.attributes['cycledSwitching'].value}" - data="#{richTogglePanelBean.attributes['data'].value}" dir="#{richTogglePanelBean.attributes['dir'].value}" - execute="#{richTogglePanelBean.attributes['execute'].value}" immediate="#{richTogglePanelBean.attributes['immediate'].value}" itemChangeListener="#{richBean.itemChangeListener}" lang="#{richTogglePanelBean.attributes['lang'].value}" - limitRender="#{richTogglePanelBean.attributes['limitRender'].value}" - onbeforedomupdate="#{richTogglePanelBean.attributes['onbeforedomupdate'].value}" onbeforeitemchange="#{richTogglePanelBean.attributes['onbeforeitemchange'].value}" - onbegin="#{richTogglePanelBean.attributes['onbegin'].value}" onclick="#{richTogglePanelBean.attributes['onclick'].value}" - oncomplete="#{richTogglePanelBean.attributes['oncomplete'].value}" ondblclick="#{richTogglePanelBean.attributes['ondblclick'].value}" onitemchange="#{richTogglePanelBean.attributes['onitemchange'].value}" onmousedown="#{richTogglePanelBean.attributes['onmousedown'].value}" @@ -101,9 +95,7 @@ onmouseout="#{richTogglePanelBean.attributes['onmouseout'].value}" onmouseover="#{richTogglePanelBean.attributes['onmouseover'].value}" onmouseup="#{richTogglePanelBean.attributes['onmouseup'].value}" - render="#{richTogglePanelBean.attributes['render'].value}" rendered="#{richTogglePanelBean.attributes['rendered'].value}" - status="#{richTogglePanelBean.attributes['status'].value}" style="#{richTogglePanelBean.attributes['style'].value}" styleClass="#{richTogglePanelBean.attributes['styleClass'].value}" switchType="#{richTogglePanelBean.attributes['switchType'].value}" Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -173,45 +173,11 @@ } @Test - @RegressionTest("https://issues.jboss.org/browse/RF-10061") - public void testData() { - selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); - selenium.waitForPageToLoad(); - - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "data = event.data"); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(itemHeaders[2]); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); - - String data = selenium.getEval(new JavaScript("window.data")); - assertEquals(data, "RichFaces 4", "Data sent with ajax request"); - } - - @Test public void testDir() { testDir(accordion); } @Test - public void testExecute() { - selenium.type(pjq("input[type=text][id$=executeInput]"), "@this executeChecker"); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(itemHeaders[2]); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); - - JQueryLocator logItems = jq("ul.phases-list li:eq({0})"); - for (int i = 0; i < 6; i++) { - if ("* executeChecker".equals(selenium.getText(logItems.format(i)))) { - return; - } - } - - fail("Attribute execute does not work"); - } - - @Test public void testHeight() { AttributeLocator<?> attribute = accordion.getAttribute(new Attribute("style")); @@ -345,43 +311,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9934") - public void testLimitRender() { - selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); - selenium.waitForPageToLoad(); - - String timeValue = selenium.getText(time); - - guardXhr(selenium).click(itemHeaders[1]); - waitGui.failWith("Item 2 is not displayed.").until(isDisplayed.locator(itemContents[1])); - - String newTime = selenium.getText(time); - assertNotSame(newTime, timeValue, "Panel with ajaxRendered=true should not be rerendered."); - } - - @Test - public void testAjaxEvents() { - selenium.type(pjq("input[type=text][id$=onbeginInput]"), "metamerEvents += \"begin \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=onbeforedomupdateInput]"), "metamerEvents += \"beforedomupdate \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "metamerEvents += \"complete \""); - selenium.waitForPageToLoad(); - - selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); - - guardXhr(selenium).click(itemHeaders[1]); - waitGui.failWith("Item 2 is not displayed.").until(isDisplayed.locator(itemContents[1])); - - String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" "); - - assertEquals(events.length, 3, "3 events should be fired."); - assertEquals(events[0], "begin", "Attribute onbegin doesn't work"); - assertEquals(events[1], "beforedomupdate", "Attribute onbeforedomupdate doesn't work"); - assertEquals(events[2], "complete", "Attribute oncomplete doesn't work"); - } - - @Test public void testItemchangeEvents() { selenium.type(pjq("input[type=text][id$=onbeforeitemchangeInput]"), "metamerEvents += \"beforeitemchange \""); selenium.waitForPageToLoad(); @@ -458,16 +387,6 @@ } @Test - public void testRender() { - selenium.type(pjq("input[type=text][id$=renderInput]"), "renderChecker"); - selenium.waitForPageToLoad(); - - String renderCheckerTime = selenium.getText(renderChecker); - guardXhr(selenium).click(itemHeaders[1]); - waitGui.failWith("Attribute render doesn't work").waitForChange(renderCheckerTime, retrieveText.locator(renderChecker)); - } - - @Test public void testRendered() { selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); selenium.waitForPageToLoad(); @@ -476,16 +395,6 @@ } @Test - public void testStatus() { - selenium.type(pjq("input[type=text][id$=statusInput]"), "statusChecker"); - selenium.waitForPageToLoad(); - - String statusCheckerTime = selenium.getText(statusChecker); - guardXhr(selenium).click(itemHeaders[1]); - waitGui.failWith("Attribute status doesn't work").waitForChange(statusCheckerTime, retrieveText.locator(statusChecker)); - } - - @Test public void testStyle() { testStyle(accordion, "style"); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -96,47 +96,11 @@ } @Test - @RegressionTest("https://issues.jboss.org/browse/RF-10061") - public void testData() { - selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); - selenium.waitForPageToLoad(); - - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "data = event.data"); - selenium.waitForPageToLoad(); - - String reqTime = selenium.getText(time); - guardXhr(selenium).click(header); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - String data = selenium.getEval(new JavaScript("window.data")); - assertEquals(data, "RichFaces 4", "Data sent with ajax request"); - } - - @Test public void testDir() { testDir(panel); } @Test - public void testExecute() { - selenium.type(pjq("input[type=text][id$=executeInput]"), "input executeChecker"); - selenium.waitForPageToLoad(); - - String reqTime = selenium.getText(time); - guardXhr(selenium).click(header); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - JQueryLocator logItems = jq("ul.phases-list li:eq({0})"); - for (int i = 0; i < 6; i++) { - if ("* executeChecker".equals(selenium.getText(logItems.format(i)))) { - return; - } - } - - fail("Attribute execute does not work"); - } - - @Test @IssueTracking("https://issues.jboss.org/browse/RF-10312") public void testExpanded() { verifyBeforeClick(); @@ -211,47 +175,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9535") - public void testLimitRender() { - selenium.type(pjq("input[type=text][id$=renderInput]"), "@this"); - selenium.waitForPageToLoad(); - - selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); - selenium.waitForPageToLoad(); - - String reqTime = selenium.getText(time); - - guardXhr(selenium).click(header); - waitGui.failWith("Panel should be collapsed.").until(isDisplayed.locator(headerColps)); - - String newTime = selenium.getText(time); - assertTrue(newTime.equals(reqTime), "Panel with ajaxRendered=true should not be rerendered (old and new time should be same)."); - } - - @Test - public void testAjaxEvents() { - selenium.type(pjq("input[type=text][id$=onbeginInput]"), "metamerEvents += \"begin \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=onbeforedomupdateInput]"), "metamerEvents += \"beforedomupdate \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "metamerEvents += \"complete \""); - selenium.waitForPageToLoad(); - - selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); - - String reqTime = selenium.getText(time); - guardXhr(selenium).click(header); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" "); - - assertEquals(events.length, 3, "3 events should be fired."); - assertEquals(events[0], "begin", "Attribute onbegin doesn't work"); - assertEquals(events[1], "beforedomupdate", "Attribute onbeforedomupdate doesn't work"); - assertEquals(events[2], "complete", "Attribute oncomplete doesn't work"); - } - - @Test public void testOnbeforeswitchOnswitch() { selenium.type(pjq("input[type=text][id$=onbeforeswitchInput]"), "metamerEvents += \"beforeswitch \""); selenium.waitForPageToLoad(); @@ -306,16 +229,6 @@ } @Test - public void testRender() { - selenium.type(pjq("input[type=text][id$=renderInput]"), "renderChecker"); - selenium.waitForPageToLoad(); - - String renderCheckerTime = selenium.getText(renderChecker); - guardXhr(selenium).click(header); - waitGui.failWith("Attribute render doesn't work").waitForChange(renderCheckerTime, retrieveText.locator(renderChecker)); - } - - @Test public void testRendered() { selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); selenium.waitForPageToLoad(); @@ -348,16 +261,6 @@ } @Test - public void testStatus() { - selenium.type(pjq("input[type=text][id$=statusInput]"), "statusChecker"); - selenium.waitForPageToLoad(); - - String statusCheckerTime = selenium.getText(statusChecker); - guardXhr(selenium).click(header); - waitGui.failWith("Attribute status doesn't work").waitForChange(statusCheckerTime, retrieveText.locator(statusChecker)); - } - - @Test public void testStyle() { testStyle(panel, "style"); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -179,47 +179,11 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10521") - @RegressionTest("https://issues.jboss.org/browse/RF-10061") - public void testData() { - selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); - selenium.waitForPageToLoad(); - - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "data = event.data"); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(inactiveHeaders[2]); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); - - String data = selenium.getEval(new JavaScript("window.data")); - assertEquals(data, "RichFaces 4", "Data sent with ajax request"); - } - - @Test public void testDir() { super.testDir(panel); } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10443") - public void testExecute() { - selenium.type(pjq("input[type=text][id$=executeInput]"), "@this executeChecker"); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(inactiveHeaders[2]); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); - - JQueryLocator logItems = jq("ul.phases-list li:eq({0})"); - for (int i = 0; i < 6; i++) { - if ("* executeChecker".equals(selenium.getText(logItems.format(i)))) { - return; - } - } - - fail("Attribute execute does not work"); - } - - @Test @IssueTracking("https://issues.jboss.org/browse/RF-10054") public void testImmediate() { selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -248,47 +212,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9535") - public void testLimitRender() { - selenium.type(pjq("input[type=text][id$=renderInput]"), "@this"); - selenium.waitForPageToLoad(); - - selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); - selenium.waitForPageToLoad(); - - String timeValue = selenium.getText(time); - - guardXhr(selenium).click(inactiveHeaders[1]); - waitGui.failWith("Tab 2 is not displayed.").until(isDisplayed.locator(itemContents[1])); - - String newTimeValue = selenium.getText(time); - assertNotSame(newTimeValue, timeValue, "Panel with ajaxRendered=true should not be rerendered."); - } - - @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10310 https://issues.jboss.org/browse/RF-10521") - public void testAjaxEvents() { - selenium.type(pjq("input[type=text][id$=onbeginInput]"), "metamerEvents += \"begin \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=onbeforedomupdateInput]"), "metamerEvents += \"beforedomupdate \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "metamerEvents += \"complete \""); - selenium.waitForPageToLoad(); - - selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); - - guardXhr(selenium).click(inactiveHeaders[2]); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); - - String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" "); - - assertEquals(events.length, 3, "3 events should be fired."); - assertEquals(events[0], "begin", "Attribute onbegin doesn't work"); - assertEquals(events[1], "beforedomupdate", "Attribute onbeforedomupdate doesn't work"); - assertEquals(events[2], "complete", "Attribute oncomplete doesn't work"); - } - - @Test public void testOnbeforeitemchange() { selenium.type(pjq("input[id$=onbeforeitemchangeInput]"), "metamerEvents += \"onbeforeitemchange \""); selenium.waitForPageToLoad(TIMEOUT); @@ -367,17 +290,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10441") - public void testRender() { - selenium.type(pjq("input[type=text][id$=renderInput]"), "renderChecker"); - selenium.waitForPageToLoad(); - - String renderCheckerTime = selenium.getText(renderChecker); - guardXhr(selenium).click(inactiveHeaders[1]); - waitGui.failWith("Attribute render doesn't work").waitForChange(renderCheckerTime, retrieveText.locator(renderChecker)); - } - - @Test public void testRendered() { selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); selenium.waitForPageToLoad(); @@ -386,16 +298,6 @@ } @Test - public void testStatus() { - selenium.type(pjq("input[type=text][id$=statusInput]"), "statusChecker"); - selenium.waitForPageToLoad(); - - String statusCheckerTime = selenium.getText(statusChecker); - guardXhr(selenium).click(inactiveHeaders[1]); - waitGui.failWith("Attribute status doesn't work").waitForChange(statusCheckerTime, retrieveText.locator(statusChecker)); - } - - @Test public void testStyle() { testStyle(panel, "style"); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -210,45 +210,11 @@ } @Test - @RegressionTest("https://issues.jboss.org/browse/RF-10061") - public void testData() { - selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); - selenium.waitForPageToLoad(); - - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "data = event.data"); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(tc3); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(item3)); - - String data = selenium.getEval(new JavaScript("window.data")); - assertEquals(data, "RichFaces 4", "Data sent with ajax request"); - } - - @Test public void testDir() { super.testDir(panel); } @Test - public void testExecute() { - selenium.type(pjq("input[type=text][id$=executeInput]"), "@this executeChecker"); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(tc3); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(item3)); - - JQueryLocator logItems = jq("ul.phases-list li:eq({0})"); - for (int i = 0; i < 6; i++) { - if ("* executeChecker".equals(selenium.getText(logItems.format(i)))) { - return; - } - } - - fail("Attribute execute does not work"); - } - - @Test @IssueTracking("https://issues.jboss.org/browse/RF-10054") public void testImmediate() { selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -275,21 +241,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9881") - public void testLimitRender() { - selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); - selenium.waitForPageToLoad(); - - String timeValue = selenium.getText(time); - - guardXhr(selenium).click(tc2); - waitGui.failWith("Item 2 is not displayed.").until(isDisplayed.locator(item2)); - - String newTimeValue = selenium.getText(time); - assertEquals(newTimeValue, timeValue, "Panel with ajaxRendered=true should not be rerendered."); - } - - @Test public void testOnbeforeitemchange() { selenium.type(pjq("input[id$=onbeforeitemchangeInput]"), "metamerEvents += \"onbeforeitemchange \""); selenium.waitForPageToLoad(); @@ -301,29 +252,6 @@ } @Test - public void testAjaxEvents() { - selenium.type(pjq("input[type=text][id$=onbeginInput]"), "metamerEvents += \"begin \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=onbeforedomupdateInput]"), "metamerEvents += \"beforedomupdate \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "metamerEvents += \"complete \""); - selenium.waitForPageToLoad(); - - selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); - - String reqTime = selenium.getText(time); - guardXhr(selenium).click(tc2); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" "); - - assertEquals(events.length, 3, "3 events should be fired."); - assertEquals(events[0], "begin", "Attribute onbegin doesn't work"); - assertEquals(events[1], "beforedomupdate", "Attribute onbeforedomupdate doesn't work"); - assertEquals(events[2], "complete", "Attribute oncomplete doesn't work"); - } - - @Test public void testItemchangeEvents() { selenium.type(pjq("input[type=text][id$=onbeforeitemchangeInput]"), "metamerEvents += \"beforeitemchange \""); selenium.waitForPageToLoad(); @@ -389,16 +317,6 @@ } @Test - public void testRender() { - selenium.type(pjq("input[type=text][id$=renderInput]"), "renderChecker"); - selenium.waitForPageToLoad(); - - String renderCheckerTime = selenium.getText(renderChecker); - guardXhr(selenium).click(tc2); - waitGui.failWith("Attribute render doesn't work").waitForChange(renderCheckerTime, retrieveText.locator(renderChecker)); - } - - @Test public void testRendered() { selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); selenium.waitForPageToLoad(); @@ -407,16 +325,6 @@ } @Test - public void testStatus() { - selenium.type(pjq("input[type=text][id$=statusInput]"), "statusChecker"); - selenium.waitForPageToLoad(); - - String statusCheckerTime = selenium.getText(statusChecker); - guardXhr(selenium).click(tc2); - waitGui.failWith("Attribute status doesn't work").waitForChange(statusCheckerTime, retrieveText.locator(statusChecker)); - } - - @Test public void testStyle() { testStyle(panel, "style"); }

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21709 - in trunk/ui/output/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2011-02-16 12:32:02 -0500 (Wed, 16 Feb 2011) New Revision: 21709 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.js Log: RF-10448: @action and @actionListener are fixed for Tab Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2011-02-16 17:15:09 UTC (rev 21708) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2011-02-16 17:32:02 UTC (rev 21709) @@ -22,29 +22,6 @@ package org.richfaces.renderkit.html; -import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.active; -import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.disabled; -import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.inactive; -import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; -import static org.richfaces.renderkit.HtmlConstants.DIV_ELEM; -import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; -import static org.richfaces.renderkit.HtmlConstants.SPAN_ELEM; -import static org.richfaces.renderkit.HtmlConstants.STYLE_ATTRIBUTE; -import static org.richfaces.renderkit.HtmlConstants.TBODY_ELEMENT; -import static org.richfaces.renderkit.HtmlConstants.TD_ELEM; -import static org.richfaces.renderkit.HtmlConstants.TR_ELEMENT; -import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - import org.ajax4jsf.javascript.JSObject; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.*; @@ -53,6 +30,18 @@ import org.richfaces.renderkit.HtmlConstants; import org.richfaces.renderkit.RenderKitUtils; +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import java.io.IOException; +import java.util.Map; + +import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.*; +import static org.richfaces.renderkit.HtmlConstants.*; +import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; + /** * @author akolonitsky * @since 2010-08-24 @@ -253,16 +242,10 @@ @Override protected Map<String, Object> getScriptObjectOptions(FacesContext context, UIComponent component) { - AbstractTogglePanel panel = (AbstractTogglePanel) component; + Map<String, Object> options = super.getScriptObjectOptions(context, component); - Map<String, Object> options = new HashMap<String, Object>(); - options.put("activeItem", panel.getActiveItem()); - options.put("cycledSwitching", panel.isCycledSwitching()); options.put("isKeepHeight", attributeAsString(component, "height").length() > 0); - addEventOption(context, panel, options, ITEM_CHANGE); - addEventOption(context, panel, options, BEFORE_ITEM_CHANGE); - return options; } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java 2011-02-16 17:15:09 UTC (rev 21708) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java 2011-02-16 17:32:02 UTC (rev 21709) @@ -22,10 +22,11 @@ package org.richfaces.renderkit.html; +import com.google.common.base.Predicate; import org.ajax4jsf.javascript.JSObject; import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractTab; -import org.richfaces.component.AbstractTogglePanelItemInterface; +import org.richfaces.component.*; +import org.richfaces.context.ExtendedPartialViewContext; import org.richfaces.renderkit.HtmlConstants; import javax.faces.application.ResourceDependencies; @@ -33,6 +34,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import javax.faces.event.ActionEvent; import java.io.IOException; import java.util.Map; @@ -55,6 +57,37 @@ public class TabRenderer extends TogglePanelItemRenderer { @Override + protected void doDecode(FacesContext context, UIComponent component) { + + Map<String, String> requestMap = + context.getExternalContext().getRequestParameterMap(); + + AbstractTab tab = (AbstractTab) component; + String compClientId = component.getClientId(context); + if (requestMap.get(compClientId) != null) { + AbstractTabPanel parentTabPanel = getParentTabPanel(tab); + + if (parentTabPanel.isImmediate()) { + tab.setImmediate(true); + } + new ActionEvent(tab).queue(); + + if (context.getPartialViewContext().isPartialRequest()) { + context.getPartialViewContext().getRenderIds().add(component.getClientId(context)); + addOnCompleteParam(context, tab.getName(), tab.getTabPanel().getClientId(context)); + } + } + } + + protected static void addOnCompleteParam(FacesContext context, String newValue, String panelId) { + StringBuilder onComplete = new StringBuilder(); + onComplete.append("RichFaces.$('").append(panelId) + .append("').onCompleteHandler('").append(newValue).append("');"); + + ExtendedPartialViewContext.getInstance(context).appendOncomplete(onComplete.toString()); + } + + @Override protected void doEncodeItemBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { @@ -129,5 +162,14 @@ protected Class<? extends UIComponent> getComponentClass() { return AbstractTab.class; } + + private static AbstractTabPanel getParentTabPanel(AbstractTab menuItem) { + return (AbstractTabPanel) ComponentIterators.getParent(menuItem, new Predicate<UIComponent>() { + public boolean apply(UIComponent component) { + return component instanceof AbstractTabPanel; + } + }); + } + } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2011-02-16 17:15:09 UTC (rev 21708) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2011-02-16 17:32:02 UTC (rev 21709) @@ -111,10 +111,10 @@ AbstractTogglePanel panel = (AbstractTogglePanel) component; writer.startElement(HtmlConstants.INPUT_ELEM, component); - writer.writeAttribute(HtmlConstants.TYPE_ATTR, HtmlConstants.INPUT_TYPE_HIDDEN, null); - writer.writeAttribute(HtmlConstants.VALUE_ATTRIBUTE, panel.getActiveItem(), "activeItem"); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, getValueRequestParamName(context, component), null); writer.writeAttribute(HtmlConstants.NAME_ATTRIBUTE, getValueRequestParamName(context, component), null); + writer.writeAttribute(HtmlConstants.TYPE_ATTR, HtmlConstants.INPUT_TYPE_HIDDEN, null); + writer.writeAttribute(HtmlConstants.VALUE_ATTRIBUTE, panel.getActiveItem(), null); writer.endElement(HtmlConstants.INPUT_ELEM); writeJavaScript(writer, context, component); Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.js 2011-02-16 17:15:09 UTC (rev 21708) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.js 2011-02-16 17:32:02 UTC (rev 21709) @@ -61,8 +61,15 @@ this.__setActiveItem(newPanel); - rf.submitForm(this.__getParentForm(newPanel)); + var params = {}; + params[newPanel.getTogglePanel().id] = newPanel.name; + params[newPanel.id] = newPanel.id; + + $.extend(params, newPanel.getTogglePanel().options["ajax"] || {}); + + rf.submitForm(this.__getParentForm(newPanel), params); + return false; },

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21708 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-02-16 12:15:09 -0500 (Wed, 16 Feb 2011) New Revision: 21708 Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarModel.java Log: added 2 new tests for calendar with custom data model Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarModel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarModel.java (rev 0) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarModel.java 2011-02-16 17:15:09 UTC (rev 21708) @@ -0,0 +1,95 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ +package org.richfaces.tests.metamer.ftest.richCalendar; + +import static org.jboss.test.selenium.utils.URLUtils.buildUrl; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + +import java.net.URL; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + + +import org.testng.annotations.Test; + +/** + * Test case for basic functionality of calendar on page faces/components/richCalendar/dataModel.xhtml. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +public class TestRichCalendarModel extends AbstractCalendarTest { + + @Override + public URL getTestUrl() { + return buildUrl(contextPath, "faces/components/richCalendar/dataModel.xhtml"); + } + + @Test + public void testClasses() { + selenium.click(input); + selenium.click(nextMonthButton); + + for (int i = 7; i < 28; i++) { + switch (i % 7) { + case 0: + case 6: + assertTrue(selenium.belongsClass(cellDay.format(i), "yellowDay"), "Weekends should be yellow (cell " + i + ")"); + break; + case 2: + assertTrue(selenium.belongsClass(cellDay.format(i), "aquaDay"), "Tuesdays should be blue (cell " + i + ")"); + break; + case 4: + assertTrue(selenium.belongsClass(cellDay.format(i), "aquaDay"), "Thursdays should be blue (cell " + i + ")"); + break; + default: + assertFalse(selenium.belongsClass(cellDay.format(i), "aquaDay"), "Mondays, Wednesdays and Fridays should not be styled (cell " + i + ")"); + assertFalse(selenium.belongsClass(cellDay.format(i), "yellowDay"), "Mondays, Wednesdays and Fridays should not be styled (cell " + i + ")"); + } + } + } + + @Test + @Override + public void testApplyButton() { + selenium.click(input); + selenium.click(nextMonthButton); + + selenium.click(cellDay.format(17)); + String day = selenium.getText(cellDay.format(17)); + String month = selenium.getText(monthLabel); + + String selectedDate = null; + try { + Date date = new SimpleDateFormat("d MMMM, yyyy hh:mm").parse(day + " " + month + " 12:00"); + selectedDate = new SimpleDateFormat("MMM d, yyyy hh:mm").format(date); + } catch (ParseException ex) { + fail(ex.getMessage()); + } + + selenium.click(cellDay.format(17)); + assertFalse(selenium.isDisplayed(popup), "Popup should not be displayed."); + } +}

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21707 - in modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer: model/tree and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2011-02-16 12:02:30 -0500 (Wed, 16 Feb 2011) New Revision: 21707 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/CompactDisc.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/Company.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/Country.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/NamedNode.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/LazyLoadingChecker.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/LazyLoadingListener.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/ModelNode.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/Node.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/RecursiveNode.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/Reference.java Log: made model of trees serializable to work on MyFaces Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java 2011-02-16 16:02:11 UTC (rev 21706) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java 2011-02-16 17:02:30 UTC (rev 21707) @@ -33,7 +33,6 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; import javax.faces.event.ComponentSystemEvent; -import javax.swing.tree.TreeNode; import org.richfaces.component.UITree; import org.richfaces.tests.metamer.Attributes; @@ -41,6 +40,7 @@ import org.richfaces.tests.metamer.model.tree.CompactDiscXmlDescriptor; import org.richfaces.tests.metamer.model.tree.Company; import org.richfaces.tests.metamer.model.tree.Country; +import org.richfaces.tests.metamer.model.tree.NamedNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,11 +52,12 @@ @ViewScoped public class RichTreeBean implements Serializable { - private static final long serialVersionUID = 4008175400649809L; + private static final long serialVersionUID = 1L; + private static Logger logger; private Attributes attributes; - private List<TreeNode> root = new ArrayList<TreeNode>(); - private Collection<Object> selection; + private List<NamedNode> root = new ArrayList<NamedNode>(); + private transient Collection<Object> selection; // FIXME: @ManagedProperty(value = "#{model}") // private Model model; @@ -67,7 +68,7 @@ private boolean testLoadingFacet = false; private boolean delayedRender = false; - private Map<TreeNode, Boolean> expanded = new HashMap<TreeNode, Boolean>(); + private Map<NamedNode, Boolean> expanded = new HashMap<NamedNode, Boolean>(); /** * Initializes the managed bean. @@ -143,7 +144,7 @@ return country; } - public List<TreeNode> getRoot() { + public List<NamedNode> getRoot() { return root; } @@ -182,18 +183,18 @@ } } - public Map<TreeNode, Boolean> getExpanded() { + public Map<NamedNode, Boolean> getExpanded() { return expanded; } public void expandAll() { - for (Entry<TreeNode, Boolean> entry : expanded.entrySet()) { + for (Entry<NamedNode, Boolean> entry : expanded.entrySet()) { entry.setValue(true); } } public void collapseAll() { - for (Entry<TreeNode, Boolean> entry : expanded.entrySet()) { + for (Entry<NamedNode, Boolean> entry : expanded.entrySet()) { entry.setValue(false); } } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java 2011-02-16 16:02:11 UTC (rev 21706) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java 2011-02-16 17:02:30 UTC (rev 21707) @@ -64,6 +64,8 @@ private Set<Node> lazyInitializedNodes = new LinkedHashSet<Node>(); private LazyLoadingListener<Node> nodeLazyLoadingListener = new LazyLoadingListener<Node>() { + private static final long serialVersionUID = 1L; + public void notify(Node node) { lazyInitializedNodes.add(node); }; @@ -98,6 +100,8 @@ if (rootNodes == null) { rootNodes = RecursiveNode.createChildren(null, leafChildrenNullable, new Reference<LazyLoadingListener<Node>>() { + private static final long serialVersionUID = 1L; + @Override public LazyLoadingListener<Node> get() { return nodeLazyLoadingListener; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/CompactDisc.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/CompactDisc.java 2011-02-16 16:02:11 UTC (rev 21706) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/CompactDisc.java 2011-02-16 17:02:30 UTC (rev 21707) @@ -1,11 +1,10 @@ package org.richfaces.tests.metamer.model.tree; -import java.io.Serializable; import java.util.Enumeration; import javax.swing.tree.TreeNode; -public class CompactDisc extends NamedNode implements TreeNode, Serializable { +public class CompactDisc extends NamedNode { private static final long serialVersionUID = 1L; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/Company.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/Company.java 2011-02-16 16:02:11 UTC (rev 21706) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/Company.java 2011-02-16 17:02:30 UTC (rev 21707) @@ -1,6 +1,5 @@ package org.richfaces.tests.metamer.model.tree; -import java.io.Serializable; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; @@ -9,7 +8,7 @@ import com.google.common.collect.Iterators; -public class Company extends NamedNode implements TreeNode, Serializable { +public class Company extends NamedNode { private static final long serialVersionUID = 1L; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/Country.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/Country.java 2011-02-16 16:02:11 UTC (rev 21706) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/Country.java 2011-02-16 17:02:30 UTC (rev 21707) @@ -1,6 +1,5 @@ package org.richfaces.tests.metamer.model.tree; -import java.io.Serializable; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; @@ -9,7 +8,7 @@ import com.google.common.collect.Iterators; -public class Country extends NamedNode implements TreeNode, Serializable { +public class Country extends NamedNode { private static final long serialVersionUID = 1L; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/NamedNode.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/NamedNode.java 2011-02-16 16:02:11 UTC (rev 21706) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/NamedNode.java 2011-02-16 17:02:30 UTC (rev 21707) @@ -1,6 +1,13 @@ package org.richfaces.tests.metamer.model.tree; -public class NamedNode { +import java.io.Serializable; + +import javax.swing.tree.TreeNode; + +public abstract class NamedNode implements TreeNode, Serializable { + + private static final long serialVersionUID = 1L; + private String type; public String getType() { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/LazyLoadingChecker.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/LazyLoadingChecker.java 2011-02-16 16:02:11 UTC (rev 21706) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/LazyLoadingChecker.java 2011-02-16 17:02:30 UTC (rev 21707) @@ -2,6 +2,7 @@ import static java.lang.reflect.Modifier.isStatic; +import java.io.Serializable; import java.lang.reflect.Method; import javassist.util.proxy.MethodHandler; @@ -10,8 +11,9 @@ import org.apache.commons.lang.Validate; -public final class LazyLoadingChecker<T> implements MethodHandler { - +public final class LazyLoadingChecker<T> implements MethodHandler, Serializable { + private static final long serialVersionUID = 1L; + T instance; Reference<LazyLoadingListener<T>> listenerReference = null; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/LazyLoadingListener.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/LazyLoadingListener.java 2011-02-16 16:02:11 UTC (rev 21706) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/LazyLoadingListener.java 2011-02-16 17:02:30 UTC (rev 21707) @@ -1,5 +1,7 @@ package org.richfaces.tests.metamer.model.treeAdaptor; -public interface LazyLoadingListener<T> { +import java.io.Serializable; + +public interface LazyLoadingListener<T> extends Serializable { void notify(T instance); } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/ModelNode.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/ModelNode.java 2011-02-16 16:02:11 UTC (rev 21706) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/ModelNode.java 2011-02-16 17:02:30 UTC (rev 21707) @@ -21,6 +21,7 @@ *******************************************************************************/ package org.richfaces.tests.metamer.model.treeAdaptor; +import java.io.Serializable; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -32,6 +33,7 @@ * @version $Revision$ */ public class ModelNode extends Node { + private static final long serialVersionUID = 1L; private static final int BS = 3; private static final int KS = 4; @@ -54,7 +56,7 @@ } public String getLabel() { - return isRoot() ? "M" : parent.getLabel() + "-M"; + return isRoot() ? "M" : getParent().getLabel() + "-M"; } public A getValue() { @@ -83,18 +85,22 @@ public List<RecursiveNode> getRecursive() { if (rs == null) { - rs = RecursiveNode.createChildren(this, nullable, null); + rs = RecursiveNode.createChildren(this, getNullable(), null); } return rs; } - public class A { + public class A implements Serializable { + private static final long serialVersionUID = 1L; + public String getLabel() { return ModelNode.this.getLabel() + "-A"; } } - public class B { + public class B implements Serializable { + private static final long serialVersionUID = 1L; + int number; public B(int number) { @@ -106,7 +112,9 @@ } } - public class K { + public class K implements Serializable { + private static final long serialVersionUID = 1L; + int number; public K(int number) { @@ -118,7 +126,9 @@ } } - public class V { + public class V implements Serializable { + private static final long serialVersionUID = 1L; + int number; public V(int number) { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/Node.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/Node.java 2011-02-16 16:02:11 UTC (rev 21706) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/Node.java 2011-02-16 17:02:30 UTC (rev 21707) @@ -21,6 +21,7 @@ *******************************************************************************/ package org.richfaces.tests.metamer.model.treeAdaptor; +import java.io.Serializable; import java.util.Deque; import java.util.LinkedList; import java.util.concurrent.atomic.AtomicReference; @@ -29,12 +30,14 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -public abstract class Node { - Node parent; - AtomicReference<Boolean> nullable; +public abstract class Node implements Serializable { + + private static final long serialVersionUID = 1L; + + private Node parent; + private AtomicReference<Boolean> nullable; + private Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference = new NodeReference(); - Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference = new NodeReference(); - protected Node(Node parent, AtomicReference<Boolean> nullable, Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) { this.parent = parent; @@ -55,6 +58,10 @@ public boolean isRoot() { return parent == null; } + + public AtomicReference<Boolean> getNullable() { + return nullable; + } public int getLevel() { return isRoot() ? 1 : parent.getLevel() + 1; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/RecursiveNode.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/RecursiveNode.java 2011-02-16 16:02:11 UTC (rev 21706) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/RecursiveNode.java 2011-02-16 17:02:30 UTC (rev 21707) @@ -21,6 +21,7 @@ *******************************************************************************/ package org.richfaces.tests.metamer.model.treeAdaptor; +import java.io.Serializable; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -35,6 +36,8 @@ * @version $Revision$ */ public class RecursiveNode extends Node { + private static final long serialVersionUID = 1L; + private static final int CHILDREN = 4; private static final int LEVELS = 2; private static final List<RecursiveNode> EMPTY_LIST = new LinkedList<RecursiveNode>(); @@ -73,7 +76,7 @@ return getEmptyList(); } if (children == null) { - children = createChildren(this, nullable, null); + children = createChildren(this, getNullable(), null); } return children; } @@ -86,23 +89,23 @@ } private List<RecursiveNode> getEmptyList() { - return nullable.get() ? null : EMPTY_LIST; + return getNullable().get() ? null : EMPTY_LIST; } private Map<Integer, RecursiveNode> getEmptyMap() { - return nullable.get() ? null : EMPTY_MAP; + return getNullable().get() ? null : EMPTY_MAP; } public String getLabel() { - String parentLabel = (isRoot() ? "" : parent.getLabel() + "-") + "R-"; - String recursionLabel = (isRecursionRoot() ? parentLabel : parent.getLabel() + ".") + number; + String parentLabel = (isRoot() ? "" : getParent().getLabel() + "-") + "R-"; + String recursionLabel = (isRecursionRoot() ? parentLabel : getParent().getLabel() + ".") + number; return recursionLabel; } public ModelNode getModel() { if (isLeaf() && !isPreceededByModel()) { if (model == null) { - model = ModelNode.getInstance(this, nullable, null); + model = ModelNode.getInstance(this, getNullable(), null); } return model; } @@ -117,7 +120,7 @@ if (isRoot()) { return true; } else { - return !(parent instanceof RecursiveNode); + return !(getParent() instanceof RecursiveNode); } } @@ -154,7 +157,9 @@ return getLabel(); } - public class NodeMap implements Map<Integer, RecursiveNode> { + public class NodeMap implements Map<Integer, RecursiveNode>, Serializable { + + private static final long serialVersionUID = 1L; @Override public int size() { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/Reference.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/Reference.java 2011-02-16 16:02:11 UTC (rev 21706) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/Reference.java 2011-02-16 17:02:30 UTC (rev 21707) @@ -1,6 +1,8 @@ package org.richfaces.tests.metamer.model.treeAdaptor; -public interface Reference<T> { +import java.io.Serializable; + +public interface Reference<T> extends Serializable { public T get(); }

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21706 - modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-02-16 11:02:11 -0500 (Wed, 16 Feb 2011) New Revision: 21706 Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml Log: added spinner sample Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml (rev 0) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml 2011-02-16 16:02:11 UTC (rev 21706) @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!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:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich" + xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html"> + +  + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="head"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + <script type="text/javascript"> + testedComponentId = "#{rich:clientId('spinner')}"; + </script> + </ui:define> + + <ui:define name="outOfTemplateBefore"> + </ui:define> + + <ui:define name="component"> + <rich:inputNumberSpinner id="spinner" + accesskey="#{richInputNumberSpinnerBean.attributes['accesskey'].value}" + cycled="#{richInputNumberSpinnerBean.attributes['cycled'].value}" + disabled="#{richInputNumberSpinnerBean.attributes['disabled'].value}" + enableManualInput="#{richInputNumberSpinnerBean.attributes['enableManualInput'].value}" + immediate="#{richInputNumberSpinnerBean.attributes['immediate'].value}" + inputClass="#{richInputNumberSpinnerBean.attributes['inputClass'].value}" + inputSize="#{richInputNumberSpinnerBean.attributes['inputSize'].value}" + maxValue="#{richInputNumberSpinnerBean.attributes['maxValue'].value}" + minValue="#{richInputNumberSpinnerBean.attributes['minValue'].value}" + onblur="#{richInputNumberSpinnerBean.attributes['onblur'].value}" + onchange="#{richInputNumberSpinnerBean.attributes['onchange'].value}" + onclick="#{richInputNumberSpinnerBean.attributes['onclick'].value}" + ondblclick="#{richInputNumberSpinnerBean.attributes['ondblclick'].value}" + ondownclick="#{richInputNumberSpinnerBean.attributes['ondownclick'].value}" + onfocus="#{richInputNumberSpinnerBean.attributes['onfocus'].value}" + oninputclick="#{richInputNumberSpinnerBean.attributes['oninputclick'].value}" + oninputdblclick="#{richInputNumberSpinnerBean.attributes['oninputdblclick'].value}" + oninputkeydown="#{richInputNumberSpinnerBean.attributes['oninputkeydown'].value}" + oninputkeypress="#{richInputNumberSpinnerBean.attributes['oninputkeypress'].value}" + oninputkeyup="#{richInputNumberSpinnerBean.attributes['oninputkeyup'].value}" + oninputmousedown="#{richInputNumberSpinnerBean.attributes['oninputmousedown'].value}" + oninputmousemove="#{richInputNumberSpinnerBean.attributes['oninputmousemove'].value}" + oninputmouseout="#{richInputNumberSpinnerBean.attributes['oninputmouseout'].value}" + oninputmouseover="#{richInputNumberSpinnerBean.attributes['oninputmouseover'].value}" + oninputmouseup="#{richInputNumberSpinnerBean.attributes['oninputmouseup'].value}" + onmousedown="#{richInputNumberSpinnerBean.attributes['onmousedown'].value}" + onmousemove="#{richInputNumberSpinnerBean.attributes['onmousemove'].value}" + onmouseout="#{richInputNumberSpinnerBean.attributes['onmouseout'].value}" + onmouseover="#{richInputNumberSpinnerBean.attributes['onmouseover'].value}" + onmouseup="#{richInputNumberSpinnerBean.attributes['onmouseup'].value}" + onselect="#{richInputNumberSpinnerBean.attributes['onselect'].value}" + onupclick="#{richInputNumberSpinnerBean.attributes['onupclick'].value}" + rendered="#{richInputNumberSpinnerBean.attributes['rendered'].value}" + step="#{richInputNumberSpinnerBean.attributes['step'].value}" + style="#{richInputNumberSpinnerBean.attributes['style'].value}" + styleClass="#{richInputNumberSpinnerBean.attributes['styleClass'].value}" + tabindex="#{richInputNumberSpinnerBean.attributes['tabindex'].value}" + value="#{richInputNumberSpinnerBean.attributes['value'].value}" + valueChangeListener="#{richBean.valueChangeListener}" + > + + <f:ajax render="output :phasesPanel" /> + + </rich:inputNumberSpinner> + + + + output: <h:outputText id="output" value="#{richInputNumberSpinnerBean.attributes['value'].value}"/> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <metamer:attributes value="#{richInputNumberSpinnerBean.attributes}" id="attributes" /> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21705 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-02-16 11:00:01 -0500 (Wed, 16 Feb 2011) New Revision: 21705 Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/AbstractSpinnerTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinnerFAjax.java Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java Log: added sample and tests for spinner+f:ajax Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/list.xhtml 2011-02-16 15:59:12 UTC (rev 21704) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/list.xhtml 2011-02-16 16:00:01 UTC (rev 21705) @@ -32,9 +32,13 @@ <ui:define name="links"> <metamer:testPageLink id="simple" outcome="simple" value="Simple"> - Page containing rich:inputNumberSpinner and input boxes for all its attributes. + Page containing rich:inputNumberSpinner with a4j:ajax and input boxes for all its attributes. </metamer:testPageLink> + <metamer:testPageLink id="fAjax" outcome="fAjax" value="f:ajax"> + Page containing rich:inputNumberSpinner with f:ajax and input boxes for all its attributes. + </metamer:testPageLink> + </ui:define> </ui:composition> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml 2011-02-16 15:59:12 UTC (rev 21704) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml 2011-02-16 16:00:01 UTC (rev 21705) @@ -85,7 +85,7 @@ valueChangeListener="#{richBean.valueChangeListener}" > - <a4j:ajax render="output" action="#{richBean.dummyAction}" actionListener="#{richBean.dummyActionListener}" /> + <a4j:ajax render="output" /> </rich:inputNumberSpinner> Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/AbstractSpinnerTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/AbstractSpinnerTest.java (rev 0) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/AbstractSpinnerTest.java 2011-02-16 16:00:01 UTC (rev 21705) @@ -0,0 +1,151 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ +package org.richfaces.tests.metamer.ftest.richInputNumberSpinner; + +import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; +import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; +import static org.testng.Assert.assertEquals; + + + +import org.jboss.test.selenium.encapsulated.JavaScript; +import org.jboss.test.selenium.locator.ElementLocator; +import org.jboss.test.selenium.locator.JQueryLocator; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; +import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.Use; +import org.testng.annotations.Test; + +/** + * Abstract test case for rich:inputNumberSpinner. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +public abstract class AbstractSpinnerTest extends AbstractMetamerTest { + + protected JQueryLocator spinner = pjq("span[id$=spinner]"); + protected JQueryLocator input = pjq("span[id$=spinner] input.rf-insp-inp"); + protected JQueryLocator up = pjq("span[id$=spinner] span.rf-insp-inc"); + protected JQueryLocator down = pjq("span[id$=spinner] span.rf-insp-dec"); + protected JQueryLocator output = pjq("span[id$=output]"); + protected String[] correctNumbers = {"-10", "-5", "-1", "0", "1", "5", "10"}; + protected String[] smallNumbers = {"-11", "-15", "-100"}; + protected String[] bigNumbers = {"11", "15", "100"}; + protected String[] decimalNumbers = {"1.4999", "5.6", "7.0001", "-5.50001", "-9.9", "1.222e0", "0e0", "-5.50001e0"}; + @Inject + @Use(empty = true) + protected String number; + + public void testTypeIntoInputCorrect() { + String reqTime = selenium.getText(time); + guardXhr(selenium).type(input, number); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + + assertEquals(selenium.getText(output), number, "Output was not updated."); + } + + public void testTypeIntoInputSmall() { + String reqTime = selenium.getText(time); + guardXhr(selenium).type(input, number); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + + assertEquals(selenium.getText(output), "-10", "Output was not updated."); + assertEquals(getInputValue(), "-10", "Input was not updated."); + } + + public void testTypeIntoInputBig() { + String reqTime = selenium.getText(time); + guardXhr(selenium).type(input, number); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + + assertEquals(selenium.getText(output), "10", "Output was not updated."); + assertEquals(getInputValue(), "10", "Input was not updated."); + } + + public void testTypeIntoInputDecimal() { + String reqTime = selenium.getText(time); + guardXhr(selenium).type(input, number); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + + Double newNumber = new Double(number); + + assertEquals(selenium.getText(output), newNumber == 0 ? "0" : newNumber.toString(), "Output was not updated."); + assertEquals(selenium.getValue(input), newNumber == 0 ? "0" : newNumber.toString(), "Input was not updated."); + } + + public void testTypeIntoInputNotNumber() { + guardNoRequest(selenium).type(input, "aaa"); + assertEquals(selenium.getText(output), "2", "Output should not be updated."); + assertEquals(getInputValue(), "2", "Input should not be updated."); + } + + public void testClickUp() { + clickArrow(up, 4); + assertEquals(selenium.getText(output), "6", "Output was not updated."); + + clickArrow(up, 4); + assertEquals(selenium.getText(output), "10", "Output was not updated."); + + selenium.mouseDown(up); + guardNoRequest(selenium).mouseUp(up); + + assertEquals(selenium.getText(output), "10", "Output was not updated."); + } + + public void testClickDown() { + clickArrow(down, 4); + assertEquals(selenium.getText(output), "-2", "Output was not updated."); + + clickArrow(down, 8); + assertEquals(selenium.getText(output), "-10", "Output was not updated."); + + selenium.mouseDown(down); + guardNoRequest(selenium).mouseUp(down); + + assertEquals(selenium.getText(output), "-10", "Output was not updated."); + } + + /** + * Getter for value that is displayed in spinner input. + * @return spinner input value + */ + protected String getInputValue() { + return selenium.getValue(input); + } + + /** + * Clicks on spinner's arrow. + * @param arrow spinner's up or down arrow locator + * @param clicks how many times should it be clicked + */ + protected void clickArrow(ElementLocator<?> arrow, int clicks) { + String reqTime = null; + + for (int i = 0; i < clicks; i++) { + reqTime = selenium.getText(time); + guardXhr(selenium).runScript(new JavaScript("jQuery(\"" + arrow.getRawLocator() + "\").mousedown().mouseup()")); + + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + } + } +} Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java 2011-02-16 15:59:12 UTC (rev 21704) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java 2011-02-16 16:00:01 UTC (rev 21705) @@ -21,7 +21,6 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.richInputNumberSpinner; -import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; @@ -36,10 +35,7 @@ import org.jboss.test.selenium.encapsulated.JavaScript; import org.jboss.test.selenium.locator.Attribute; import org.jboss.test.selenium.locator.AttributeLocator; -import org.jboss.test.selenium.locator.ElementLocator; import org.jboss.test.selenium.locator.JQueryLocator; -import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; -import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.testng.annotations.Test; @@ -50,21 +46,8 @@ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ -public class TestRichSpinner extends AbstractMetamerTest { +public class TestRichSpinner extends AbstractSpinnerTest { - private JQueryLocator spinner = pjq("span[id$=spinner]"); - private JQueryLocator input = pjq("span[id$=spinner] input.rf-insp-inp"); - private JQueryLocator up = pjq("span[id$=spinner] span.rf-insp-inc"); - private JQueryLocator down = pjq("span[id$=spinner] span.rf-insp-dec"); - private JQueryLocator output = pjq("span[id$=output]"); - private String[] correctNumbers = {"-10", "-5", "-1", "0", "1", "5", "10"}; - private String[] smallNumbers = {"-11", "-15", "-100"}; - private String[] bigNumbers = {"11", "15", "100"}; - private String[] decimalNumbers = {"1.4999", "5.6", "7.0001", "-5.50001", "-9.9", "1.222e0", "0e0", "-5.50001e0"}; - @Inject - @Use(empty = true) - private String number; - @Override public URL getTestUrl() { return buildUrl(contextPath, "faces/components/richInputNumberSpinner/simple.xhtml"); @@ -81,82 +64,48 @@ @Test @Use(field = "number", value = "correctNumbers") + @Override public void testTypeIntoInputCorrect() { - String reqTime = selenium.getText(time); - guardXhr(selenium).type(input, number); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output), number, "Output was not updated."); + super.testTypeIntoInputCorrect(); } @Test @Use(field = "number", value = "smallNumbers") + @Override public void testTypeIntoInputSmall() { - String reqTime = selenium.getText(time); - guardXhr(selenium).type(input, number); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output), "-10", "Output was not updated."); - assertEquals(getInputValue(), "-10", "Input was not updated."); + super.testTypeIntoInputSmall(); } @Test @Use(field = "number", value = "bigNumbers") + @Override public void testTypeIntoInputBig() { - String reqTime = selenium.getText(time); - guardXhr(selenium).type(input, number); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output), "10", "Output was not updated."); - assertEquals(getInputValue(), "10", "Input was not updated."); + super.testTypeIntoInputBig(); } @Test @Use(field = "number", value = "decimalNumbers") + @Override public void testTypeIntoInputDecimal() { - String reqTime = selenium.getText(time); - guardXhr(selenium).type(input, number); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - Double newNumber = new Double(number); - - assertEquals(selenium.getText(output), newNumber == 0 ? "0" : newNumber.toString(), "Output was not updated."); - assertEquals(selenium.getValue(input), newNumber == 0 ? "0" : newNumber.toString(), "Input was not updated."); + super.testTypeIntoInputDecimal(); } @Test + @Override public void testTypeIntoInputNotNumber() { - guardNoRequest(selenium).type(input, "aaa"); - assertEquals(selenium.getText(output), "2", "Output should not be updated."); - assertEquals(getInputValue(), "2", "Input should not be updated."); + super.testTypeIntoInputNotNumber(); } @Test + @Override public void testClickUp() { - clickArrow(up, 4); - assertEquals(selenium.getText(output), "6", "Output was not updated."); - - clickArrow(up, 4); - assertEquals(selenium.getText(output), "10", "Output was not updated."); - - selenium.mouseDown(up); - guardNoRequest(selenium).mouseUp(up); - - assertEquals(selenium.getText(output), "10", "Output was not updated."); + super.testClickUp(); } @Test + @Override public void testClickDown() { - clickArrow(down, 4); - assertEquals(selenium.getText(output), "-2", "Output was not updated."); - - clickArrow(down, 8); - assertEquals(selenium.getText(output), "-10", "Output was not updated."); - - selenium.mouseDown(down); - guardNoRequest(selenium).mouseUp(down); - - assertEquals(selenium.getText(output), "-10", "Output was not updated."); + super.testClickDown(); } @Test @@ -539,28 +488,4 @@ assertEquals(selenium.getText(output), number, "Output was not updated."); assertEquals(getInputValue(), "10", "Input was not updated."); } - - /** - * Getter for value that is displayed in spinner input. - * @return spinner input value - */ - private String getInputValue() { - return selenium.getValue(input); - } - - /** - * Clicks on spinner's arrow. - * @param arrow spinner's up or down arrow locator - * @param clicks how many times should it be clicked - */ - private void clickArrow(ElementLocator<?> arrow, int clicks) { - String reqTime = null; - - for (int i = 0; i < clicks; i++) { - reqTime = selenium.getText(time); - guardXhr(selenium).runScript(new JavaScript("jQuery(\"" + arrow.getRawLocator() + "\").mousedown().mouseup()")); - - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - } - } } Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinnerFAjax.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinnerFAjax.java (rev 0) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinnerFAjax.java 2011-02-16 16:00:01 UTC (rev 21705) @@ -0,0 +1,92 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ +package org.richfaces.tests.metamer.ftest.richInputNumberSpinner; + +import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; +import static org.jboss.test.selenium.utils.URLUtils.buildUrl; + +import java.net.URL; + +import org.jboss.test.selenium.encapsulated.JavaScript; +import org.jboss.test.selenium.locator.ElementLocator; +import org.richfaces.tests.metamer.ftest.annotations.Use; +import org.testng.annotations.Test; + +/** + * Test case for page /faces/components/richInputNumberSpinner/fAjax.xhtml + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +public class TestRichSpinnerFAjax extends AbstractSpinnerTest { + + @Override + public URL getTestUrl() { + return buildUrl(contextPath, "faces/components/richInputNumberSpinner/fAjax.xhtml"); + } + + @Test + @Use(field = "number", value = "correctNumbers") + @Override + public void testTypeIntoInputCorrect() { + super.testTypeIntoInputCorrect(); + } + + @Test + @Use(field = "number", value = "smallNumbers") + @Override + public void testTypeIntoInputSmall() { + super.testTypeIntoInputSmall(); + } + + @Test + @Use(field = "number", value = "bigNumbers") + @Override + public void testTypeIntoInputBig() { + super.testTypeIntoInputBig(); + } + + @Test + @Use(field = "number", value = "decimalNumbers") + @Override + public void testTypeIntoInputDecimal() { + super.testTypeIntoInputDecimal(); + } + + @Test + @Override + public void testTypeIntoInputNotNumber() { + super.testTypeIntoInputNotNumber(); + } + + @Test + @Override + public void testClickUp() { + super.testClickUp(); + } + + @Test + @Override + public void testClickDown() { + super.testClickDown(); + } +}

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21704 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-02-16 10:59:12 -0500 (Wed, 16 Feb 2011) New Revision: 21704 Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/AbstractSliderTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderFAjax.java Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/list.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java Log: added sample and tests for slide+f:ajax Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml (rev 0) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml 2011-02-16 15:59:12 UTC (rev 21704) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!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:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich" + xmlns:h="http://java.sun.com/jsf/html"> + +  + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="head"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + + <ui:define name="outOfTemplateBefore"> + </ui:define> + + <ui:define name="component"> + <rich:inputNumberSlider id="slider" + accesskey="#{richInputNumberSliderBean.attributes['accesskey'].value}" + decreaseClass="#{richInputNumberSliderBean.attributes['decreaseClass'].value}" + decreaseSelectedClass="#{richInputNumberSliderBean.attributes['decreaseSelectedClass'].value}" + delay="#{richInputNumberSliderBean.attributes['delay'].value}" + disabled="#{richInputNumberSliderBean.attributes['disabled'].value}" + enableManualInput="#{richInputNumberSliderBean.attributes['enableManualInput'].value}" + handleClass="#{richInputNumberSliderBean.attributes['handleClass'].value}" + handleSelectedClass="#{richInputNumberSliderBean.attributes['handleSelectedClass'].value}" + immediate="#{richInputNumberSliderBean.attributes['immediate'].value}" + increaseClass="#{richInputNumberSliderBean.attributes['increaseClass'].value}" + increaseSelectedClass="#{richInputNumberSliderBean.attributes['increaseSelectedClass'].value}" + inputClass="#{richInputNumberSliderBean.attributes['inputClass'].value}" + inputPosition="#{richInputNumberSliderBean.attributes['inputPosition'].value}" + inputSize="#{richInputNumberSliderBean.attributes['inputSize'].value}" + maxValue="#{richInputNumberSliderBean.attributes['maxValue'].value}" + maxlength="#{richInputNumberSliderBean.attributes['maxlength'].value}" + minValue="#{richInputNumberSliderBean.attributes['minValue'].value}" + onchange="#{richInputNumberSliderBean.attributes['onchange'].value}" + rendered="#{richInputNumberSliderBean.attributes['rendered'].value}" + showArrows="#{richInputNumberSliderBean.attributes['showArrows'].value}" + showBoundaryValues="#{richInputNumberSliderBean.attributes['showBoundaryValues'].value}" + showInput="#{richInputNumberSliderBean.attributes['showInput'].value}" + showTooltip="#{richInputNumberSliderBean.attributes['showTooltip'].value}" + step="#{richInputNumberSliderBean.attributes['step'].value}" + style="#{richInputNumberSliderBean.attributes['style'].value}" + styleClass="#{richInputNumberSliderBean.attributes['styleClass'].value}" + tabindex="#{richInputNumberSliderBean.attributes['tabindex'].value}" + tooltipClass="#{richInputNumberSliderBean.attributes['tooltipClass'].value}" + trackClass="#{richInputNumberSliderBean.attributes['trackClass'].value}" + value="#{richInputNumberSliderBean.attributes['value'].value}" + valueChangeListener="#{richBean.valueChangeListener}" + > + + <f:ajax event="change" render="output :phasesPanel"/> + + </rich:inputNumberSlider> + + + + output: <h:outputText id="output" value="#{richInputNumberSliderBean.attributes['value'].value}"/> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <metamer:attributes value="#{richInputNumberSliderBean.attributes}" id="attributes" /> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/list.xhtml 2011-02-16 15:58:24 UTC (rev 21703) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/list.xhtml 2011-02-16 15:59:12 UTC (rev 21704) @@ -32,9 +32,13 @@ <ui:define name="links"> <metamer:testPageLink id="simple" outcome="simple" value="Simple"> - Page containing rich:inputNumberSlider and input boxes for all its attributes. + Page containing rich:inputNumberSlider with a4j:ajax and input boxes for all its attributes. </metamer:testPageLink> + <metamer:testPageLink id="fAjax" outcome="fAjax" value="f:ajax"> + Page containing rich:inputNumberSlider with f:ajax and input boxes for all its attributes. + </metamer:testPageLink> + </ui:define> </ui:composition> Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/AbstractSliderTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/AbstractSliderTest.java (rev 0) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/AbstractSliderTest.java 2011-02-16 15:59:12 UTC (rev 21704) @@ -0,0 +1,170 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ +package org.richfaces.tests.metamer.ftest.richInputNumberSlider; + +import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; +import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; +import static org.jboss.test.selenium.utils.URLUtils.buildUrl; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.net.URL; + +import org.jboss.test.selenium.css.CssProperty; +import org.jboss.test.selenium.encapsulated.JavaScript; +import org.jboss.test.selenium.geometry.Point; +import org.jboss.test.selenium.locator.JQueryLocator; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; +import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.Use; +import org.testng.annotations.Test; + +/** + * Abstract test case for rich:inputNumberSlider. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +public abstract class AbstractSliderTest extends AbstractMetamerTest { + + protected JQueryLocator slider = pjq("span[id$=slider]"); + protected JQueryLocator input = pjq("input.rf-insl-inp"); + protected JQueryLocator left = pjq("span.rf-insl-dec"); + protected JQueryLocator right = pjq("span.rf-insl-inc"); + protected JQueryLocator minBoundary = pjq("span.rf-insl-mn"); + protected JQueryLocator maxBoundary = pjq("span.rf-insl-mx"); + protected JQueryLocator track = pjq("span.rf-insl-trc"); + protected JQueryLocator handle = pjq("span.rf-insl-hnd"); + protected JQueryLocator tooltip = pjq("span.rf-insl-tt"); + protected JQueryLocator output = pjq("span[id$=output]"); + protected String[] correctNumbers = {"-10", "-5", "-1", "0", "1", "5", "10"}; + protected String[] smallNumbers = {"-11", "-15", "-100"}; + protected String[] bigNumbers = {"11", "15", "100"}; + protected String[] decimalNumbers = {"1.4999", "5.6", "7.0001", "-5.50001", "-9.9", "1.222e0", "0e0", "-5.50001e0"}; + @Inject + @Use(empty = true) + protected String number; + @Inject + @Use(empty = true) + protected Integer delay; + protected JavaScript clickLeft = new JavaScript("jQuery(\"" + left.getRawLocator() + "\").mousedown().mouseup()"); + protected JavaScript clickRight = new JavaScript("jQuery(\"" + right.getRawLocator() + "\").mousedown().mouseup()"); + + @Override + public URL getTestUrl() { + return buildUrl(contextPath, "faces/components/richInputNumberSlider/simple.xhtml"); + } + + public void testTypeIntoInputCorrect() { + String reqTime = selenium.getText(time); + guardXhr(selenium).type(input, number); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + + assertEquals(selenium.getText(output), number, "Output was not updated."); + } + + public void testTypeIntoInputSmall() { + String reqTime = selenium.getText(time); + guardXhr(selenium).type(input, number); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + + assertEquals(selenium.getText(output), "-10", "Output was not updated."); + assertEquals(selenium.getValue(input), "-10", "Input was not updated."); + } + + public void testTypeIntoInputBig() { + String reqTime = selenium.getText(time); + guardXhr(selenium).type(input, number); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + + assertEquals(selenium.getText(output), "10", "Output was not updated."); + assertEquals(selenium.getValue(input), "10", "Input was not updated."); + } + + public void testTypeIntoInputDecimal() { + String reqTime = selenium.getText(time); + guardXhr(selenium).type(input, number); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + + Double newNumber = new Double(number); + + assertEquals(selenium.getText(output), newNumber == 0 ? "0" : newNumber.toString(), "Output was not updated."); + assertEquals(selenium.getValue(input), newNumber == 0 ? "0" : newNumber.toString(), "Input was not updated."); + } + + public void testTypeIntoInputNotNumber() { + guardNoRequest(selenium).type(input, "aaa"); + assertEquals(selenium.getText(output), "2", "Output should not be updated."); + assertEquals(selenium.getValue(input), "2", "Input should not be updated."); + } + + public void testClickLeft() { + selenium.type(pjq("input[type=text][id$=delayInput]"), "500"); + selenium.waitForPageToLoad(); + selenium.click(pjq("input[type=radio][name$=showArrowsInput][value=true]")); + selenium.waitForPageToLoad(); + + selenium.runScript(clickLeft); + selenium.runScript(clickLeft); + selenium.runScript(clickLeft); + selenium.runScript(clickLeft); + waitGui.failWith("Output was not updated.").until(textEquals.locator(output).text("-2")); + } + + public void testClickRight() { + selenium.type(pjq("input[type=text][id$=delayInput]"), "500"); + selenium.waitForPageToLoad(); + selenium.click(pjq("input[type=radio][name$=showArrowsInput][value=true]")); + selenium.waitForPageToLoad(); + + selenium.runScript(clickRight); + selenium.runScript(clickRight); + selenium.runScript(clickRight); + selenium.runScript(clickRight); + waitGui.failWith("Output was not updated.").until(textEquals.locator(output).text("6")); + } + + public void testClick() { + String reqTime = selenium.getText(time); + guardXhr(selenium).mouseDownAt(track, new Point(0, 0)); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + assertEquals(selenium.getText(output), "-10", "Output was not updated."); + String margin = selenium.getStyle(handle, CssProperty.MARGIN_LEFT).replace("px", "").trim(); + assertEquals(Double.parseDouble(margin), 0d, "Left margin of handle."); + + reqTime = selenium.getText(time); + guardXhr(selenium).mouseDownAt(track, new Point(30, 0)); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + assertEquals(selenium.getText(output), "-7", "Output was not updated."); + margin = selenium.getStyle(handle, CssProperty.MARGIN_LEFT).replace("px", "").trim(); + double marginD = Double.parseDouble(margin); + assertTrue(marginD > 25 && marginD < 30, "Left margin of handle should be between 25 and 30."); + + reqTime = selenium.getText(time); + guardXhr(selenium).mouseDownAt(track, new Point(195, 0)); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + assertEquals(selenium.getText(output), "10", "Output was not updated."); + margin = selenium.getStyle(handle, CssProperty.MARGIN_LEFT).replace("px", "").trim(); + marginD = Double.parseDouble(margin); + assertTrue(marginD > 190 && marginD < 200, "Left margin of handle should be between 190 and 200."); + } +} Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java 2011-02-16 15:58:24 UTC (rev 21703) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java 2011-02-16 15:59:12 UTC (rev 21704) @@ -22,7 +22,6 @@ package org.richfaces.tests.metamer.ftest.richInputNumberSlider; import java.text.ParseException; -import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; @@ -48,8 +47,6 @@ import org.jboss.test.selenium.locator.AttributeLocator; import org.jboss.test.selenium.locator.ElementLocator; import org.jboss.test.selenium.locator.JQueryLocator; -import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; -import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.testng.annotations.Test; @@ -60,153 +57,76 @@ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ -public class TestRichSlider extends AbstractMetamerTest { +public class TestRichSlider extends AbstractSliderTest { - private JQueryLocator slider = pjq("span[id$=slider]"); - private JQueryLocator input = pjq("input.rf-insl-inp"); - private JQueryLocator left = pjq("span.rf-insl-dec"); - private JQueryLocator right = pjq("span.rf-insl-inc"); - private JQueryLocator minBoundary = pjq("span.rf-insl-mn"); - private JQueryLocator maxBoundary = pjq("span.rf-insl-mx"); - private JQueryLocator track = pjq("span.rf-insl-trc"); - private JQueryLocator handle = pjq("span.rf-insl-hnd"); - private JQueryLocator tooltip = pjq("span.rf-insl-tt"); - private JQueryLocator output = pjq("span[id$=output]"); - private String[] correctNumbers = {"-10", "-5", "-1", "0", "1", "5", "10"}; - private String[] smallNumbers = {"-11", "-15", "-100"}; - private String[] bigNumbers = {"11", "15", "100"}; - private String[] decimalNumbers = {"1.4999", "5.6", "7.0001", "-5.50001", "-9.9", "1.222e0", "0e0", "-5.50001e0"}; - @Inject - @Use(empty = true) - private String number; - @Inject - @Use(empty = true) - private Integer delay; - private JavaScript clickLeft = new JavaScript("jQuery(\"" + left.getRawLocator() + "\").mousedown().mouseup()"); - private JavaScript clickRight = new JavaScript("jQuery(\"" + right.getRawLocator() + "\").mousedown().mouseup()"); - @Override public URL getTestUrl() { return buildUrl(contextPath, "faces/components/richInputNumberSlider/simple.xhtml"); } @Test - public void testInit() { - assertTrue(selenium.isDisplayed(slider), "Slider is not present on the page."); - assertTrue(selenium.isDisplayed(input), "Slider's input is not present on the page."); - assertFalse(selenium.isElementPresent(left), "Slider's left arrow should not be present on the page."); - assertFalse(selenium.isElementPresent(right), "Slider's right arrow should not be present on the page."); - assertTrue(selenium.isDisplayed(minBoundary), "Slider's min value is not present on the page."); - assertTrue(selenium.isDisplayed(maxBoundary), "Slider's max value is not present on the page."); - assertTrue(selenium.isDisplayed(track), "Slider's track is not present on the page."); - assertTrue(selenium.isDisplayed(handle), "Slider's handle is not present on the page."); - assertFalse(selenium.isElementPresent(tooltip), "Slider's tooltip should not be present on the page."); - } - - @Test @Use(field = "number", value = "correctNumbers") + @Override public void testTypeIntoInputCorrect() { - String reqTime = selenium.getText(time); - guardXhr(selenium).type(input, number); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output), number, "Output was not updated."); + super.testTypeIntoInputCorrect(); } @Test @Use(field = "number", value = "smallNumbers") + @Override public void testTypeIntoInputSmall() { - String reqTime = selenium.getText(time); - guardXhr(selenium).type(input, number); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output), "-10", "Output was not updated."); - assertEquals(selenium.getValue(input), "-10", "Input was not updated."); + super.testTypeIntoInputSmall(); } @Test @Use(field = "number", value = "bigNumbers") + @Override public void testTypeIntoInputBig() { - String reqTime = selenium.getText(time); - guardXhr(selenium).type(input, number); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output), "10", "Output was not updated."); - assertEquals(selenium.getValue(input), "10", "Input was not updated."); + super.testTypeIntoInputBig(); } @Test @Use(field = "number", value = "decimalNumbers") + @Override public void testTypeIntoInputDecimal() { - String reqTime = selenium.getText(time); - guardXhr(selenium).type(input, number); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - Double newNumber = new Double(number); - - assertEquals(selenium.getText(output), newNumber == 0 ? "0" : newNumber.toString(), "Output was not updated."); - assertEquals(selenium.getValue(input), newNumber == 0 ? "0" : newNumber.toString(), "Input was not updated."); + super.testTypeIntoInputDecimal(); } @Test + @Override public void testTypeIntoInputNotNumber() { - guardNoRequest(selenium).type(input, "aaa"); - assertEquals(selenium.getText(output), "2", "Output should not be updated."); - assertEquals(selenium.getValue(input), "2", "Input should not be updated."); + super.testTypeIntoInputNotNumber(); } @Test + @Override public void testClickLeft() { - selenium.type(pjq("input[type=text][id$=delayInput]"), "500"); - selenium.waitForPageToLoad(); - selenium.click(pjq("input[type=radio][name$=showArrowsInput][value=true]")); - selenium.waitForPageToLoad(); - - selenium.runScript(clickLeft); - selenium.runScript(clickLeft); - selenium.runScript(clickLeft); - selenium.runScript(clickLeft); - waitGui.failWith("Output was not updated.").until(textEquals.locator(output).text("-2")); + super.testClickLeft(); } @Test + @Override public void testClickRight() { - selenium.type(pjq("input[type=text][id$=delayInput]"), "500"); - selenium.waitForPageToLoad(); - selenium.click(pjq("input[type=radio][name$=showArrowsInput][value=true]")); - selenium.waitForPageToLoad(); - - selenium.runScript(clickRight); - selenium.runScript(clickRight); - selenium.runScript(clickRight); - selenium.runScript(clickRight); - waitGui.failWith("Output was not updated.").until(textEquals.locator(output).text("6")); + super.testClickRight(); } @Test + @Override public void testClick() { - String reqTime = selenium.getText(time); - guardXhr(selenium).mouseDownAt(track, new Point(0, 0)); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - assertEquals(selenium.getText(output), "-10", "Output was not updated."); - String margin = selenium.getStyle(handle, CssProperty.MARGIN_LEFT).replace("px", "").trim(); - assertEquals(Double.parseDouble(margin), 0d, "Left margin of handle."); + super.testClick(); + } - reqTime = selenium.getText(time); - guardXhr(selenium).mouseDownAt(track, new Point(30, 0)); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - assertEquals(selenium.getText(output), "-7", "Output was not updated."); - margin = selenium.getStyle(handle, CssProperty.MARGIN_LEFT).replace("px", "").trim(); - double marginD = Double.parseDouble(margin); - assertTrue(marginD > 25 && marginD < 30, "Left margin of handle should be between 25 and 30."); - - reqTime = selenium.getText(time); - guardXhr(selenium).mouseDownAt(track, new Point(195, 0)); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - assertEquals(selenium.getText(output), "10", "Output was not updated."); - margin = selenium.getStyle(handle, CssProperty.MARGIN_LEFT).replace("px", "").trim(); - marginD = Double.parseDouble(margin); - assertTrue(marginD > 190 && marginD < 200, "Left margin of handle should be between 190 and 200."); + @Test + public void testInit() { + assertTrue(selenium.isDisplayed(slider), "Slider is not present on the page."); + assertTrue(selenium.isDisplayed(input), "Slider's input is not present on the page."); + assertFalse(selenium.isElementPresent(left), "Slider's left arrow should not be present on the page."); + assertFalse(selenium.isElementPresent(right), "Slider's right arrow should not be present on the page."); + assertTrue(selenium.isDisplayed(minBoundary), "Slider's min value is not present on the page."); + assertTrue(selenium.isDisplayed(maxBoundary), "Slider's max value is not present on the page."); + assertTrue(selenium.isDisplayed(track), "Slider's track is not present on the page."); + assertTrue(selenium.isDisplayed(handle), "Slider's handle is not present on the page."); + assertFalse(selenium.isElementPresent(tooltip), "Slider's tooltip should not be present on the page."); } @Test Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderFAjax.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderFAjax.java (rev 0) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderFAjax.java 2011-02-16 15:59:12 UTC (rev 21704) @@ -0,0 +1,94 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ +package org.richfaces.tests.metamer.ftest.richInputNumberSlider; + +import static org.jboss.test.selenium.utils.URLUtils.buildUrl; + +import java.net.URL; +import org.richfaces.tests.metamer.ftest.annotations.Use; +import org.testng.annotations.Test; + +/** + * Test case for page /faces/components/richInputNumberSlider/fAjax.xhtml + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +public class TestRichSliderFAjax extends AbstractSliderTest { + + @Override + public URL getTestUrl() { + return buildUrl(contextPath, "faces/components/richInputNumberSlider/fAjax.xhtml"); + } + + @Test + @Use(field = "number", value = "correctNumbers") + @Override + public void testTypeIntoInputCorrect() { + super.testTypeIntoInputCorrect(); + } + + @Test + @Use(field = "number", value = "smallNumbers") + @Override + public void testTypeIntoInputSmall() { + super.testTypeIntoInputSmall(); + } + + @Test + @Use(field = "number", value = "bigNumbers") + @Override + public void testTypeIntoInputBig() { + super.testTypeIntoInputBig(); + } + + @Test + @Use(field = "number", value = "decimalNumbers") + @Override + public void testTypeIntoInputDecimal() { + super.testTypeIntoInputDecimal(); + } + + @Test + @Override + public void testTypeIntoInputNotNumber() { + super.testTypeIntoInputNotNumber(); + } + + @Test + @Override + public void testClickLeft() { + super.testClickLeft(); + } + + @Test + @Override + public void testClickRight() { + super.testClickRight(); + } + + @Test + @Override + public void testClick() { + super.testClick(); + } +}

15 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits February 2011