Updated test case so the item id is not the same as the sort property.

svn changeset:9024/svn branch:6.1

diff --git a/src/com/vaadin/tests/components/HierarchicalContainerSorting.java b/src/com/vaadin/tests/components/HierarchicalContainerSorting.java
index 4e498d93b66f6ad4fb2d749c6b46d63f1398e34e..6f1352f164930ca19765dd2af89f57d04e3b575f 100644 (file)
--- a/src/com/vaadin/tests/components/HierarchicalContainerSorting.java
+++ b/src/com/vaadin/tests/components/HierarchicalContainerSorting.java
@@ -1,5 +1,8 @@
 package com.vaadin.tests.components;\r
 \r
+import java.util.HashMap;\r
+import java.util.Map;\r
+\r
 import com.vaadin.data.Item;\r
 import com.vaadin.data.util.HierarchicalContainer;\r
 import com.vaadin.data.util.IndexedContainer;\r
@@ -24,10 +27,12 @@ public class HierarchicalContainerSorting extends TestBase {
 \r
         Tree tree1 = new Tree("Tree with IndexedContainer");\r
         tree1.setContainerDataSource(indexedContainer);\r
+        tree1.setItemCaptionPropertyId("name");\r
         hl.addComponent(tree1);\r
 \r
         Tree tree2 = new Tree("Tree with HierarchicalContainer");\r
         tree2.setContainerDataSource(hierarchicalContainer);\r
+        tree2.setItemCaptionPropertyId("name");\r
         for (Object id : tree2.rootItemIds()) {\r
             tree2.expandItemsRecursively(id);\r
         }\r
@@ -74,14 +79,21 @@ public class HierarchicalContainerSorting extends TestBase {
 \r
     }\r
 \r
+    private static int index = 0;\r
+    private static Map<String, Integer> nameToId = new HashMap<String, Integer>();\r
+\r
     public static void addItem(IndexedContainer container, String string,\r
             String parent) {\r
-        Item item = container.addItem(string);\r
+        nameToId.put(string, index);\r
+        Item item = container.addItem(index);\r
         item.getItemProperty("name").setValue(string);\r
 \r
         if (parent != null && container instanceof HierarchicalContainer) {\r
-            ((HierarchicalContainer) container).setParent(string, parent);\r
+            ((HierarchicalContainer) container).setParent(index, nameToId\r
+                    .get(parent));\r
         }\r
+\r
+        index++;\r
     }\r
 \r
     @Override\r