Author: ppitonak(a)redhat.com Date: 2011-10-13 07:51:15 -0400 (Thu, 13 Oct 2011) New Revision: 22797 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/TestHCommandButton.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richComponentControl/TestDataScroller.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFunctions/TestClientFunctions.java Log: tests fixed Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/TestHCommandButton.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/TestHCommandButton.java 2011-10-13 11:18:08 UTC (rev 22796) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/TestHCommandButton.java 2011-10-13 11:51:15 UTC (rev 22797) @@ -32,6 +32,7 @@ import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.Templates; import org.testng.annotations.Test; /** @@ -88,11 +89,18 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-11296") + @Templates(exclude = { "richPopupPanel" }) public void testAccesskey() { testHtmlAttribute(button, "accesskey", "b"); } + @Test(groups = { "4.Future" }) + @Templates(value = { "richPopupPanel" }) + @IssueTracking("https://issues.jboss.org/browse/RF-11296") + public void testAccesskeyInPopupPanel() { + testHtmlAttribute(button, "accesskey", "b"); + } + @Test public void testAction() { JQueryLocator doubleStringAction = pjq("input[value=doubleStringAction]"); @@ -106,7 +114,7 @@ waitGui.until(textEquals.locator(output1).text("RichFaces 4")); String output = selenium.getText(output2); assertEquals(output, "RichFaces 4RichFaces 4", - "output2 when 'RichFaces 4' in input and doubleStringAction selected"); + "output2 when 'RichFaces 4' in input and doubleStringAction selected"); selenium.click(first6CharsAction); selenium.waitForPageToLoad(TIMEOUT); @@ -138,7 +146,7 @@ waitGui.until(textEquals.locator(output1).text("RichFaces 4")); String output = selenium.getText(output3); assertEquals(output, "RichFaces 4RichFaces 4", - "output2 when 'RichFaces 4' in input and doubleStringActionListener selected"); + "output2 when 'RichFaces 4' in input and doubleStringActionListener selected"); selenium.click(first6CharsActionListener); selenium.waitForPageToLoad(TIMEOUT); @@ -155,7 +163,7 @@ waitGui.until(textEquals.locator(output1).text("RichFaces 4ě")); output = selenium.getText(output3); assertEquals(output, "RICHFACES 4Ě", - "output2 when 'RichFaces 4ě' in input and toUpperCaseActionListener selected"); + "output2 when 'RichFaces 4ě' in input and toUpperCaseActionListener selected"); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richComponentControl/TestDataScroller.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richComponentControl/TestDataScroller.java 2011-10-13 11:18:08 UTC (rev 22796) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richComponentControl/TestDataScroller.java 2011-10-13 11:51:15 UTC (rev 22797) @@ -27,6 +27,7 @@ import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.Templates; import org.richfaces.tests.metamer.ftest.richDataScroller.PaginationTester; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -66,8 +67,18 @@ } @Test - @IssueTracking({ "https://issues.jboss.org/browse/RF-9306", "https://issues.jboss.org/browse/RFPL-1187" }) + @IssueTracking({ "https://issues.jboss.org/browse/RFPL-1187" }) + @Templates(exclude = { "a4jRepeat", "richCollapsibleSubTable", "richDataGrid", "richDataTable", + "richExtendedDataTable", "richList" }) public void testScrollerPagination() { paginationTester.testNumberedPages(); } + + @Test(groups = { "4.Future" }) + @IssueTracking({ "https://issues.jboss.org/browse/RF-9306" }) + @Templates(value = { "a4jRepeat", "richCollapsibleSubTable", "richDataGrid", "richDataTable", + "richExtendedDataTable", "richList" }) + public void testScrollerPaginationInIterationComponents() { + paginationTester.testNumberedPages(); + } } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFunctions/TestClientFunctions.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFunctions/TestClientFunctions.java 2011-10-13 11:18:08 UTC (rev 22796) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFunctions/TestClientFunctions.java 2011-10-13 11:51:15 UTC (rev 22797) @@ -29,11 +29,12 @@ import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.Templates; import org.testng.annotations.Test; /** * Test case for page faces/components/richFunctions/all.xhtml. - * + * * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ @@ -55,7 +56,8 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10465") + @Templates(exclude = { "a4jRepeat", "richCollapsibleSubTable", "richDataGrid", "richDataTable", + "richExtendedDataTable", "richList" }) public void testFunctions() { String clientId = selenium.getText(clientIdOutput); assertNotNull(clientId, "Function clientId() doesn't work."); @@ -71,6 +73,14 @@ assertEquals(output, "abc", "Function findComponent() doesn't work."); } + @Test(groups = { "4.Future" }) + @Templates(value = { "a4jRepeat", "hDataTable", "richCollapsibleSubTable", "richDataGrid", "richDataTable", + "richExtendedDataTable", "richList", "uiRepeat" }) + @IssueTracking("https://issues.jboss.org/browse/RF-10465") + public void testFunctionsInIterationComponents() { + testFunctions(); + } + @Test public void testRoles() { String outputAU = selenium.getText(userInRoleAUOutput);