8:33 a.m.
Author: konstantin.mishin
Date: 2008-10-23 09:33:13 -0400 (Thu, 23 Oct 2008)
New Revision: 10880
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ListShuttleBean.java
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/layout.xhtml
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/listShuttle/listShuttleTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java
Log:
sourceValue/targetValue updated, listener fire with multiple selection
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ListShuttleBean.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ListShuttleBean.java 2008-10-23
13:21:34 UTC (rev 10879)
+++
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ListShuttleBean.java 2008-10-23
13:33:13 UTC (rev 10880)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import javax.faces.event.ActionEvent;
import javax.faces.event.ValueChangeEvent;
@@ -11,6 +12,10 @@
public class ListShuttleBean {
private List<ListShuttleItem> items = null;
private List<ListShuttleItem> freeItems = null;
+
+ private Set<ListShuttleItem> sourceSelection;
+ private Set<ListShuttleItem> targetSelection;
+
private boolean controlsVisible = true;
private boolean sourceRequired;
@@ -37,6 +42,8 @@
valueChangeListener = false;
string = "something";
valueChangeListener = false;
+ sourceSelection = null;
+ targetSelection = null;
items = new ArrayList<ListShuttleItem>();
freeItems = new ArrayList<ListShuttleItem>();
for (int i = 0; i < 5; i++) {
@@ -148,4 +155,36 @@
string = "value was changed";
}
}
+
+ public void setTargetSelection(Set<ListShuttleItem> targetSelection) {
+ this.targetSelection = targetSelection;
+ }
+
+ public Set<ListShuttleItem> getTargetSelection() {
+ return targetSelection;
+ }
+
+ public Object[] getTargetSelection2() {
+ if (targetSelection != null) {
+ return targetSelection.toArray();
+ } else {
+ return null;
+ }
+ }
+
+ public void setSourceSelection(Set<ListShuttleItem> sourceSelection) {
+ this.sourceSelection = sourceSelection;
+ }
+
+ public Set<ListShuttleItem> getSourceSelection() {
+ return sourceSelection;
+ }
+
+ public Object[] getSourceSelection2() {
+ if (sourceSelection != null) {
+ return sourceSelection.toArray();
+ } else {
+ return null;
+ }
+ }
}
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/layout.xhtml
===================================================================
(Binary files differ)
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/listShuttle/listShuttleTest.xhtml
===================================================================
(Binary files differ)
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java 2008-10-23
13:21:34 UTC (rev 10879)
+++
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java 2008-10-23
13:33:13 UTC (rev 10880)
@@ -9,7 +9,6 @@
import java.util.Map;
import org.ajax4jsf.template.Template;
-import org.richfaces.AutoTester;
import org.richfaces.SeleniumEvent;
import org.richfaces.SeleniumTestBase;
import org.testng.Assert;
@@ -33,6 +32,10 @@
String targetTableId;
+ String sourceSelectionTableId;
+
+ String targetSelectionTableId;
+
String availebleListId;
String targetListId;
@@ -82,6 +85,8 @@
lsId = parentId + "ls";
sourceTableId = parentId + "sourceTableId";
targetTableId = parentId + "targetTableId";
+ sourceSelectionTableId = parentId + "sourceSelectionTableId";
+ targetSelectionTableId = parentId + "targetSelectionTableId";
availebleListId = parentId + "lstbody";
targetListId = parentId + "lstlTbody";
copyAllId = parentId + "lscopyAll";
@@ -128,7 +133,7 @@
}
/**
- * sourceValue/targetValue updated, listener fire
+ * sourceValue/targetValue updated, listener fire with multiple selection
*/
@Test
public void testValuesAndListener(Template template) {
@@ -136,13 +141,25 @@
Assert.assertEquals(getValueById(inputTextId), "something", "Value
of inputText(id='inputTextId') must equal initial
value('something').");
_assertTableRowsCount(sourceTableId, 5);
_assertTableRowsCount(targetTableId, 0);
+ _assertTableRowsCount(sourceSelectionTableId, 0);
+ _assertTableRowsCount(targetSelectionTableId, 0);
+
+ _selectItem(parentId + "ls:0", true);
+ _selectItem(parentId + "ls:2", true);
- clickById(copyAllId);
+ clickById(copyId);
+
+ _selectItem(parentId + "ls:1", true);
+ _selectItem(parentId + "ls:3", true);
+ _selectItem(parentId + "ls:0", true);
+
clickAjaxCommandAndWait(submitId);
Assert.assertEquals(getValueById(inputTextId), "value was changed",
"Value of inputText(id='inputTextId') must equal changed value('value was
changed').");
- _assertTableRowsCount(sourceTableId, 0);
- _assertTableRowsCount(targetTableId, 5);
+ _assertTableRowsCount(sourceTableId, 3);
+ _assertTableRowsCount(targetTableId, 2);
+ _assertTableRowsCount(sourceSelectionTableId, 2);
+ _assertTableRowsCount(targetSelectionTableId, 1);
}
/**
@@ -503,16 +520,20 @@
}
}
- private void _selectItem(String itemId) {
+ private void _selectItem(String itemId, boolean ctrl) {
writeStatus("Select item id: " + itemId);
try {
- fireMouseEvent(itemId, "click", 0, 0, false);
+ fireMouseEvent(itemId, "click", 0, 0, ctrl);
} catch (Exception e) {
writeStatus("Selection item id: " + itemId + "
failed.");
Assert.fail("No item was found. Item id: " + itemId + e);
}
}
+ private void _selectItem(String itemId) {
+ _selectItem(itemId, false);
+ }
+
private void _checkItemText(String text, String listId, int i) {
StringBuffer b = new StringBuffer("$('");
b.append(listId);