Add a test for Grid with GeneratedPropertyContainer (#13334)

Change-Id: If32242828745854c81020405657cc49e13c35bef

diff --git a/uitest/src/com/vaadin/tests/components/grid/GridGeneratedProperties.java b/uitest/src/com/vaadin/tests/components/grid/GridGeneratedProperties.java
new file mode 100644 (file)
index 0000000..6f834bd
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/GridGeneratedProperties.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.grid;
+
+import com.vaadin.data.Container.Filter;
+import com.vaadin.data.Container.Filterable;
+import com.vaadin.data.Container.Indexed;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.GeneratedPropertyContainer;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.data.util.PropertyValueGenerator;
+import com.vaadin.data.util.filter.Compare;
+import com.vaadin.data.util.filter.UnsupportedFilterException;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.components.grid.Grid;
+import com.vaadin.ui.components.grid.sort.Sort;
+import com.vaadin.ui.components.grid.sort.SortOrder;
+
+public class GridGeneratedProperties extends AbstractTestUI {
+
+    private GeneratedPropertyContainer container;
+    static double MILES_CONVERSION = 0.6214d;
+    private Filter filter = new Compare.Greater("miles", 1d);
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        container = new GeneratedPropertyContainer(createContainer());
+        Grid grid = new Grid(container);
+        addComponent(grid);
+
+        container.addGeneratedProperty("miles",
+                new PropertyValueGenerator<Double>() {
+
+                    @Override
+                    public Double getValue(Item item, Object itemId,
+                            Object propertyId) {
+                        return (Double) item.getItemProperty("km").getValue()
+                                * MILES_CONVERSION;
+                    }
+
+                    @Override
+                    public Class<Double> getType() {
+                        return Double.class;
+                    }
+
+                    @Override
+                    public Filter modifyFilter(Filter filter)
+                            throws UnsupportedFilterException {
+                        if (filter instanceof Compare.Greater) {
+                            Double value = (Double) ((Compare.Greater) filter)
+                                    .getValue();
+                            value = value / MILES_CONVERSION;
+                            return new Compare.Greater("km", value);
+                        }
+                        return super.modifyFilter(filter);
+                    }
+                });
+
+        final Button filterButton = new Button("Add filter");
+        filterButton.addClickListener(new ClickListener() {
+
+            boolean active = false;
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                if (active) {
+                    ((Filterable) container).removeContainerFilter(filter);
+                    filterButton.setCaption("Add filter");
+                    active = false;
+                    return;
+                }
+                ((Filterable) container).addContainerFilter(filter);
+                filterButton.setCaption("Remove filter");
+                active = true;
+            }
+        });
+
+        container.addGeneratedProperty("foo",
+                new PropertyValueGenerator<String>() {
+
+                    @Override
+                    public String getValue(Item item, Object itemId,
+                            Object propertyId) {
+                        return item.getItemProperty("foo").getValue() + " "
+                                + item.getItemProperty("bar").getValue();
+                    }
+
+                    @Override
+                    public Class<String> getType() {
+                        return String.class;
+                    }
+
+                    @Override
+                    public SortOrder[] getSortProperties(SortOrder order) {
+                        return Sort.by("bar", order.getDirection()).build()
+                                .toArray(new SortOrder[1]);
+                    }
+                });
+        container.removeContainerProperty("bar");
+
+        addComponent(filterButton);
+    }
+
+    private Indexed createContainer() {
+        Indexed container = new IndexedContainer();
+        container.addContainerProperty("foo", String.class, "foo");
+        container.addContainerProperty("bar", Integer.class, 0);
+        // km contains double values from 0.0 to 2.0
+        container.addContainerProperty("km", Double.class, 0);
+
+        for (int i = 0; i <= 100; ++i) {
+            Object itemId = container.addItem();
+            Item item = container.getItem(itemId);
+            item.getItemProperty("foo").setValue("foo");
+            item.getItemProperty("bar").setValue(i);
+            item.getItemProperty("km").setValue(i / 5.0d);
+        }
+
+        return container;
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "A Grid with GeneratedPropertyContainer";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 13334;
+    }
+
+}
\ No newline at end of file

diff --git a/uitest/src/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java b/uitest/src/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
new file mode 100644 (file)
index 0000000..1a46736
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.grid;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.vaadin.tests.components.grid.GridElement.GridCellElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class GridGeneratedPropertiesTest extends MultiBrowserTest {
+
+    @Test
+    public void testMilesColumnExists() {
+        openTestURL();
+        GridElement grid = $(GridElement.class).first();
+        assertEquals("Miles header wasn't present.", "miles", grid
+                .getHeaderCell(0, 3).getText());
+    }
+
+    @Test
+    public void testSortingGeneratedPropertyColumns() {
+        openTestURL();
+        GridElement grid = $(GridElement.class).first();
+        GridCellElement fooHeader = grid.getHeaderCell(0, 1);
+        fooHeader.click();
+        assertTrue(fooHeader.getAttribute("class").contains("sort-asc"));
+        fooHeader.click();
+        assertTrue(fooHeader.getAttribute("class").contains("sort-desc"));
+        GridCellElement kmHeader = grid.getHeaderCell(0, 2);
+        kmHeader.click();
+        assertTrue(kmHeader.getAttribute("class").contains("sort-asc"));
+        assertFalse(fooHeader.getAttribute("class").contains("sort"));
+        grid.getHeaderCell(0, 3).click();
+        assertTrue(kmHeader.getAttribute("class").contains("sort-asc"));
+        assertFalse(fooHeader.getAttribute("class").contains("sort"));
+    }
+}