Author: dsvyatobatsko Date: 2008-06-05 12:08:23 -0400 (Thu, 05 Jun 2008) New Revision: 8919 Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/InputNumberSliderTest.java Log: inputNumberSlider test fix Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/InputNumberSliderTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/InputNumberSliderTest.java 2008-06-05 15:50:23 UTC (rev 8918) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/InputNumberSliderTest.java 2008-06-05 16:08:23 UTC (rev 8919) @@ -57,7 +57,7 @@ public void testInputNumberSliderComponent() throws Exception { _testInputNumberSlider(Template.SIMPLE); _testInputNumberSlider(Template.DATA_TABLE); - // _testInputNumberSlider(Templates.MODAL_PANEL); +// _testInputNumberSlider(Template.MODAL_PANEL); } private void _testInputNumberSlider(Template template) { @@ -89,12 +89,11 @@ checkSliderVisualState(slider, 80); writeStatus("Checking if value is changed with input field"); - selenium.runScript("var input = $('" + input + "'); input.focus(); input.value = 22; input.blur();"); + selenium.type(input, "22"); checkSliderVisualState(slider, 22); writeStatus("Checking if slider is properly re-rendered and submitted with ajax"); - clickById(ajax); - waitForAjaxCompletion(); + clickAjaxCommandAndWait(ajax); checkSliderVisualState(slider, 32); AssertTextEquals(output, "32"); @@ -106,28 +105,25 @@ writeStatus("Checking validation"); selenium.mouseDownAt("id=" + track, "950,1"); selenium.mouseUpAt("id=" + track, "950,1"); - clickById(ajax); - waitForAjaxCompletion(); + clickAjaxCommandAndWait(ajax); checkSliderVisualState(slider, 95); AssertTextEquals(output, "42"); selenium.mouseDownAt("id=" + track, "300,1"); selenium.mouseUpAt("id=" + track, "300,1"); - clickById(ajax); - waitForAjaxCompletion(); + clickAjaxCommandAndWait(ajax); checkSliderVisualState(slider, 40); AssertTextEquals(output, "40"); } private void checkSliderVisualState(String id, int value) { writeStatus("Checking value in input field"); - AssertValueEquals(id + "Input", new Integer(value).toString()); - AssertTextEquals(id + "Tip", new Integer(value).toString()); + AssertValueEquals(id + "Input", Integer.toString(value)); + AssertTextEquals(id + "Tip", Integer.toString(value)); writeStatus("Checking tip and tracker position"); - String actualHandle = selenium.getEval(WINDOW_JS_RESOLVER + "document.getElementById('" + id - + "Handle').style.left"); - String actualTip = selenium.getEval(WINDOW_JS_RESOLVER + "document.getElementById('" + id + "Tip').style.left"); + String actualHandle = runScript("document.getElementById('" + id + "Handle').style.left"); + String actualTip = runScript("document.getElementById('" + id + "Tip').style.left"); Assert.assertEquals(actualHandle, actualTip); Assert.assertTrue(actualTip.endsWith("px"));