Author: konstantin.mishin
Date: 2009-09-14 15:26:50 -0400 (Mon, 14 Sep 2009)
New Revision: 15567
Modified:
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InputNumberSliderTest.java
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java
Log:
RFPL-143
Modified:
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InputNumberSliderTest.java
===================================================================
---
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InputNumberSliderTest.java 2009-09-14
17:48:41 UTC (rev 15566)
+++
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InputNumberSliderTest.java 2009-09-14
19:26:50 UTC (rev 15567)
@@ -190,7 +190,7 @@
@Test
public void testStylesAndStyleClassesAreOutputToClient(Template template) {
- renderPage(LOOK_AND_FEEL_TEST_URL, template, null);
+ renderPage(LOOK_AND_FEEL_TEST_URL, template, RESET_METHOD);
writeStatus("Check styles and classes are output to client");
Modified:
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java
===================================================================
---
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java 2009-09-14
17:48:41 UTC (rev 15566)
+++
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java 2009-09-14
19:26:50 UTC (rev 15567)
@@ -488,27 +488,27 @@
@Test
public void testShowButtonsLabel(Template template) {
init(template);
- Assert.assertEquals(getTextById(copyAllId), "Copy All Items", "The
text on the button must be visible.");
- Assert.assertEquals(getTextById(copyId), "Copy", "The text on the
button must be visible.");
- Assert.assertEquals(getTextById(removeId), "Remove", "The text on
the button must be visible.");
- Assert.assertEquals(getTextById(removeAllId), "Remove All", "The
text on the button must be visible.");
- Assert.assertEquals(getTextById(firstId), "Move to top", "The text
on the button must be visible.");
- Assert.assertEquals(getTextById(upId), "Up", "The text on the
button must be visible.");
- Assert.assertEquals(getTextById(downId), "Down", "The text on the
button must be visible.");
- Assert.assertEquals(getTextById(lastId), "Last", "The text on the
button must be visible.");
+ Assert.assertEquals(selenium.getText("//*[@id='" + copyAllId +
"']//text()"), "Copy All Items", "The text on the button must
be visible.");
+ Assert.assertEquals(selenium.getText("//*[@id='" + copyId +
"']//text()"), "Copy", "The text on the button must be
visible.");
+ Assert.assertEquals(selenium.getText("//*[@id='" + removeId +
"']//text()"), "Remove", "The text on the button must be
visible.");
+ Assert.assertEquals(selenium.getText("//*[@id='" + removeAllId +
"']//text()"), "Remove All", "The text on the button must be
visible.");
+ Assert.assertEquals(selenium.getText("//*[@id='" + firstId +
"']//text()"), "Move to top", "The text on the button must be
visible.");
+ Assert.assertEquals(selenium.getText("//*[@id='" + upId +
"']//text()"), "Up", "The text on the button must be
visible.");
+ Assert.assertEquals(selenium.getText("//*[@id='" + downId +
"']//text()"), "Down", "The text on the button must be
visible.");
+ Assert.assertEquals(selenium.getText("//*[@id='" + lastId +
"']//text()"), "Last", "The text on the button must be
visible.");
selenium.click(showButtonLabelsId);
waitForAjaxCompletion();
clickAjaxCommandAndWait(submitId);
- Assert.assertEquals(getTextById(copyAllId), "", "The text on the
button mustn't be visible.");
- Assert.assertEquals(getTextById(copyId), "", "The text on the
button mustn't be visible.");
- Assert.assertEquals(getTextById(removeId), "", "The text on the
button mustn't be visible.");
- Assert.assertEquals(getTextById(removeAllId), "", "The text on the
button mustn't be visible.");
- Assert.assertEquals(getTextById(firstId), "", "The text on the
button mustn't be visible.");
- Assert.assertEquals(getTextById(upId), "", "The text on the button
mustn't be visible.");
- Assert.assertEquals(getTextById(downId), "", "The text on the
button mustn't be visible.");
- Assert.assertEquals(getTextById(lastId), "", "The text on the
button mustn't be visible.");
+ Assert.assertEquals(selenium.getXpathCount("//*[@id='" + copyAllId
+ "']//text()").intValue(), 0, "The text on the button mustn't be
visible.");
+ Assert.assertEquals(selenium.getXpathCount("//*[@id='" + copyId +
"']//text()").intValue(), 0, "The text on the button mustn't be
visible.");
+ Assert.assertEquals(selenium.getXpathCount("//*[@id='" + removeId +
"']//text()").intValue(), 0, "The text on the button mustn't be
visible.");
+ Assert.assertEquals(selenium.getXpathCount("//*[@id='" +
removeAllId + "']//text()").intValue(), 0, "The text on the button
mustn't be visible.");
+ Assert.assertEquals(selenium.getXpathCount("//*[@id='" + firstId +
"']//text()").intValue(), 0, "The text on the button mustn't be
visible.");
+ Assert.assertEquals(selenium.getXpathCount("//*[@id='" + upId +
"']//text()").intValue(), 0, "The text on the button mustn't be
visible.");
+ Assert.assertEquals(selenium.getXpathCount("//*[@id='" + downId +
"']//text()").intValue(), 0, "The text on the button mustn't be
visible.");
+ Assert.assertEquals(selenium.getXpathCount("//*[@id='" + lastId +
"']//text()").intValue(), 0, "The text on the button mustn't be
visible.");
}
/**