From richfaces-svn-commits at lists.jboss.org Wed Mar 4 11:59:51 2009 Content-Type: multipart/mixed; boundary="===============7416165623167313847==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r12828 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/ajaxOutputPanel and 1 other directories. Date: Wed, 04 Mar 2009 11:59:50 -0500 Message-ID: --===============7416165623167313847== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2009-03-04 11:59:50 -0500 (Wed, 04 Mar 2009) New Revision: 12828 Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/aja= xOutputPanel/ajaxOutputPanelAutoTest.xhtml Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4js= f/bean/A4JOutputPanelTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/aja= xOutputPanel/ajaxOutputPanelTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfac= es/testng/AjaxOutputPanelTest.java Log: RF-6195 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/= ajax4jsf/bean/A4JOutputPanelTestBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4j= sf/bean/A4JOutputPanelTestBean.java 2009-03-04 16:37:38 UTC (rev 12827) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4j= sf/bean/A4JOutputPanelTestBean.java 2009-03-04 16:59:50 UTC (rev 12828) @@ -20,6 +20,8 @@ */ = package org.ajax4jsf.bean; = +import javax.faces.component.UIComponent; + /** * A4JOutputPanel Test Bean * @author Alexandr Levkovsky @@ -31,18 +33,28 @@ = private Boolean ajaxRendered; = + private Boolean keepTransient; + private String outputText; = + private UIComponent binding; + = public void init() { layout =3D "inline"; ajaxRendered =3D false; outputText =3D "text"; + keepTransient =3D true; + binding =3D null; } = public void submit() { outputText =3D "changed"; } = + public void setTransient() { + binding.setTransient(true); + } + public void setOutputText(String outputText) { this.outputText =3D outputText; } @@ -66,4 +78,24 @@ public Boolean getAjaxRendered() { return ajaxRendered; } + + public void setKeepTransient(Boolean keepTransient) { + this.keepTransient =3D keepTransient; + } + + public Boolean getKeepTransient() { + return keepTransient; + } + + public String getTransientState() { + return binding !=3D null ? Boolean.toString(binding.isTransient()) : ""; + } + + public void setBinding(UIComponent binding) { + this.binding =3D binding; + } + + public UIComponent getBinding() { + return binding; + } } Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages= /ajaxOutputPanel/ajaxOutputPanelAutoTest.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/aj= axOutputPanel/ajaxOutputPanelAutoTest.xhtml (rev 0) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/aj= axOutputPanel/ajaxOutputPanelAutoTest.xhtml 2009-03-04 16:59:50 UTC (rev 12= 828) @@ -0,0 +1,28 @@ + + + = + + + + + + + + \ No newline at end of file Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pa= ges/ajaxOutputPanel/ajaxOutputPanelTest.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/= richfaces/testng/AjaxOutputPanelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfa= ces/testng/AjaxOutputPanelTest.java 2009-03-04 16:37:38 UTC (rev 12827) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfa= ces/testng/AjaxOutputPanelTest.java 2009-03-04 16:59:50 UTC (rev 12828) @@ -20,7 +20,11 @@ */ package org.richfaces.testng; = +import java.util.HashMap; +import java.util.Map; + import org.ajax4jsf.template.Template; +import org.richfaces.AutoTester; import org.richfaces.SeleniumTestBase; import org.testng.Assert; import org.testng.annotations.Test; @@ -37,6 +41,8 @@ = private String ajaxRendered; = + private String keepTransient; + = private String reset; = private String mainForm; @@ -45,18 +51,25 @@ = private String outputText; = + private String transientState; + = private String submit; = + private String setTransient; + = private void init(Template template) { renderPage(null, template, "#{a4jOutputPanelBean.init}"); String attrForm =3D getParentId() + "attrForm"; layout =3D attrForm + ":layout"; ajaxRendered =3D attrForm + ":ajaxRendered"; + keepTransient =3D attrForm + ":keepTransient"; reset =3D attrForm + ":reset"; mainForm =3D getParentId() + "mainForm"; outputPanel =3D mainForm + ":outputPanel"; outputText =3D mainForm + ":outputText"; + transientState =3D mainForm + ":transientState"; submit =3D mainForm + ":submit"; + setTransient =3D mainForm + ":setTransient"; } = /** @@ -85,7 +98,41 @@ Assert.assertEquals(selenium.getText(outputText), "changed"); } = + /** + * transient components are kept when keepTransient =3D true + */ @Test + public void testKeepTransient(Template template) { + init(template); + clickAjaxCommandAndWait(ajaxRendered); + Assert.assertEquals(selenium.getText(transientState), "false"); = + clickAjaxCommandAndWait(setTransient); + clickAjaxCommandAndWait(submit); + Assert.assertEquals(selenium.getText(transientState), "false"); = + clickAjaxCommandAndWait(keepTransient); + Assert.assertEquals(selenium.getText(transientState), "false"); = + clickAjaxCommandAndWait(setTransient); + clickAjaxCommandAndWait(submit); + Assert.assertEquals(selenium.getText(transientState), "true"); = + } + = + /** + * component with rendered =3D false is not present on the page, + * style and classes, standard HTML attributes are output to client + */ + @Test + public void testStandardAttributes(Template template) { + AutoTester autoTester =3D getAutoTester(this); + autoTester.renderPage(template, null); + autoTester.testRendered(); + Map styleAttributes =3D new HashMap(); + styleAttributes.put("width", "100%"); + styleAttributes.put("color", "yellow"); + autoTester.testStyleAndClasses(new String[]{"noname"}, styleAttribute= s); + autoTester.testHTMLEvents(); + } + + @Test public void testLayoutAttribute(Template template) { init(template); Assert.assertEquals(selenium.getAttribute("xpath=3Did('" + mainForm + "'= )/span/span/span(a)id"), outputText); @@ -97,7 +144,12 @@ Assert.assertEquals(selenium.getAttribute("xpath=3Did('" + mainForm + "'= )/span/span(a)id"), outputText); } = - @Override + @Override + public String getAutoTestUrl() { + return "pages/ajaxOutputPanel/ajaxOutputPanelAutoTest.xhtml"; + } + = + @Override public String getTestUrl() { return "pages/ajaxOutputPanel/ajaxOutputPanelTest.xhtml"; } --===============7416165623167313847==--