Author: dsvyatobatsko Date: 2008-10-16 09:52:42 -0400 (Thu, 16 Oct 2008) New Revision: 10774 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanelAutoTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SimpleTogglePanelTest.java Log: SimpleTogglePanel: ajaxSingle tests Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanelAutoTest.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2008-10-16 13:46:30 UTC (rev 10773) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2008-10-16 13:52:42 UTC (rev 10774) @@ -114,7 +114,22 @@ checkUpdateModel(false); } - + + /** + * Important! Override {@link SeleniumTestBase#setInternalValidationFailed()} method if you use this method + */ + public void testAjaxSingleWithInternalValidationFailed() { + reset(); + setupControl(TestSetupEntry.ajaxSingle, Boolean.TRUE); + clickLoad(); + + setInternalValidationFailed(); + base.sendAjax(); + + checkActionListener(false); + checkUpdateModel(false); + } + public void testImmediate() { reset(); setupControl(TestSetupEntry.immediate, Boolean.TRUE); @@ -269,7 +284,11 @@ private void setExtrenalValidationFailed() { base.setValueById(base.getParentId() + AUTOTEST_FORM_ID + INPUT_ID, ""); } - + + private void setInternalValidationFailed() { + base.setInternalValidationFailed(); + } + private void setupControl(TestSetupEntry attr, Object o) { final String idPrefix = "_auto_"; String controlId = base.getParentId() + AUTOTEST_CONTROLS_FORM_ID + idPrefix + attr.name; Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-16 13:46:30 UTC (rev 10773) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-16 13:52:42 UTC (rev 10774) @@ -1006,8 +1006,15 @@ */ public void sendAjax() { } - + /** + * This call back has to move auto test component into invalid state. + * Used for auto testing only. + */ + public void setInternalValidationFailed() { + } + + /** * Returns the array of components' ids that are rerendering after ajax request from the component. * This method should be overridden for auto test */ Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SimpleTogglePanelTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SimpleTogglePanelTest.java 2008-10-16 13:46:30 UTC (rev 10773) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SimpleTogglePanelTest.java 2008-10-16 13:52:42 UTC (rev 10774) @@ -147,12 +147,34 @@ assertClassNames(bodyDivId, new String[] { "body-class" }, "bodyClass attribute was not output to client", true); } + @Test + public void testAjaxSingle(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, null); + writeStatus("Test ajaxSingle attribute"); + tester.testAjaxSingle(); + } + + @Test + public void testAjaxSingleWithInternalValidationFailed(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, null); + writeStatus("Test ajaxSingle attribute in case of invalid children state"); + tester.testAjaxSingleWithInternalValidationFailed(); + } + @Override public void sendAjax() { clickAjaxCommandAndWait(getAutoTester(this).getClientId(AutoTester.COMPONENT_ID) + "_header"); } @Override + public void setInternalValidationFailed() { + String childCompId = getAutoTester(this).getClientId("") + "child"; + setValueById(childCompId, ""); + } + + @Override public String getAutoTestUrl() { return "pages/simpleTogglePanel/simpleTogglePanelAutoTest.xhtml"; }