Author: jjamrich
Date: 2011-08-17 19:40:05 -0400 (Wed, 17 Aug 2011)
New Revision: 22646
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
Log:
RFPL-1612: add tests for value attr. for pickList and add routine to select item by text
value
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-08-17
23:39:47 UTC (rev 22645)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-08-17
23:40:05 UTC (rev 22646)
@@ -30,7 +30,6 @@
import java.net.URL;
import org.jboss.test.selenium.locator.Attribute;
-import org.jboss.test.selenium.locator.AttributeLocator;
import org.jboss.test.selenium.locator.JQueryLocator;
import org.jboss.test.selenium.utils.URLUtils;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
@@ -549,16 +548,11 @@
@Test
public void testValueChangeListener() {
-<<<<<<< HEAD
addItem("richfaces"); //
-=======
- addItem(53); // "richfaces"
->>>>>>> RFPL-1621: Add test for valueChangeListener attribute on
pickList
selenium.click(a4jSubmit);
// valueChangeListener output as 4th record
-<<<<<<< HEAD
waitModel.until(textEquals.locator(phaseListenerFormat.format(3))
.text(format(phaseListenerLogFormat, "[]",
"[richfaces]")));
@@ -568,19 +562,15 @@
// valueChangeListener output as 4th record
waitModel.until(textEquals.locator(phaseListenerFormat.format(3))
.text(format(phaseListenerLogFormat, "[richfaces]",
"[richfaces, Alabama]")));
-=======
- String listenerText = selenium.getText(phaseListenerFormat.format(3));
- assertEquals(listenerText, format(phaseListenerLogFormat, "[]",
"[richfaces]"),
- "Value change listener was not invoked or not in expected order");
+ .text(format(phaseListenerLogFormat, "[]",
"[richfaces]")));
- addItem(0);
+ addItem("Alabama");
selenium.click(a4jSubmit);
// valueChangeListener output as 4th record
listenerText = selenium.getText(phaseListenerFormat.format(3));
assertEquals(listenerText, format(phaseListenerLogFormat,
"[richfaces]", "[richfaces, Alabama]"),
"Value change listener was not invoked or not in expected order");
->>>>>>> RFPL-1621: Add test for valueChangeListener attribute on
pickList
}
/**
Show replies by date