diff options
| author | Artur Signell <artur.signell@itmill.com> | 2010-03-01 15:18:07 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2010-03-01 15:18:07 +0000 |
| commit | 3863c0c269c6c28e04e593ceab09fec4302eadbd (patch) | |
| tree | 076c6018bc0ddaf8f2b5c47f4ff66b3c718edbb7 /tests | |
| parent | 9836f0d7f3ddde49f1865d434e87b948cc277a6b (diff) | |
| download | vaadin-framework-3863c0c269c6c28e04e593ceab09fec4302eadbd.tar.gz vaadin-framework-3863c0c269c6c28e04e593ceab09fec4302eadbd.zip | |
Added test for Container.Ordered
Extended TestIndexedContainer to test Container.Ordered features
svn changeset:11564/svn branch:6.3
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java | 67 | ||||
| -rw-r--r-- | tests/src/com/vaadin/tests/server/container/TestIndexedContainer.java | 4 |
2 files changed, 71 insertions, 0 deletions
diff --git a/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java b/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java index f56a788486..09e9fff169 100644 --- 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);
}
+ protected void testContainerOrdered(Container.Ordered container) {
+ Object id = container.addItem();
+ assertNotNull(id);
+ Item item = container.getItem(id);
+ assertNotNull(item);
+
+ assertEquals(id, container.firstItemId());
+ assertEquals(id, container.lastItemId());
+
+ // isFirstId
+ assertTrue(container.isFirstId(id));
+ assertTrue(container.isFirstId(container.firstItemId()));
+ // isLastId
+ assertTrue(container.isLastId(id));
+ assertTrue(container.isLastId(container.lastItemId()));
+
+ // Add a new item before the first
+ // addItemAfter
+ Object newFirstId = container.addItemAfter(null);
+ assertNotNull(newFirstId);
+ assertNotNull(container.getItem(newFirstId));
+
+ // isFirstId
+ assertTrue(container.isFirstId(newFirstId));
+ assertTrue(container.isFirstId(container.firstItemId()));
+ // isLastId
+ assertTrue(container.isLastId(id));
+ assertTrue(container.isLastId(container.lastItemId()));
+
+ // nextItemId
+ assertEquals(id, container.nextItemId(newFirstId));
+ assertNull(container.nextItemId(id));
+ assertNull(container.nextItemId("not-in-container"));
+
+ // prevItemId
+ assertEquals(newFirstId, container.prevItemId(id));
+ assertNull(container.prevItemId(newFirstId));
+ assertNull(container.prevItemId("not-in-container"));
+
+ // addItemAfter(Object)
+ Object newSecondItemId = container.addItemAfter(newFirstId);
+ // order is now: newFirstId, newSecondItemId, id
+ assertNotNull(newSecondItemId);
+ assertNotNull(container.getItem(newSecondItemId));
+ assertEquals(id, container.nextItemId(newSecondItemId));
+ assertEquals(newFirstId, container.prevItemId(newSecondItemId));
+
+ // addItemAfter(Object,Object)
+ String fourthId = "id of the fourth item";
+ Item fourth = container.addItemAfter(newFirstId, fourthId);
+ // order is now: newFirstId, fourthId, newSecondItemId, id
+ assertNotNull(fourth);
+ assertEquals(fourth, container.getItem(fourthId));
+ assertEquals(newSecondItemId, container.nextItemId(fourthId));
+ assertEquals(newFirstId, container.prevItemId(fourthId));
+
+ // addItemAfter(Object,Object)
+ Object fifthId = new Object();
+ Item fifth = container.addItemAfter(null, fifthId);
+ // order is now: fifthId, newFirstId, fourthId, newSecondItemId, id
+ assertNotNull(fifth);
+ assertEquals(fifth, container.getItem(fifthId));
+ assertEquals(newFirstId, container.nextItemId(fifthId));
+ assertNull(container.prevItemId(fifthId));
+
+ }
+
protected void testContainerFiltering(Container.Filterable container) {
initializeContainer(container);
diff --git a/tests/src/com/vaadin/tests/server/container/TestIndexedContainer.java b/tests/src/com/vaadin/tests/server/container/TestIndexedContainer.java index dffa9951f2..13e8e17c48 100644 --- 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());
}
+ public void testContainerOrdered() {
+ testContainerOrdered(new IndexedContainer());
+ }
+
}
|