Author: ppitonak(a)redhat.com Date: 2011-08-16 12:07:23 -0400 (Tue, 16 Aug 2011) New Revision: 22636 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInputFAjax.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java Log: issue tracking info added Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-08-16 14:00:20 UTC (rev 22635) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-08-16 16:07:23 UTC (rev 22636) @@ -141,7 +141,6 @@ * @param millis * number of miliseconds for which the thread will sleep */ - @Deprecated protected void waitFor(long millis) { try { Thread.sleep(millis); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java 2011-08-16 14:00:20 UTC (rev 22635) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java 2011-08-16 16:07:23 UTC (rev 22636) @@ -235,6 +235,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-11313") public void testConverterMessage() { JQueryLocator message = pjq("span[id$=msg] .rf-msg-det"); @@ -871,6 +872,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10980") public void testTabindexInput() { testHtmlAttribute(input, "tabindex", "99"); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInputFAjax.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInputFAjax.java 2011-08-16 14:00:20 UTC (rev 22635) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInputFAjax.java 2011-08-16 16:07:23 UTC (rev 22636) @@ -49,8 +49,6 @@ private JQueryLocator label = pjq("span.rf-ii-lbl"); private JQueryLocator input = pjq("input[id$=inplaceInputInput]"); private JQueryLocator edit = pjq("span.rf-ii-fld-cntr"); - private JQueryLocator okButton = pjq("input.rf-ii-btn[id$=Okbtn]"); - private JQueryLocator cancelButton = pjq("input.rf-ii-btn[id$=Cancelbtn]"); private JQueryLocator output = pjq("span[id$=output]"); @Override @@ -61,22 +59,25 @@ @Test public void testClick() { guardNoRequest(selenium).click(inplaceInput); - assertFalse(selenium.belongsClass(edit, "rf-ii-none"), "Edit should not contain class rf-ii-none when popup is open."); + assertFalse(selenium.belongsClass(edit, "rf-ii-none"), + "Edit should not contain class rf-ii-none when popup is open."); assertTrue(selenium.isDisplayed(input), "Input should be displayed."); selenium.type(input, "new value"); selenium.fireEvent(input, Event.BLUR); assertTrue(selenium.belongsClass(inplaceInput, "rf-ii-chng"), "New class should be added to inplace input."); - assertTrue(selenium.belongsClass(edit, "rf-ii-none"), "Edit should contain class rf-ii-none when popup is closed."); + assertTrue(selenium.belongsClass(edit, "rf-ii-none"), + "Edit should contain class rf-ii-none when popup is closed."); assertEquals(selenium.getText(label), "new value", "Label should contain selected value."); - assertEquals(selenium.getText(output), "new value", "Output did not change."); - + waitGui.failWith("Output did not change.").until(textEquals.locator(output).text("new value")); + String listenerText = selenium.getText(jq("div#phasesPanel li:eq(3)")); - assertEquals(listenerText, "*1 value changed: RichFaces 4 -> new value", "Value change listener was not invoked."); + assertEquals(listenerText, "*1 value changed: RichFaces 4 -> new value", + "Value change listener was not invoked."); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, - PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); + PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "value changed: RichFaces 4 -> new value"); } } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java 2011-08-16 14:00:20 UTC (rev 22635) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java 2011-08-16 16:07:23 UTC (rev 22636) @@ -112,6 +112,7 @@ @Test @Override + @IssueTracking("https://issues.jboss.org/browse/RF-11314") public void testClick() { super.testClick(); } @@ -182,7 +183,7 @@ selenium.click(selectOption); selenium.waitForPageToLoad(); - AttributeLocator disabledAttribute = input.getAttribute(new Attribute("disabled")); + AttributeLocator<?> disabledAttribute = input.getAttribute(new Attribute("disabled")); assertEquals(selenium.getAttribute(disabledAttribute), "disabled", "Input should be disabled."); assertFalse(selenium.isElementPresent(handle), "Handle should not be present on the page."); @@ -198,7 +199,7 @@ selenium.click(selectOption); selenium.waitForPageToLoad(); - AttributeLocator readonlyAttribute = input.getAttribute(new Attribute("readonly")); + AttributeLocator<?> readonlyAttribute = input.getAttribute(new Attribute("readonly")); assertEquals(selenium.getAttribute(readonlyAttribute), "readonly", "Input should be read-only."); testClick(); @@ -306,7 +307,7 @@ selenium.type(selectOption, "2"); selenium.waitForPageToLoad(); - AttributeLocator sizeAttribute = input.getAttribute(new Attribute("size")); + AttributeLocator<?> sizeAttribute = input.getAttribute(new Attribute("size")); assertEquals(selenium.getAttribute(sizeAttribute), "2", "Input's size attribute."); selenium.type(selectOption, "40"); @@ -363,7 +364,7 @@ selenium.type(pjq("input[type=text][id$=maxlengthInput]"), "5"); selenium.waitForPageToLoad(); - AttributeLocator attr = input.getAttribute(Attribute.MAXLENGTH); + AttributeLocator<?> attr = input.getAttribute(Attribute.MAXLENGTH); assertEquals(selenium.getAttribute(attr), "5", "Attribute maxlength of input."); selenium.type(pjq("input[type=text][id$=maxlengthInput]"), ""); @@ -617,7 +618,7 @@ selenium.type(pjq("input[id$=tabindexInput]"), "55"); selenium.waitForPageToLoad(TIMEOUT); - AttributeLocator attr = track.getAttribute(new Attribute("tabindex")); + AttributeLocator<?> attr = track.getAttribute(new Attribute("tabindex")); assertTrue(selenium.isAttributePresent(attr), "Attribute tabindex of track is not present."); assertEquals(selenium.getAttribute(attr), "55", "Attribute tabindex of track.");