[richfaces-svn-commits] JBoss Rich Faces SVN: r21001 - in modules/tests/metamer/trunk: application/src/main/webapp/components/richProgressBar and 2 other directories.

Author: ppitonak(a)redhat.com Date: 2011-01-13 12:12:46 -0500 (Thu, 13 Jan 2011) New Revision: 21001 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbar/TestRichToolbar.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbarGroup/TestRichToolbarGroup.java Log: * minor fixes and refactoring Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml 2011-01-13 16:51:27 UTC (rev 21000) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml 2011-01-13 17:12:46 UTC (rev 21001) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +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. @@ -61,7 +61,8 @@ onmouseup="#{richPanelBean.attributes['onmouseup'].value}" rendered="#{richPanelBean.attributes['rendered'].value}" style="#{richPanelBean.attributes['style'].value}" - styleClass="#{richPanelBean.attributes['styleClass'].value}"> + styleClass="#{richPanelBean.attributes['styleClass'].value}" + title="#{richPanelBean.attributes['title'].value}"> <f:facet name="header">header of panel</f:facet> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus a neque turpis, at cursus nunc. @@ -98,7 +99,8 @@ onmouseup="#{richPanelBean.attributes['onmouseup'].value}" rendered="#{richPanelBean.attributes['rendered'].value}" style="#{richPanelBean.attributes['style'].value}" - styleClass="#{richPanelBean.attributes['styleClass'].value}"> + styleClass="#{richPanelBean.attributes['styleClass'].value}" + title="#{richPanelBean.attributes['title'].value}"> Nulla ornare suscipit urna, eu adipiscing sapien interdum ut. Aenean quis lectus sed eros congue imperdiet. Duis feugiat eros leo. Aenean orci orci, facilisis vel gravida condimentum, scelerisque et libero. Nullam Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml 2011-01-13 16:51:27 UTC (rev 21000) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml 2011-01-13 17:12:46 UTC (rev 21001) @@ -6,7 +6,7 @@ <!-- JBoss, Home of Professional Open Source -Copyright 2010, Red Hat, Inc. and individual contributors +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. @@ -75,6 +75,7 @@ <a4j:commandButton id="startButton" action="#{richProgressBarBean.startProcess}" value="Start Process" execute="@form" + render="progressBar" rendered="#{richProgressBarBean.buttonRendered}" style="margin: 9px 0px 5px;" /> </f:facet> @@ -84,6 +85,7 @@ <a4j:commandButton id="restartButton" action="#{richProgressBarBean.startProcess}" value="Restart Process" execute="@form" + render="progressBar" rendered="#{richProgressBarBean.buttonRendered}" style="margin: 9px 0px 5px;" /> </f:facet> Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbar/TestRichToolbar.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbar/TestRichToolbar.java 2011-01-13 16:51:27 UTC (rev 21000) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbar/TestRichToolbar.java 2011-01-13 17:12:46 UTC (rev 21001) @@ -95,8 +95,7 @@ @Test @Use(field = "itemSeparator", value = "separators") public void testItemSeparatorCorrect() { - JQueryLocator input = pjq("select[id$=itemSeparatorInput]"); - selenium.select(input, optionLabel(itemSeparator)); + selenium.select(pjq("select[id$=itemSeparatorInput]"), optionLabel(itemSeparator)); selenium.waitForPageToLoad(); JQueryLocator separatorDiv = separator.getDescendant(jq("div.rf-tb-sep-" + itemSeparator)); @@ -121,8 +120,7 @@ @Test public void testItemSeparatorCustom() { - JQueryLocator input = pjq("select[id$=itemSeparatorInput]"); - selenium.select(input, optionLabel("star")); + selenium.select(pjq("select[id$=itemSeparatorInput]"), optionLabel("star")); selenium.waitForPageToLoad(); JQueryLocator separatorImg = separator.getDescendant(jq("> img")); @@ -137,8 +135,7 @@ @Test public void testItemSeparatorNonExisting() { - JQueryLocator input = pjq("select[id$=itemSeparatorInput]"); - selenium.select(input, optionLabel("non-existing")); + selenium.select(pjq("select[id$=itemSeparatorInput]"), optionLabel("non-existing")); selenium.waitForPageToLoad(); JQueryLocator separatorImg = separator.getDescendant(jq("> img")); @@ -219,8 +216,7 @@ @Test public void testRendered() { - JQueryLocator input = pjq("input[type=radio][name$=renderedInput][value=false]"); - selenium.click(input); + selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); selenium.waitForPageToLoad(); assertFalse(selenium.isElementPresent(toolbar), "Toolbar should not be rendered when rendered=false."); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbarGroup/TestRichToolbarGroup.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbarGroup/TestRichToolbarGroup.java 2011-01-13 16:51:27 UTC (rev 21000) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbarGroup/TestRichToolbarGroup.java 2011-01-13 17:12:46 UTC (rev 21001) @@ -244,15 +244,14 @@ @Test public void testRendered() { - JQueryLocator renderedInput = pjq("input[type=radio][name$=renderedInput][value=false]"); - selenium.click(renderedInput); + selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); selenium.waitForPageToLoad(); assertTrue(selenium.isElementPresent(toolbar), "Toolbar should be present on the page."); assertTrue(selenium.isVisible(toolbar), "Toolbar should be visible."); assertFalse(selenium.isElementPresent(separator), "No item separator should be present on the page."); - assertTrue(selenium.isElementPresent(renderedInput), "Input should be present on the page."); - assertTrue(selenium.isVisible(renderedInput), "Input should be visible."); + assertTrue(selenium.isElementPresent(input), "Input should be present on the page."); + assertTrue(selenium.isVisible(input), "Input should be visible."); assertTrue(selenium.isElementPresent(button), "Button should be present on the page."); assertTrue(selenium.isVisible(button), "Button should be visible.");