From 9abe5d77bf5a14c0ca8aaed941cd22fd3053742d Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Tue, 16 Mar 2010 08:29:16 +0000
Subject: [PATCH] Test case for #4350 (ContainerHierarchicalWrapper).

svn changeset:11902/svn branch:6.3
---
 .../container/AbstractContainerTest.java      |  4 +--
 .../AbstractHierarchicalContainerTest.java    | 14 +++++------
 .../TestContainerHierarchicalWrapper.java     | 25 +++++++++++++++++++
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java b/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java
index e20f54dc39..f7f6ccbd47 100644
--- a/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java
+++ b/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java
@@ -220,7 +220,7 @@ public abstract class AbstractContainerTest extends TestCase {
                 new boolean[] { true });
 
         validateContainer(container, "com.vaadin.Application",
-                "com.vaadin.util.SerializerHelper",
+                "org.vaadin.test.LastClass",
                 "com.vaadin.terminal.ApplicationResource", "blah",
                 sampleData.length);
 
@@ -504,6 +504,6 @@ public abstract class AbstractContainerTest extends TestCase {
             "com.vaadin.ui.Tree", "com.vaadin.ui.TwinColSelect",
             "com.vaadin.ui.Upload", "com.vaadin.ui.UriFragmentUtility",
             "com.vaadin.ui.VerticalLayout", "com.vaadin.ui.Window",
-            "com.vaadin.util.SerializerHelper" };
+            "com.vaadin.util.SerializerHelper", "org.vaadin.test.LastClass" };
 
 }
diff --git a/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java b/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java
index a85e0dd34b..16b7e49c60 100644
--- a/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java
+++ b/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java
@@ -139,12 +139,12 @@ public class AbstractHierarchicalContainerTest extends AbstractContainerTest {
     protected void testHierarchicalContainer(Container.Hierarchical container) {
         initializeContainer(container);
 
-        int packages = 21;
+        int packages = 21 + 3;
         int expectedSize = sampleData.length + packages;
         validateHierarchicalContainer(container, "com",
-                "com.vaadin.util.SerializerHelper",
+                "org.vaadin.test.LastClass",
                 "com.vaadin.terminal.ApplicationResource", "blah",
-                expectedSize, 1, true);
+                expectedSize, 2, true);
 
     }
 
@@ -162,12 +162,12 @@ public class AbstractHierarchicalContainerTest extends AbstractContainerTest {
         sortable.sort(new Object[] { FULLY_QUALIFIED_NAME },
                 new boolean[] { true });
 
-        int packages = 21;
+        int packages = 21 + 3;
         int expectedSize = sampleData.length + packages;
         validateHierarchicalContainer(container, "com",
-                "com.vaadin.util.SerializerHelper",
+                "org.vaadin.test.LastClass",
                 "com.vaadin.terminal.ApplicationResource", "blah",
-                expectedSize, 1, true);
+                expectedSize, 2, true);
 
         sortable.sort(new Object[] { REVERSE_FULLY_QUALIFIED_NAME },
                 new boolean[] { true });
@@ -176,7 +176,7 @@ public class AbstractHierarchicalContainerTest extends AbstractContainerTest {
                 "com.vaadin.terminal.gwt.server.ApplicationPortlet2",
                 "com.vaadin.data.util.ObjectProperty",
                 "com.vaadin.terminal.ApplicationResource", "blah",
-                expectedSize, 1, true);
+                expectedSize, 2, true);
 
     }
 
diff --git a/tests/src/com/vaadin/tests/server/container/TestContainerHierarchicalWrapper.java b/tests/src/com/vaadin/tests/server/container/TestContainerHierarchicalWrapper.java
index 0ac5e76c64..fdd2618aab 100644
--- a/tests/src/com/vaadin/tests/server/container/TestContainerHierarchicalWrapper.java
+++ b/tests/src/com/vaadin/tests/server/container/TestContainerHierarchicalWrapper.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.container;
 
+import java.util.Collection;
+
 import com.vaadin.data.util.ContainerHierarchicalWrapper;
 import com.vaadin.data.util.IndexedContainer;
 
@@ -16,4 +18,27 @@ public class TestContainerHierarchicalWrapper extends
                 new IndexedContainer()));
     }
 
+    public void testRemoveSubtree() {
+        testRemoveHierarchicalWrapperSubtree(new ContainerHierarchicalWrapper(
+                new IndexedContainer()));
+    }
+
+    protected void testRemoveHierarchicalWrapperSubtree(
+            ContainerHierarchicalWrapper container) {
+        initializeContainer(container);
+
+        // remove root item
+        container.removeItemRecursively("org");
+
+        int packages = 21 + 3 - 3;
+        int expectedSize = sampleData.length + packages - 1;
+
+        validateContainer(container, "com", "com.vaadin.util.SerializerHelper",
+                "com.vaadin.terminal.ApplicationResource", "blah", expectedSize);
+
+        // rootItemIds
+        Collection<?> rootIds = container.rootItemIds();
+        assertEquals(1, rootIds.size());
+    }
+
 }
-- 
2.39.5