[richfaces-svn-commits] JBoss Rich Faces SVN: r15633 - branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.

Author: nbelaevski Date: 2009-09-19 08:56:16 -0400 (Sat, 19 Sep 2009) New Revision: 15633 Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataScrollerTest.java Log: DataScrollerTest fixed Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataScrollerTest.java =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataScrollerTest.java 2009-09-19 05:38:08 UTC (rev 15632) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataScrollerTest.java 2009-09-19 12:56:16 UTC (rev 15633) @@ -445,14 +445,14 @@ assertClassNames(getPageLinkRefScript(5, dataScrollerTableId), activePageClasses, "'3' link should current", false); assertClassNames(getPageLinkRefScript(3, dataScrollerTableId), inactivePageClasses, "'1' link should be inactive", false); - assertClassNames(getPageLinkRefScript(0, dataScrollerTableId), activeForwardClasses, "'««' control should be accessible", false); - assertClassNames(getPageLinkRefScript(1, dataScrollerTableId), activeForwardClasses, "'«' control should be accessible", false); + assertClassNames(getPageLinkRefScript(0, dataScrollerTableId), activeForwardClasses, "'\u00ab\u00ab' control should be accessible", false); + assertClassNames(getPageLinkRefScript(1, dataScrollerTableId), activeForwardClasses, "'\u00ab' control should be accessible", false); if(paired){ assertClassNames(getPageLinkRefScript(5, secondDataScrollerTableId), activePageClasses, "'3' link should current", false); assertClassNames(getPageLinkRefScript(3, secondDataScrollerTableId), inactivePageClasses, "'1' link should be inactive", false); - assertClassNames(getPageLinkRefScript(0, secondDataScrollerTableId), activeForwardClasses, "'««' control should be accessible", false); - assertClassNames(getPageLinkRefScript(1, secondDataScrollerTableId), activeForwardClasses, "'«' control should be accessible", false); + assertClassNames(getPageLinkRefScript(0, secondDataScrollerTableId), activeForwardClasses, "'\u00ab\u00ab' control should be accessible", false); + assertClassNames(getPageLinkRefScript(1, secondDataScrollerTableId), activeForwardClasses, "'\u00ab' control should be accessible", false); } if(paired){ @@ -468,11 +468,11 @@ clickControl(15, dataScrollerTableId); testData(1, "Page 10"); - assertClassNames(getPageLinkRefScript(15, dataScrollerTableId), inactiveForwardClasses, "'»»' control should be inactive", false); - assertClassNames(getPageLinkRefScript(14, dataScrollerTableId), inactiveForwardClasses, "'»' control should be inactive", false); + assertClassNames(getPageLinkRefScript(15, dataScrollerTableId), inactiveForwardClasses, "'\u00bb' control should be inactive", false); + assertClassNames(getPageLinkRefScript(14, dataScrollerTableId), inactiveForwardClasses, "'\u00bb' control should be inactive", false); if(paired){ - assertClassNames(getPageLinkRefScript(15, secondDataScrollerTableId), inactiveForwardClasses, "'»»' control should be inactive", false); - assertClassNames(getPageLinkRefScript(14, secondDataScrollerTableId), inactiveForwardClasses, "'»' control should be inactive", false); + assertClassNames(getPageLinkRefScript(15, secondDataScrollerTableId), inactiveForwardClasses, "'\u00bb\u00bb' control should be inactive", false); + assertClassNames(getPageLinkRefScript(14, secondDataScrollerTableId), inactiveForwardClasses, "'\u00bb' control should be inactive", false); } if(paired){ @@ -481,12 +481,12 @@ clickControl(1, dataScrollerTableId); } testData(1, "Page 9"); - assertClassNames(getPageLinkRefScript(0, dataScrollerTableId), activeForwardClasses, "'»»' control should be active", false); - assertClassNames(getPageLinkRefScript(1, dataScrollerTableId), activeForwardClasses, "'»' control should be active", false); + assertClassNames(getPageLinkRefScript(0, dataScrollerTableId), activeForwardClasses, "'\u00bb\u00bb' control should be active", false); + assertClassNames(getPageLinkRefScript(1, dataScrollerTableId), activeForwardClasses, "'\u00bb' control should be active", false); assertClassNames(getPageLinkRefScript(11, dataScrollerTableId), activePageClasses, "'9' link should be current", false); if(paired){ - assertClassNames(getPageLinkRefScript(0, secondDataScrollerTableId), activeForwardClasses, "'»»' control should be active", false); - assertClassNames(getPageLinkRefScript(1, secondDataScrollerTableId), activeForwardClasses, "'»' control should be active", false); + assertClassNames(getPageLinkRefScript(0, secondDataScrollerTableId), activeForwardClasses, "'\u00bb\u00bb' control should be active", false); + assertClassNames(getPageLinkRefScript(1, secondDataScrollerTableId), activeForwardClasses, "'\u00bb' control should be active", false); assertClassNames(getPageLinkRefScript(11, secondDataScrollerTableId), activePageClasses, "'9' link should be current", false); } @@ -564,39 +564,39 @@ } private void testControls() { - // Check '««' link + // Check '\u00ab\u00ab' link String text = selenium.getTable("id=" + dataScrollerTableId + ".0.0"); - Assert.assertEquals("\u0171\u0171", text, "DataScroller does not contain '««' link or its position is invalid"); + Assert.assertEquals(text, "\u00ab\u00ab", "DataScroller does not contain '\u00ab\u00ab' link or its position is invalid"); assertClassNames(getPageLinkRefScript(0, dataScrollerTableId),inactiveForwardClasses, "DataScroller rendering failed: ", false); - // Check '«' link + // Check '\u00ab' link text = selenium.getTable("id=" + dataScrollerTableId + ".0.1"); - Assert.assertEquals("\u0171", text, "DataScroller does not contain '«' link or its position is invalid"); + Assert.assertEquals(text, "\u00ab", "DataScroller does not contain '\u00ab' link or its position is invalid"); assertClassNames(getPageLinkRefScript(1, dataScrollerTableId),inactiveForwardClasses, "DataScroller rendering failed: ", false); // Check '1' link text = selenium.getTable("id=" + dataScrollerTableId + ".0.3"); - Assert.assertEquals("1", text, "DataScroller does not contain '1' link or its position is invalid"); + Assert.assertEquals(text, "1", "DataScroller does not contain '1' link or its position is invalid"); assertClassNames(getPageLinkRefScript(3, dataScrollerTableId),activePageClasses, "DataScroller rendering failed: ", false); // Check '5' link text = selenium.getTable("id=" + dataScrollerTableId + ".0.7"); - Assert.assertEquals("5", text, "DataScroller does not contain '5' link or its position is invalid"); + Assert.assertEquals(text, "5", "DataScroller does not contain '5' link or its position is invalid"); assertClassNames(getPageLinkRefScript(7, dataScrollerTableId),inactivePageClasses, "DataScroller rendering failed: ", false); - // Check '»' link + // Check '\u00bb' link text = selenium.getTable("id=" + dataScrollerTableId + ".0.14"); - Assert.assertEquals("\u0187", text, "DataScroller does not contain '»' link or its position is invalid"); + Assert.assertEquals(text, "\u00bb", "DataScroller does not contain '\u00bb' link or its position is invalid"); assertClassNames(getPageLinkRefScript(14, dataScrollerTableId),activeForwardClasses, "DataScroller rendering failed: ", false); - // Check '»»' link + // Check '\u00bb\u00bb' link text = selenium.getTable("id=" + dataScrollerTableId + ".0.15"); - Assert.assertEquals("\u0187\u0187", text, "DataScroller does not contain '»»' link or its position is invalid"); + Assert.assertEquals(text, "\u00bb\u00bb", "DataScroller does not contain '\u00bb\u00bb' link or its position is invalid"); assertClassNames(getPageLinkRefScript(15, dataScrollerTableId),activeForwardClasses, "DataScroller rendering failed: ", false); @@ -604,18 +604,18 @@ private void checkCustomFacets() { String text = selenium.getTable("id=" + dataScrollerTableId + ".0.2"); - Assert.assertEquals("", text, "'Previous' facet should be rendered yet"); + Assert.assertEquals(text, "", "'Previous' facet should be rendered yet"); assertClassNames(getPageLinkRefScript(2, dataScrollerTableId),inactiveForwardClasses, "DataScroller rendering failed: ", false); text = selenium.getTable("id=" + dataScrollerTableId + ".0.13"); - Assert.assertEquals("Next", text, "'Next' facet didnot rendered. DataScroller does not contain 'Next' link or its position is invalid"); + Assert.assertEquals(text, "Next", "'Next' facet didnot rendered. DataScroller does not contain 'Next' link or its position is invalid"); assertClassNames(getPageLinkRefScript(13, dataScrollerTableId),activeForwardClasses, "DataScroller rendering failed: ", false); clickControl(4, dataScrollerTableId); text = selenium.getTable("id=" + dataScrollerTableId + ".0.2"); - Assert.assertEquals("Previous", text, "'Previous' facet didnot be rendered."); + Assert.assertEquals(text, "Previous", "'Previous' facet didnot be rendered."); assertClassNames(getPageLinkRefScript(2, dataScrollerTableId),activeForwardClasses, "DataScroller rendering failed: ", false); @@ -627,7 +627,7 @@ for (int i=1; i <= rowCount; i++) { String text = selenium.getTable("id=" + dataTableId + "."+rowCount+".1"); - Assert.assertEquals(data, text,"Data Table content is invalid"); + Assert.assertEquals(text, data, "Data Table content is invalid"); } }