Test case for #4350 (ContainerHierarchicalWrapper).

svn changeset:11902/svn branch:6.3

diff --git a/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java b/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java
index e20f54dc3904fcde4e9c424611490006cb851024..f7f6ccbd47375c3bb2eae5732fccdb8111aea27f 100644 (file)
--- 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 });\r
 \r
         validateContainer(container, "com.vaadin.Application",\r
-                "com.vaadin.util.SerializerHelper",\r
+                "org.vaadin.test.LastClass",\r
                 "com.vaadin.terminal.ApplicationResource", "blah",\r
                 sampleData.length);\r
 \r
@@ -504,6 +504,6 @@ public abstract class AbstractContainerTest extends TestCase {
             "com.vaadin.ui.Tree", "com.vaadin.ui.TwinColSelect",\r
             "com.vaadin.ui.Upload", "com.vaadin.ui.UriFragmentUtility",\r
             "com.vaadin.ui.VerticalLayout", "com.vaadin.ui.Window",\r
-            "com.vaadin.util.SerializerHelper" };\r
+            "com.vaadin.util.SerializerHelper", "org.vaadin.test.LastClass" };\r
 \r
 }\r

diff --git a/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java b/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java
index a85e0dd34b228c938868c552e815ce2c0a0ec826..16b7e49c60f4b78f3d15861d8408008f81d0b0a5 100644 (file)
--- 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) {\r
         initializeContainer(container);\r
 \r
-        int packages = 21;\r
+        int packages = 21 + 3;\r
         int expectedSize = sampleData.length + packages;\r
         validateHierarchicalContainer(container, "com",\r
-                "com.vaadin.util.SerializerHelper",\r
+                "org.vaadin.test.LastClass",\r
                 "com.vaadin.terminal.ApplicationResource", "blah",\r
-                expectedSize, 1, true);\r
+                expectedSize, 2, true);\r
 \r
     }\r
 \r
@@ -162,12 +162,12 @@ public class AbstractHierarchicalContainerTest extends AbstractContainerTest {
         sortable.sort(new Object[] { FULLY_QUALIFIED_NAME },\r
                 new boolean[] { true });\r
 \r
-        int packages = 21;\r
+        int packages = 21 + 3;\r
         int expectedSize = sampleData.length + packages;\r
         validateHierarchicalContainer(container, "com",\r
-                "com.vaadin.util.SerializerHelper",\r
+                "org.vaadin.test.LastClass",\r
                 "com.vaadin.terminal.ApplicationResource", "blah",\r
-                expectedSize, 1, true);\r
+                expectedSize, 2, true);\r
 \r
         sortable.sort(new Object[] { REVERSE_FULLY_QUALIFIED_NAME },\r
                 new boolean[] { true });\r
@@ -176,7 +176,7 @@ public class AbstractHierarchicalContainerTest extends AbstractContainerTest {
                 "com.vaadin.terminal.gwt.server.ApplicationPortlet2",\r
                 "com.vaadin.data.util.ObjectProperty",\r
                 "com.vaadin.terminal.ApplicationResource", "blah",\r
-                expectedSize, 1, true);\r
+                expectedSize, 2, true);\r
 \r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/server/container/TestContainerHierarchicalWrapper.java b/tests/src/com/vaadin/tests/server/container/TestContainerHierarchicalWrapper.java
index 0ac5e76c649d2397cca0796b9ad7866867b6a455..fdd2618aabde9bc2e4daaa900a08b21bdfc1f673 100644 (file)
--- 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;\r
 \r
+import java.util.Collection;\r
+\r
 import com.vaadin.data.util.ContainerHierarchicalWrapper;\r
 import com.vaadin.data.util.IndexedContainer;\r
 \r
@@ -16,4 +18,27 @@ public class TestContainerHierarchicalWrapper extends
                 new IndexedContainer()));\r
     }\r
 \r
+    public void testRemoveSubtree() {\r
+        testRemoveHierarchicalWrapperSubtree(new ContainerHierarchicalWrapper(\r
+                new IndexedContainer()));\r
+    }\r
+\r
+    protected void testRemoveHierarchicalWrapperSubtree(\r
+            ContainerHierarchicalWrapper container) {\r
+        initializeContainer(container);\r
+\r
+        // remove root item\r
+        container.removeItemRecursively("org");\r
+\r
+        int packages = 21 + 3 - 3;\r
+        int expectedSize = sampleData.length + packages - 1;\r
+\r
+        validateContainer(container, "com", "com.vaadin.util.SerializerHelper",\r
+                "com.vaadin.terminal.ApplicationResource", "blah", expectedSize);\r
+\r
+        // rootItemIds\r
+        Collection<?> rootIds = container.rootItemIds();\r
+        assertEquals(1, rootIds.size());\r
+    }\r
+\r
 }\r