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

Author: andrei_exadel Date: 2008-11-20 06:10:18 -0500 (Thu, 20 Nov 2008) New Revision: 11260 Added: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/EffectBean.java Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/effect/effectTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/EffectTest.java Log: RF-4967 Added: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/EffectBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/EffectBean.java (rev 0) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/EffectBean.java 2008-11-20 11:10:18 UTC (rev 11260) @@ -0,0 +1,39 @@ +/** + * + */ +package org.ajax4jsf.bean; + +/** + * @author Andrey Markavtsov + * + */ +public class EffectBean { + + Boolean rendered = true; + + public String testRendered() { + rendered = false; + return null; + } + + public void reset() { + rendered = true; + } + + /** + * @return the rendered + */ + public Boolean getRendered() { + return rendered; + } + + /** + * @param rendered the rendered to set + */ + public void setRendered(Boolean rendered) { + this.rendered = rendered; + } + + + +} Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml 2008-11-20 10:44:45 UTC (rev 11259) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml 2008-11-20 11:10:18 UTC (rev 11260) @@ -265,6 +265,11 @@ <managed-bean-name>treeBean</managed-bean-name> <managed-bean-class>org.ajax4jsf.bean.tree.TreeTestBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>effectBean</managed-bean-name> + <managed-bean-class>org.ajax4jsf.bean.EffectBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> </managed-bean> <navigation-rule> <from-view-id>/pages/ajaxInclude/step1.xhtml</from-view-id> Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/effect/effectTest.xhtml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/effect/effectTest.xhtml 2008-11-20 10:44:45 UTC (rev 11259) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/effect/effectTest.xhtml 2008-11-20 11:10:18 UTC (rev 11260) @@ -9,6 +9,10 @@ <ui:composition template="#{templateBean.template}"> <ui:define name="component"> + <h:form id="_controls"> + <h:commandButton action="#{effectBean.testRendered}" value="testRendered" id="testRendered"></h:commandButton> + </h:form> + <input type="button" id="button1" value="Button1"/> <h:commandButton id="button2" value="Button2"></h:commandButton> <h:commandButton id="button3" value="Button3"> @@ -20,16 +24,21 @@ <a href="#" id="hideLink1">Hide Button</a><br/> <a href="#" id="showLink2">Show Command Button</a><br/> - <a href="#" id="hideLink2">Hide Command Button</a> + <a href="#" id="hideLink2">Hide Command Button</a><br/> + <a href="#" id="testLink" onclick="myEffect({duration:1, from:1.0, to:0.1})">Test named effect</a> <rich:effect for="hideLink1" event="onclick" type="Fade" params="targetId: 'button1', duration: 2.0, from: 1.0, to: 0.0"></rich:effect> - <rich:effect for="hideLink2" event="onclick" type="Fade" + <rich:effect rendered="#{effectBean.rendered}" for="hideLink2" event="onclick" type="Fade" params="targetId: getParentId() + 'button2', duration: 0, from: 1.0, to: 0.0"></rich:effect> <rich:effect for="showLink2" event="onclick" type="Appear" params="targetId: getParentId() + 'button2', duration: 0"></rich:effect> + + <rich:effect name="myEffect" type="Opacity" + targetId="testLink"> + </rich:effect> </ui:define> Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java 2008-11-20 10:44:45 UTC (rev 11259) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java 2008-11-20 11:10:18 UTC (rev 11260) @@ -106,7 +106,7 @@ } - //@Test + @Test public void testExternalValidation(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); @@ -114,7 +114,7 @@ autoTester.testExtrenalValidationFailure(); } - //@Test + @Test public void testImmediate(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); @@ -122,7 +122,7 @@ autoTester.testImmediate(); } - //@Test + @Test public void testImmediateWithExternalValidation(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); @@ -130,7 +130,7 @@ autoTester.testImmediateWithExternalValidationFailed(); } - //Test + @Test public void testLimitToList(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); @@ -138,7 +138,7 @@ autoTester.testLimitToList(); } - //@Test + @Test public void testByPassUpdate(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); @@ -146,7 +146,7 @@ autoTester.testBypassUpdate(); } - //@Test + @Test public void testReRender(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); @@ -154,7 +154,7 @@ autoTester.testReRender(); } - //@Test + @Test public void testNestedParams(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); @@ -162,7 +162,7 @@ autoTester.testRequestParameters(PARAMS); } - //@Test + @Test public void testDisableDefault(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId(), "contextMenu2"); @@ -179,7 +179,7 @@ } - //@Test + @Test public void testRendered(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); @@ -187,7 +187,7 @@ autoTester.testRendered(); } - //@Test + @Test public void testActionListener(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId(), UNATTACHED_CONTEXTMENU); @@ -216,7 +216,7 @@ } - //@Test + @Test public void testAttachedAndAttachedTo(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId(), UNATTACHED_CONTEXTMENU); @@ -239,7 +239,7 @@ AssertPresent(contextMenuBody, "Context menu has not been shown"); } - //@Test + @Test public void testSubmitMode(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId(), UNATTACHED_CONTEXTMENU); @@ -270,7 +270,7 @@ } - //@Test + @Test public void testContextMenuRendering(Template template) { renderPage(template, RESET_METHOD); @@ -365,7 +365,7 @@ } - //@Test + @Test public void testContextMenuStandAlone(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId(), UNATTACHED_CONTEXTMENU); @@ -387,7 +387,7 @@ AssertNotVisible(contextMenuBody, "Context menu has not been hidden"); } - //@Test + @Test public void testComponentControlManagement(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId(), UNATTACHED_CONTEXTMENU); @@ -409,7 +409,7 @@ AssertNotVisible(contextMenuBody, "Context menu has not been hidden"); } - //@Test + @Test public void testMacrodefinitions(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId(), UNATTACHED_CONTEXTMENU); Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/EffectTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/EffectTest.java 2008-11-20 10:44:45 UTC (rev 11259) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/EffectTest.java 2008-11-20 11:10:18 UTC (rev 11260) @@ -13,10 +13,41 @@ */ public class EffectTest extends SeleniumTestBase { + static final String RESET_METHOD = "#{effectBean.reset}"; @Test + public void testRendered(Template template) { + renderPage(template, RESET_METHOD); + String parentId = getParentId(); + + String controlId = parentId + "_controls:testRendered"; + clickCommandAndWait(controlId); + + String button2Id = parentId + "button2"; + String hideLink2 = "hideLink2"; + + AssertVisible(button2Id); + clickById(hideLink2); + AssertVisible(button2Id, "Button should not be hidden in case on effect rendered = false"); + } + + @Test + public void testNamedEffect(Template template) { + renderPage(template, RESET_METHOD); + + String testLink = "testLink"; + AssertVisible(testLink); + + clickById(testLink); + pause(200, testLink); + assertStyleAttribute(testLink, "opacity", "Named effect does not work"); + pause(1500, testLink); + assertStyleAttribute(testLink, "opacity: 0.1", "Opacity effect has not been completed"); + } + + @Test public void testComponentHideShow(Template template) { - renderPage(template); + renderPage(template, RESET_METHOD); String parentId = getParentId(); String button2Id = parentId + "button2"; @@ -43,7 +74,7 @@ @Test public void testFadeEffect(Template template) { - renderPage(template); + renderPage(template, RESET_METHOD); String parentId = getParentId(); String button1Id = "button1";