Added test for Container.Ordered

Extended TestIndexedContainer to test Container.Ordered features

svn changeset:11564/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 f56a7884861e87348a67314bcf033ce25bb10940..09e9fff16990ebbc20f80ba4fa6dc5f3c4f03c3b 100644 (file)
--- a/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java
+++ b/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java
@@ -94,6 +94,73 @@ public abstract class AbstractContainerTest extends TestCase {
                 sampleData.length);\r
     }\r
 \r
+    protected void testContainerOrdered(Container.Ordered container) {\r
+        Object id = container.addItem();\r
+        assertNotNull(id);\r
+        Item item = container.getItem(id);\r
+        assertNotNull(item);\r
+\r
+        assertEquals(id, container.firstItemId());\r
+        assertEquals(id, container.lastItemId());\r
+\r
+        // isFirstId\r
+        assertTrue(container.isFirstId(id));\r
+        assertTrue(container.isFirstId(container.firstItemId()));\r
+        // isLastId\r
+        assertTrue(container.isLastId(id));\r
+        assertTrue(container.isLastId(container.lastItemId()));\r
+\r
+        // Add a new item before the first\r
+        // addItemAfter\r
+        Object newFirstId = container.addItemAfter(null);\r
+        assertNotNull(newFirstId);\r
+        assertNotNull(container.getItem(newFirstId));\r
+\r
+        // isFirstId\r
+        assertTrue(container.isFirstId(newFirstId));\r
+        assertTrue(container.isFirstId(container.firstItemId()));\r
+        // isLastId\r
+        assertTrue(container.isLastId(id));\r
+        assertTrue(container.isLastId(container.lastItemId()));\r
+\r
+        // nextItemId\r
+        assertEquals(id, container.nextItemId(newFirstId));\r
+        assertNull(container.nextItemId(id));\r
+        assertNull(container.nextItemId("not-in-container"));\r
+\r
+        // prevItemId\r
+        assertEquals(newFirstId, container.prevItemId(id));\r
+        assertNull(container.prevItemId(newFirstId));\r
+        assertNull(container.prevItemId("not-in-container"));\r
+\r
+        // addItemAfter(Object)\r
+        Object newSecondItemId = container.addItemAfter(newFirstId);\r
+        // order is now: newFirstId, newSecondItemId, id\r
+        assertNotNull(newSecondItemId);\r
+        assertNotNull(container.getItem(newSecondItemId));\r
+        assertEquals(id, container.nextItemId(newSecondItemId));\r
+        assertEquals(newFirstId, container.prevItemId(newSecondItemId));\r
+\r
+        // addItemAfter(Object,Object)\r
+        String fourthId = "id of the fourth item";\r
+        Item fourth = container.addItemAfter(newFirstId, fourthId);\r
+        // order is now: newFirstId, fourthId, newSecondItemId, id\r
+        assertNotNull(fourth);\r
+        assertEquals(fourth, container.getItem(fourthId));\r
+        assertEquals(newSecondItemId, container.nextItemId(fourthId));\r
+        assertEquals(newFirstId, container.prevItemId(fourthId));\r
+\r
+        // addItemAfter(Object,Object)\r
+        Object fifthId = new Object();\r
+        Item fifth = container.addItemAfter(null, fifthId);\r
+        // order is now: fifthId, newFirstId, fourthId, newSecondItemId, id\r
+        assertNotNull(fifth);\r
+        assertEquals(fifth, container.getItem(fifthId));\r
+        assertEquals(newFirstId, container.nextItemId(fifthId));\r
+        assertNull(container.prevItemId(fifthId));\r
+\r
+    }\r
+\r
     protected void testContainerFiltering(Container.Filterable container) {\r
         initializeContainer(container);\r
 \r

diff --git a/tests/src/com/vaadin/tests/server/container/TestIndexedContainer.java b/tests/src/com/vaadin/tests/server/container/TestIndexedContainer.java
index dffa9951f2d13edad9c5833474b81e5b9e2fd872..13e8e17c484155813f9f7317e5c98fc9b98d04f5 100644 (file)
--- a/tests/src/com/vaadin/tests/server/container/TestIndexedContainer.java
+++ b/tests/src/com/vaadin/tests/server/container/TestIndexedContainer.java
@@ -20,4 +20,8 @@ public class TestIndexedContainer extends AbstractContainerTest {
         testContainerSortingAndFiltering(new IndexedContainer());\r
     }\r
 \r
+    public void testContainerOrdered() {\r
+        testContainerOrdered(new IndexedContainer());\r
+    }\r
+\r
 }\r