47 files changed, 359 insertions, 109 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeBasicFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeBasicFeatures.java
new file mode 100644
index 0000000000..a2078c237e
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeBasicFeatures.java
@@ -0,0 +1,112 @@
+package com.vaadin.tests.components.tree;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.vaadin.annotations.Theme;
+import com.vaadin.annotations.Widgetset;
+import com.vaadin.data.HierarchyData;
+import com.vaadin.data.provider.InMemoryHierarchicalDataProvider;
+import com.vaadin.icons.VaadinIcons;
+import com.vaadin.server.ClassResource;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.tests.data.bean.HierarchicalTestBean;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.IconGenerator;
+import com.vaadin.ui.MenuBar;
+import com.vaadin.ui.MenuBar.MenuItem;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.VerticalLayout;
+
+@Theme("tests-valo-disabled-animations")
+@Widgetset("com.vaadin.DefaultWidgetSet")
+public class TreeBasicFeatures extends AbstractTestUIWithLog {
+
+    private Tree<HierarchicalTestBean> tree;
+    private InMemoryHierarchicalDataProvider<HierarchicalTestBean> inMemoryDataProvider;
+    private IconGenerator<HierarchicalTestBean> iconGenerator = i -> {
+        switch (i.getDepth()) {
+        case 0:
+            return new ThemeResource("../reindeer/common/icons/bullet.png");
+        case 1:
+            return VaadinIcons.FLIGHT_TAKEOFF;
+        case 2:
+            return new ClassResource("/com/vaadin/tests/m.gif");
+        default:
+            return null;
+        }
+    };
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        VerticalLayout layout = new VerticalLayout();
+        tree = new Tree<>();
+        setupDataProvider();
+        tree.setDataProvider(inMemoryDataProvider);
+
+        tree.addSelectionListener(
+                e -> log("SelectionEvent: " + e.getAllSelectedItems()));
+
+        tree.addExpandListener(e -> log("ExpandEvent: " + e.getExpandedItem()));
+        tree.addCollapseListener(
+                e -> log("ExpandEvent: " + e.getCollapsedItem()));
+
+        layout.addComponents(createMenu(), tree);
+
+        addComponent(layout);
+    }
+
+    private Component createMenu() {
+        MenuBar menu = new MenuBar();
+        menu.setErrorHandler(error -> log("Exception occured, "
+                + error.getThrowable().getClass().getName() + ": "
+                + error.getThrowable().getMessage()));
+        MenuItem componentMenu = menu.addItem("Component", null);
+        createIconMenu(componentMenu.addItem("Icons", null));
+        createCaptionMenu(componentMenu.addItem("Captions", null));
+        return menu;
+    }
+
+    private void createCaptionMenu(MenuItem captionMenu) {
+        captionMenu.addItem("String.valueOf",
+                menu -> tree.setItemCaptionGenerator(String::valueOf));
+        captionMenu
+                .addItem("Custom caption",
+                        menu -> tree.setItemCaptionGenerator(i -> "Id: "
+                                + i.getId() + ", Depth: " + i.getDepth()
+                                + ", Index: " + i.getIndex()));
+    }
+
+    private void createIconMenu(MenuItem iconMenu) {
+        iconMenu.addItem("No icons",
+                menu -> tree.setItemIconGenerator(t -> null));
+        iconMenu.addItem("By Depth",
+                menu -> tree.setItemIconGenerator(iconGenerator));
+    }
+
+    private void setupDataProvider() {
+        HierarchyData<HierarchicalTestBean> data = new HierarchyData<>();
+
+        List<Integer> ints = Arrays.asList(0, 1, 2);
+
+        ints.stream().forEach(index -> {
+            HierarchicalTestBean bean = new HierarchicalTestBean(null, 0,
+                    index);
+            data.addItem(null, bean);
+            ints.stream().forEach(childIndex -> {
+                HierarchicalTestBean childBean = new HierarchicalTestBean(
+                        bean.getId(), 1, childIndex);
+                data.addItem(bean, childBean);
+                ints.stream()
+                        .forEach(grandChildIndex -> data.addItem(childBean,
+                                new HierarchicalTestBean(childBean.getId(), 2,
+                                        grandChildIndex)));
+            });
+        });
+
+        inMemoryDataProvider = new InMemoryHierarchicalDataProvider<>(data);
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treegrid/LazyHierarchicalDataProvider.java b/uitest/src/main/java/com/vaadin/tests/components/treegrid/LazyHierarchicalDataProvider.java
index 33c8f15a47..1fe7202d8a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treegrid/LazyHierarchicalDataProvider.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treegrid/LazyHierarchicalDataProvider.java
@@ -7,7 +7,7 @@ import java.util.stream.Stream;
 
 import com.vaadin.data.provider.AbstractHierarchicalDataProvider;
 import com.vaadin.data.provider.HierarchicalQuery;
-import com.vaadin.tests.components.treegrid.TreeGridBasicFeatures.HierarchicalTestBean;
+import com.vaadin.tests.data.bean.HierarchicalTestBean;
 
 public class LazyHierarchicalDataProvider
         extends AbstractHierarchicalDataProvider<HierarchicalTestBean, Void> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treegrid/TreeGridBasicFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/treegrid/TreeGridBasicFeatures.java
index a8ce0a7489..8151aa8c88 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treegrid/TreeGridBasicFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treegrid/TreeGridBasicFeatures.java
@@ -16,6 +16,7 @@ import com.vaadin.data.provider.InMemoryHierarchicalDataProvider;
 import com.vaadin.server.SerializablePredicate;
 import com.vaadin.shared.Range;
 import com.vaadin.tests.components.AbstractComponentTest;
+import com.vaadin.tests.data.bean.HierarchicalTestBean;
 import com.vaadin.ui.TreeGrid;
 
 @Theme("valo")
@@ -178,75 +179,14 @@ public class TreeGridBasicFeatures extends AbstractComponentTest<TreeGrid> {
     @SuppressWarnings("unchecked")
     private void createListenerMenu() {
         createListenerAction("Collapse listener", "State",
-                treeGrid -> treeGrid.addCollapseListener(event -> log(
-                        "Item collapsed (user originated: "
+                treeGrid -> treeGrid.addCollapseListener(
+                        event -> log("Item collapsed (user originated: "
                                 + event.isUserOriginated() + "): "
                                 + event.getCollapsedItem())));
         createListenerAction("Expand listener", "State",
-                treeGrid -> treeGrid.addExpandListener(event -> log(
-                        "Item expanded (user originated: "
+                treeGrid -> treeGrid.addExpandListener(
+                        event -> log("Item expanded (user originated: "
                                 + event.isUserOriginated() + "): "
                                 + event.getExpandedItem())));
     }
-
-    static class HierarchicalTestBean {
-
-        private final String id;
-        private final int depth;
-        private final int index;
-
-        public HierarchicalTestBean(String parentId, int depth, int index) {
-            id = (parentId == null ? "" : parentId) + "/" + depth + "/" + index;
-            this.depth = depth;
-            this.index = index;
-        }
-
-        public int getDepth() {
-            return depth;
-        }
-
-        public int getIndex() {
-            return index;
-        }
-
-        public String getId() {
-            return id;
-        }
-
-        @Override
-        public String toString() {
-            return depth + " | " + index;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((id == null) ? 0 : id.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            HierarchicalTestBean other = (HierarchicalTestBean) obj;
-            if (id == null) {
-                if (other.id != null) {
-                    return false;
-                }
-            } else if (!id.equals(other.id)) {
-                return false;
-            }
-            return true;
-        }
-
-    }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treegrid/TreeGridScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/treegrid/TreeGridScrolling.java
index 8d859918b8..cc650705a8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treegrid/TreeGridScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treegrid/TreeGridScrolling.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.treegrid;
 import com.vaadin.annotations.Widgetset;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.components.treegrid.TreeGridBasicFeatures.HierarchicalTestBean;
+import com.vaadin.tests.data.bean.HierarchicalTestBean;
 import com.vaadin.ui.TreeGrid;
 
 @Widgetset("com.vaadin.DefaultWidgetSet")
diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/HierarchicalTestBean.java b/uitest/src/main/java/com/vaadin/tests/data/bean/HierarchicalTestBean.java
new file mode 100644
index 0000000000..586d138039
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/data/bean/HierarchicalTestBean.java
@@ -0,0 +1,62 @@
+package com.vaadin.tests.data.bean;
+
+public class HierarchicalTestBean {
+
+    private final String id;
+    private final int depth;
+    private final int index;
+
+    public HierarchicalTestBean(String parentId, int depth, int index) {
+        id = (parentId == null ? "" : parentId) + "/" + depth + "/" + index;
+        this.depth = depth;
+        this.index = index;
+    }
+
+    public int getDepth() {
+        return depth;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public String toString() {
+        return depth + " | " + index;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        HierarchicalTestBean other = (HierarchicalTestBean) obj;
+        if (id == null) {
+            if (other.id != null) {
+                return false;
+            }
+        } else if (!id.equals(other.id)) {
+            return false;
+        }
+        return true;
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/CtrlShiftMultiselect.java
index bc53d0d88f..ca80a31e51 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/CtrlShiftMultiselect.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import java.util.Set;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/DndTreeTargetDetails.java
index 2dc698def5..14a31e2c5a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/DndTreeTargetDetails.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.table.DndTableTargetDetails;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/ExpandCollapseTree.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/ExpandCollapseTree.java
index 08a45e07f9..85765384c0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/ExpandCollapseTree.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/ExpandCollapseTree.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import java.util.Set;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/ItemStyleGenerator.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/ItemStyleGenerator.java
index 8cb1bba8d6..1bd2decea6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/ItemStyleGenerator.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/ItemStyleGenerator.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Component;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/PreselectedTreeVisible.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/PreselectedTreeVisible.java
index 3c08324237..efe46daf88 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/PreselectedTreeVisible.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.v7.ui.Tree;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/SelectItemAfterRemove.java
index 954529cc1f..ef63ab20a5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/SelectItemAfterRemove.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/SimpleTree.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/SimpleTree.java
index d1d295e055..49b790e85a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/SimpleTree.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/SimpleTree.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import java.util.Date;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeConnectors.java
index d06fbb85ee..e44d89fd88 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeConnectors.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeContainerChange.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeContainerChange.java
index be260ef30f..6d9de4c412 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeContainerChange.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeContainerChange.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeDragAndDropFromTable.java
index d83f044de3..90110d39f6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeDragAndDropFromTable.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFiltering.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeFiltering.java
index f4d90d6e9b..e4a39494d1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFiltering.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeFiltering.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeFocusGaining.java
index e3bb8d16e9..9dcc21d6dd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeFocusGaining.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHorizontalResize.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeHorizontalResize.java
index 98289bf4eb..cb948b789e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHorizontalResize.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeHorizontalResize.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import java.util.Iterator;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeHtmlContentAllowed.java
index 106b5771a6..8b5ceaab27 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeHtmlContentAllowed.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeIconUpdate.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeIconUpdate.java
index 03885d2dc5..fc8f6c5726 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeIconUpdate.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeIconUpdate.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.server.Resource;
 import com.vaadin.server.ThemeResource;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeItemClickListening.java
index ffb3f5bebf..8ba84d84db 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeItemClickListening.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeItemDoubleClick.java
index cb235791df..490e857a09 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeItemDoubleClick.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeItemSelectionWithoutImmediate.java
index 1db1b97f16..98c9a8364a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeItemSelectionWithoutImmediate.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeKeyboardNavigationScrolls.java
index c7b32e9d11..e6fc574c4e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeKeyboardNavigationScrolls.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.AlwaysFailValidator;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeKeyboardNavigationToNone.java
index 0ff9d4b444..cacf3ec2e1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeKeyboardNavigationToNone.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeKeyboardNavigationValidators.java
index e9060f2827..d33683d2bb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeKeyboardNavigationValidators.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.AlwaysFailValidator;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeNodeCaptionWrapping.java
index 7d20e53a0d..01b9685215 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeNodeCaptionWrapping.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreePerformanceTest.java
index 81f6539709..d1aa841544 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreePerformanceTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Layout;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeScrolling.java
index c92b9ba252..b893238c66 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeScrolling.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.LegacyWindow;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeScrollingOnRightClick.java
index 1d7bb5720b..4253d3b0d3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeScrollingOnRightClick.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.event.MouseEvents;
 import com.vaadin.server.VaadinRequest;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeScrollingOnSelection.java
index ebb6c8a700..100cbd8e5d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeScrollingOnSelection.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Label;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeToolTips.java
index 03dc8b174a..58fffc82d1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeToolTips.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Component;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeWithIcons.java
index 916866038b..d11140c6e8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeWithIcons.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import java.util.Date;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/Trees.java
index 9694ce66d9..b53c125be3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/Trees.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeBasicFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeBasicFeaturesTest.java
new file mode 100644
index 0000000000..455364eb41
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeBasicFeaturesTest.java
@@ -0,0 +1,133 @@
+package com.vaadin.tests.components.tree;
+
+import java.io.IOException;
+import java.util.function.Predicate;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.openqa.selenium.By;
+
+import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.elements.TreeElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class TreeBasicFeaturesTest extends MultiBrowserTest {
+
+    private static final Predicate<TestBenchElement> THEME_RESOURCE = e -> {
+        return e.isElementPresent(By.tagName("img"))
+                && e.findElement(By.tagName("img")).getAttribute("src")
+                        .contains("bullet.png");
+    };
+    private static final Predicate<TestBenchElement> VAADIN_ICON = e -> {
+        return e.isElementPresent(By.className("v-icon"))
+                && e.findElement(By.className("v-icon")).getAttribute("class")
+                        .contains("Vaadin-Icons");
+    };
+    private static final Predicate<TestBenchElement> CLASS_RESOURCE = e -> {
+        return e.isElementPresent(By.tagName("img"))
+                && e.findElement(By.tagName("img")).getAttribute("src")
+                        .contains("m.gif");
+    };
+
+    @Before
+    public void before() {
+        setDebug(true);
+        openTestURL();
+    }
+
+    @Test
+    public void tree_expand_and_collapse() {
+        TreeElement tree = $(TreeElement.class).first();
+        tree.expand(0);
+        Assert.assertEquals("1 | 0", tree.getItem(1).getText());
+        tree.collapse(0);
+        Assert.assertEquals("0 | 1", tree.getItem(1).getText());
+        assertNoErrorNotifications();
+    }
+
+    @Test
+    public void tree_expand_all() throws IOException {
+        expandAll();
+        assertAllExpanded(false);
+        assertNoErrorNotifications();
+    }
+
+    @Test
+    // TODO: Re-enable once cache issue is fixed.
+    @Ignore("Recent change to cache invalidation broke resource clean up.")
+    public void tree_expand_all_with_icons() throws IOException {
+        selectMenuPath("Component", "Icons", "By Depth");
+        Assert.assertTrue("Icon not present", $(TreeElement.class).first()
+                .getItem(0).isElementPresent(By.tagName("img")));
+        expandAll();
+        assertAllExpanded(true);
+        assertNoErrorNotifications();
+    }
+
+    private void expandAll() {
+        TreeElement tree = $(TreeElement.class).first();
+        for (int i = 0; i < 2; ++i) {
+            int max = tree.getAllItems().size();
+            for (int j = 1; j <= max; ++j) {
+                if (tree.isExpanded(max - j)) {
+                    continue;
+                }
+                tree.expand(max - j);
+            }
+        }
+    }
+
+    private void assertAllExpanded(boolean shouldHaveIcon) {
+        TreeElement tree = $(TreeElement.class).first();
+        TestBenchElement item;
+        int n = 0;
+        for (int i = 0; i < 3; ++i) {
+            item = tree.getItem(n++);
+            Assert.assertEquals("0 | " + i, item.getText());
+
+            Assert.assertEquals("Unexpected icon state", shouldHaveIcon,
+                    THEME_RESOURCE.test(item));
+
+            for (int j = 0; j < 3; ++j) {
+                item = tree.getItem(n++);
+                Assert.assertEquals((shouldHaveIcon ? " " : "") + "1 | " + j,
+                        item.getText());
+
+                Assert.assertEquals("Unexpected icon state", shouldHaveIcon,
+                        VAADIN_ICON.test(item));
+
+                for (int k = 0; k < 3; ++k) {
+                    item = tree.getItem(n++);
+                    Assert.assertEquals("2 | " + k, item.getText());
+
+                    Assert.assertEquals("Unexpected icon state", shouldHaveIcon,
+                            CLASS_RESOURCE.test(item));
+                }
+            }
+        }
+    }
+
+    @Test
+    public void tree_custom_caption() {
+        selectMenuPath("Component", "Captions", "Custom caption");
+        TreeElement tree = $(TreeElement.class).first();
+        Assert.assertEquals("Id: /0/0, Depth: 0, Index: 0",
+                tree.getItem(0).getText());
+        Assert.assertEquals("Id: /0/1, Depth: 0, Index: 1",
+                tree.getItem(1).getText());
+        tree.expand(0);
+        Assert.assertEquals("Id: /0/0/1/0, Depth: 1, Index: 0",
+                tree.getItem(1).getText());
+        Assert.assertEquals("Id: /0/0/1/1, Depth: 1, Index: 1",
+                tree.getItem(2).getText());
+        tree.expand(1);
+        Assert.assertEquals("Id: /0/0/1/0/2/0, Depth: 2, Index: 0",
+                tree.getItem(2).getText());
+        Assert.assertEquals("Id: /0/0/1/0/2/1, Depth: 2, Index: 1",
+                tree.getItem(3).getText());
+
+        assertNoErrorNotifications();
+    }
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java b/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
index 2bceb905c4..0e92945190 100644
--- a/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
@@ -8,8 +8,8 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.TreeElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.elements.TreeElement;
 
 public class DnDOnSubtreeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/elements/CompatibilityElementComponentGetCaptionBaseTest.java b/uitest/src/test/java/com/vaadin/tests/elements/CompatibilityElementComponentGetCaptionBaseTest.java
index e1e8c6ddaa..a44534102f 100644
--- a/uitest/src/test/java/com/vaadin/tests/elements/CompatibilityElementComponentGetCaptionBaseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/elements/CompatibilityElementComponentGetCaptionBaseTest.java
@@ -30,10 +30,10 @@ import com.vaadin.testbench.elements.OptionGroupElement;
 import com.vaadin.testbench.elements.TableElement;
 import com.vaadin.testbench.elements.TextAreaElement;
 import com.vaadin.testbench.elements.TextFieldElement;
-import com.vaadin.testbench.elements.TreeElement;
 import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.testbench.elements.TwinColSelectElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.elements.TreeElement;
 
 /**
  *
diff --git a/uitest/src/test/java/com/vaadin/tests/elements/TreeElementGetValueTest.java b/uitest/src/test/java/com/vaadin/tests/elements/TreeElementGetValueTest.java
index c7c0915dee..151992ce63 100644
--- a/uitest/src/test/java/com/vaadin/tests/elements/TreeElementGetValueTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/elements/TreeElementGetValueTest.java
@@ -19,8 +19,8 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.testbench.elements.TreeElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.elements.TreeElement;
 
 public class TreeElementGetValueTest extends MultiBrowserTest {
     @Before
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/DndTreeTargetDetailsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/DndTreeTargetDetailsTest.java
index e82701f3a5..428a398997 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/DndTreeTargetDetailsTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/DndTreeTargetDetailsTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import org.openqa.selenium.WebElement;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/SelectItemAfterRemoveTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/SelectItemAfterRemoveTest.java
index bb42cb0ad7..f94b04049f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/SelectItemAfterRemoveTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/SelectItemAfterRemoveTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeContextMenuAndIconsTest.java
index 873fe30b65..c404066473 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeContextMenuAndIconsTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import java.util.List;
 
@@ -26,6 +26,7 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.By;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.components.tree.Trees;
 
 public class TreeContextMenuAndIconsTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeHtmlContentAllowedTest.java
index 613100078e..e0a5cb766b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeHtmlContentAllowedTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import java.util.List;
 
@@ -23,8 +23,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.TreeElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.elements.TreeElement;
 
 public class TreeHtmlContentAllowedTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeItemClickListeningTest.java
index f9df790205..87fc58d3bb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeItemClickListeningTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeItemDoubleClickTest.java
index 0f641c5541..1acc9f2860 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeItemDoubleClickTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java
index a91dad96a3..971bcb1619 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -24,6 +24,7 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.components.tree.TreeItemSelectionWithoutImmediate;
 
 public class TreeItemSelectionWithoutImmediateTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNoneTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeKeyboardNavigationToNoneTest.java
index ecafa27f48..8e84096aae 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNoneTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeKeyboardNavigationToNoneTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeScrollingOnRightClickTest.java
index 57ea640cf0..573a08e187 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeScrollingOnRightClickTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.components.tree;
+package com.vaadin.v7.tests.components.tree;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,6 +25,7 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.components.tree.TreeScrollingOnRightClick;
 
 /**
  *