Added test for ContainerHierarchicalWrapper

svn changeset:11481/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 1fad034fd11e45d8825020d4546ee5280be34d63..f56a7884861e87348a67314bcf033ce25bb10940 100644 (file)
--- a/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java
+++ b/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java
@@ -85,7 +85,7 @@ public abstract class AbstractContainerTest extends TestCase {
     protected static final Object PROP2 = "PROP2";\r
     protected static final Object PROP3 = "PROP3";\r
 \r
-    protected void testBasicContainerOperations(Container.Filterable container) {\r
+    protected void testBasicContainerOperations(Container container) {\r
         initializeContainer(container);\r
 \r
         // Basic container\r

diff --git a/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java b/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java
index d1386aa9b4fc5d8d4e97bccb57234346a42f9a4b..12037259fd94982cd7fca3e9a8dd7c7b9be4e67c 100644 (file)
--- a/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java
+++ b/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java
@@ -8,6 +8,7 @@ import com.vaadin.data.Container.Hierarchical;
 import com.vaadin.data.Container.Sortable;\r
 \r
 public class AbstractHierarchicalContainerTest extends AbstractContainerTest {\r
+\r
     private void validateHierarchicalContainer(Hierarchical container,\r
             Object expectedFirstItemId, Object expectedLastItemId,\r
             Object itemIdInSet, Object itemIdNotInSet, int expectedSize,\r
@@ -44,19 +45,19 @@ public class AbstractHierarchicalContainerTest extends AbstractContainerTest {
             }\r
         }\r
 \r
-        // isRoot should return false for unknown items (#4215)\r
+        // isRoot should return false for unknown items\r
         assertFalse(container.isRoot(itemIdNotInSet));\r
 \r
         // hasChildren should return false for unknown items\r
         assertFalse(container.hasChildren(itemIdNotInSet));\r
 \r
-        // areChildrenAllowed should return false for unknown items (#4216)\r
+        // areChildrenAllowed should return false for unknown items\r
         assertFalse(container.areChildrenAllowed(itemIdNotInSet));\r
 \r
         // removeItem of unknown items should return false\r
         assertFalse(container.removeItem(itemIdNotInSet));\r
 \r
-        assertEquals(countNodes(container), expectedSize);\r
+        assertEquals(expectedSize, countNodes(container));\r
 \r
         validateHierarchy(container);\r
     }\r
@@ -158,8 +159,7 @@ public class AbstractHierarchicalContainerTest extends AbstractContainerTest {
         validateHierarchicalContainer(container,\r
                 "com.vaadin.data.BufferedValidatable",\r
                 "com.vaadin.ui.TabSheet",\r
-                "com.vaadin.terminal.gwt.client.Focusable",\r
-                "com.vaadin.data.Buffered", 20, 0);\r
+                "com.vaadin.terminal.gwt.client.Focusable", "blah", 20, 0);\r
 \r
         // filter out every second item except hierarchy items\r
         filterable.removeAllContainerFilters();\r
@@ -179,20 +179,6 @@ public class AbstractHierarchicalContainerTest extends AbstractContainerTest {
                 "com.vaadin.data.util.IndexedContainer",\r
                 "com.vaadin.terminal.gwt.client.ui.VUriFragmentUtility",\r
                 packages + other, 0);\r
-        //\r
-        // int packages = 21;\r
-        // validateHierarchicalContainer(container, "com",\r
-        // "com.vaadin.util.SerializerHelper",\r
-        // "com.vaadin.terminal.ApplicationResource", "blah",\r
-        // sampleData.length + packages, 1);\r
-        //\r
-        // sortable.sort(new Object[] { PROP2 }, new boolean[] { true });\r
-        //\r
-        // validateHierarchicalContainer(container,\r
-        // "com.vaadin.terminal.gwt.server.ApplicationPortlet2",\r
-        // "com.vaadin.data.util.ObjectProperty",\r
-        // "com.vaadin.terminal.ApplicationResource", "blah",\r
-        // sampleData.length + packages, 1);\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
new file mode 100644 (file)
index 0000000..0ac5e76
--- /dev/null
+++ b/tests/src/com/vaadin/tests/server/container/TestContainerHierarchicalWrapper.java
@@ -0,0 +1,19 @@
+package com.vaadin.tests.server.container;\r
+\r
+import com.vaadin.data.util.ContainerHierarchicalWrapper;\r
+import com.vaadin.data.util.IndexedContainer;\r
+\r
+public class TestContainerHierarchicalWrapper extends\r
+        AbstractHierarchicalContainerTest {\r
+\r
+    public void testBasicOperations() {\r
+        testBasicContainerOperations(new ContainerHierarchicalWrapper(\r
+                new IndexedContainer()));\r
+    }\r
+\r
+    public void testHierarchicalContainer() {\r
+        testHierarchicalContainer(new ContainerHierarchicalWrapper(\r
+                new IndexedContainer()));\r
+    }\r
+\r
+}\r