Author: dsvyatobatsko Date: 2009-01-19 08:06:56 -0500 (Mon, 19 Jan 2009) New Revision: 12334 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tabPanel/tabPanelAutoTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java Log: https://jira.jboss.org/jira/browse/RF-5560 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tabPanel/tabPanelAutoTest.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 2009-01-19 12:03:29 UTC (rev 12333) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-01-19 13:06:56 UTC (rev 12334) @@ -427,12 +427,12 @@ private void changeValue() { base.changeValue(); } - - private void setInternalValidation(boolean passed) { + + public void setInternalValidation(boolean passed) { setupControl(TestSetupEntry.validatorId, (passed) ? AutoTestBean.VALIDATOR_DEFAULT_ID : AutoTestBean.VALIDATOR_ID); } - - private String getValidatorMessage() { + + public String getValidatorMessage() { String id = base.getParentId() + AUTOTEST_FORM_ID + MESSAGE_FOR_ID; if (base.isPresent(id)) { return base.getTextById(base.getParentId() + AUTOTEST_FORM_ID + MESSAGE_FOR_ID); Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-01-19 12:03:29 UTC (rev 12333) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-01-19 13:06:56 UTC (rev 12334) @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.Map; +import org.ajax4jsf.autotest.bean.AutoTestBean; import org.ajax4jsf.template.Template; import org.richfaces.AutoTester; import org.richfaces.SeleniumTestBase; @@ -135,6 +136,29 @@ } @Test + public void testValidatorAndValidatorMessageAttributes(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, INIT_AJAX_CORE_TEST); + writeStatus("Check validator and validatorMessage attributes"); + + Assert.fail("https://jira.jboss.org/jira/browse/RF-5779"); + + tester.setInternalValidation(false); + tester.clickLoad(); + + clickAjaxCommandAndWait(getAutoTester(this).getClientId("") + "tab2_lbl"); + + String validatorMessage = tester.getValidatorMessage(); + if ("".equals(validatorMessage)) { + Assert.fail("Validator attribute does not work. Validation passed, should be failed."); + }else if (!AutoTestBean.VALIDATOR_MESSAGE.equals(validatorMessage)) { + Assert.fail("ValidatorMessage attribute does not work. ValidationMessage expected: [" + AutoTestBean.VALIDATOR_MESSAGE+"].But was [" + validatorMessage + "]"); + } + + tester.checkValueChangeListener(false); + } + + @Test public void testSubmissionModesAndListeners(Template template) { renderPage(template, RESET_METHOD);