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

svn changeset:9024/svn branch:6.1

1 files changed, 14 insertions, 2 deletions

diff --git a/src/com/vaadin/tests/components/HierarchicalContainerSorting.java b/src/com/vaadin/tests/components/HierarchicalContainerSorting.java
index 4e498d93b6..6f1352f164 100644
--- 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;

 

+import java.util.HashMap;

+import java.util.Map;

+

 import com.vaadin.data.Item;

 import com.vaadin.data.util.HierarchicalContainer;

 import com.vaadin.data.util.IndexedContainer;

@@ -24,10 +27,12 @@ public class HierarchicalContainerSorting extends TestBase {
 

         Tree tree1 = new Tree("Tree with IndexedContainer");

         tree1.setContainerDataSource(indexedContainer);

+        tree1.setItemCaptionPropertyId("name");

         hl.addComponent(tree1);

 

         Tree tree2 = new Tree("Tree with HierarchicalContainer");

         tree2.setContainerDataSource(hierarchicalContainer);

+        tree2.setItemCaptionPropertyId("name");

         for (Object id : tree2.rootItemIds()) {

             tree2.expandItemsRecursively(id);

         }

@@ -74,14 +79,21 @@ public class HierarchicalContainerSorting extends TestBase {
 

     }

 

+    private static int index = 0;

+    private static Map<String, Integer> nameToId = new HashMap<String, Integer>();

+

     public static void addItem(IndexedContainer container, String string,

             String parent) {

-        Item item = container.addItem(string);

+        nameToId.put(string, index);

+        Item item = container.addItem(index);

         item.getItemProperty("name").setValue(string);

 

         if (parent != null && container instanceof HierarchicalContainer) {

-            ((HierarchicalContainer) container).setParent(string, parent);

+            ((HierarchicalContainer) container).setParent(index, nameToId

+                    .get(parent));

         }

+

+        index++;

     }

 

     @Override