Author: konstantin.mishin Date: 2008-11-13 10:46:11 -0500 (Thu, 13 Nov 2008) New Revision: 11149 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/OrderingListTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/model/ListShuttleItem.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/orderingList/orderingListTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java Log: RF-4893 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/OrderingListTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/OrderingListTestBean.java 2008-11-13 14:56:39 UTC (rev 11148) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/OrderingListTestBean.java 2008-11-13 15:46:11 UTC (rev 11149) @@ -21,21 +21,19 @@ package org.ajax4jsf.bean; -import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; -import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; -import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; +import org.ajax4jsf.model.ListShuttleItem; + public class OrderingListTestBean { - private Converter converter; - private List<Item> items; - private Collection<Item> selection; + private List<ListShuttleItem> items; + private Collection<ListShuttleItem> selection; private Object activeItem; private Boolean orderControlsVisible; @@ -49,12 +47,11 @@ } public void init() { - converter = new ItemConverter(); - items = new ArrayList<Item>(); + items = new ArrayList<ListShuttleItem>(); for (int i = 0; i < 4; i++) { - items.add(new Item("item" + i)); + items.add(new ListShuttleItem(i, "item" + i)); } - selection = new HashSet<Item>(); + selection = new LinkedHashSet<ListShuttleItem>(); orderControlsVisible = true; showButtonLabels = true; setRendered(true); @@ -66,11 +63,11 @@ return FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("actionResult"); } - public Collection<Item> getSelection() { + public Collection<ListShuttleItem> getSelection() { return selection; } - public void setSelection(Collection<Item> selection) { + public void setSelection(Collection<ListShuttleItem> selection) { this.selection = selection; } @@ -82,26 +79,18 @@ this.activeItem = activeItem; } - public Converter getConverter() { - return converter; - } - - public void setConverter(Converter converter) { - this.converter = converter; - } - - public List<Item> getItems() { + public List<ListShuttleItem> getItems() { return items; } - public void setItems(List<Item> items) { + public void setItems(List<ListShuttleItem> items) { this.items = items; } public String getSelectionString() { StringBuffer buff = new StringBuffer(); - for (Iterator<Item> it = selection.iterator(); it.hasNext();) { - Item item = it.next(); + for (Iterator<ListShuttleItem> it = selection.iterator(); it.hasNext();) { + ListShuttleItem item = it.next(); buff.append(item.getName()); if (it.hasNext()) { buff.append(','); @@ -154,81 +143,4 @@ public Boolean getImmediate() { return immediate; } - - - private class ItemConverter implements Converter { - - /* (non-Javadoc) - * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String) - */ - public Object getAsObject(FacesContext context, UIComponent component, - String value) { - return new Item(value); - } - - /* (non-Javadoc) - * @see javax.faces.convert.Converter#getAsString(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object) - */ - public String getAsString(FacesContext context, UIComponent component, - Object value) { - Item optionItem = (Item) value; - return optionItem.getName(); - } - - } - - public class Item implements Serializable { - - private static final long serialVersionUID = 1083694594537030790L; - - private String name; - - public String action() { - FacesContext.getCurrentInstance().getExternalContext().getSessionMap().put("actionResult", name); - return null; - } - - public Item(String name) { - super(); - this.name = name; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String toString() { - return this.getClass().getSimpleName() + " [" + name + "]"; - } - - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - return result; - } - - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Item other = (Item) obj; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) - return false; - - return true; - } - - } - } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/model/ListShuttleItem.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/model/ListShuttleItem.java 2008-11-13 14:56:39 UTC (rev 11148) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/model/ListShuttleItem.java 2008-11-13 15:46:11 UTC (rev 11149) @@ -2,6 +2,8 @@ import java.io.Serializable; +import javax.faces.context.FacesContext; + public class ListShuttleItem implements Serializable { private static final long serialVersionUID = -7540977992693127759L; @@ -73,7 +75,8 @@ return name.hashCode() + numder; } - - - + public String action() { + FacesContext.getCurrentInstance().getExternalContext().getSessionMap().put("actionResult", name); + return null; + } } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/orderingList/orderingListTest.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java 2008-11-13 14:56:39 UTC (rev 11148) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java 2008-11-13 15:46:11 UTC (rev 11149) @@ -77,6 +77,16 @@ private String immediateId; /** + * converter defined by component attribute and configured at application level works + */ + @Test + public void testConverter(Template template) { + renderPage(template, initMethod); + initFields(); + AssertValueEquals(orderingListId + ":0StateInput", "0:0:item0", "Converter doesn't work."); + } + + /** * keyboard navigation works for component */ @Test @@ -321,7 +331,7 @@ clickById(ajax); waitForAjaxCompletion(); AssertTextEquals(actionResultText, "item0"); - AssertTextEquals(selectionText, "item0,item2"); + AssertTextEquals(selectionText, "item2,item0"); //AssertTextEquals(activeItemText, "Item [item0]"); writeStatus("Select one row");