Containers JUnit test: assert result of removing items, test removing non-existing...

svn changeset:17529/svn branch:6.6

diff --git a/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java b/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java
index 2b8dd1eecfa927c42c8ab70120e73f30c843ec61..b6a2b765da64746cbee0489b8f89b30806f68798 100644 (file)
--- a/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java
+++ b/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java
@@ -211,9 +211,13 @@ public abstract class AbstractContainerTest extends TestCase {
             Assert.assertEquals(itemId,\r
                     container.getIdByIndex(itemPosition + 2));\r
 \r
-            container.removeItem(addedId);\r
-            container.removeItem(newFirstId);\r
-            container.removeItem(newLastId);\r
+            Assert.assertTrue(container.removeItem(addedId));\r
+            Assert.assertTrue(container.removeItem(newFirstId));\r
+            Assert.assertTrue(container.removeItem(newLastId));\r
+\r
+            Assert.assertFalse(\r
+                    "Removing non-existing item should indicate failure",\r
+                    container.removeItem(addedId));\r
         }\r
 \r
         // addItemAt\r
@@ -224,7 +228,7 @@ public abstract class AbstractContainerTest extends TestCase {
             Assert.assertEquals(newItemId, container.getIdByIndex(itemPosition));\r
             Assert.assertEquals(itemId,\r
                     container.getIdByIndex(itemPosition + 1));\r
-            container.removeItem(newItemId);\r
+            Assert.assertTrue(container.removeItem(newItemId));\r
             Assert.assertFalse(container.containsId(newItemId));\r
 \r
             container.addItemAt(0, newItemId);\r
@@ -234,7 +238,7 @@ public abstract class AbstractContainerTest extends TestCase {
             Assert.assertEquals(newItemId, container.getIdByIndex(0));\r
             Assert.assertEquals(itemId,\r
                     container.getIdByIndex(itemPosition + 1));\r
-            container.removeItem(newItemId);\r
+            Assert.assertTrue(container.removeItem(newItemId));\r
             Assert.assertFalse(container.containsId(newItemId));\r
 \r
             container.addItemAt(container.size(), newItemId);\r
@@ -245,7 +249,7 @@ public abstract class AbstractContainerTest extends TestCase {
             Assert.assertEquals(newItemId,\r
                     container.getIdByIndex(container.size() - 1));\r
             Assert.assertEquals(itemId, container.getIdByIndex(itemPosition));\r
-            container.removeItem(newItemId);\r
+            Assert.assertTrue(container.removeItem(newItemId));\r
             Assert.assertFalse(container.containsId(newItemId));\r
         }\r
     }\r
@@ -335,7 +339,7 @@ public abstract class AbstractContainerTest extends TestCase {
     }\r
 \r
     protected void initializeContainer(Container container) {\r
-        container.removeAllItems();\r
+        Assert.assertTrue(container.removeAllItems());\r
         Object[] propertyIds = container.getContainerPropertyIds().toArray();\r
         for (Object propertyId : propertyIds) {\r
             container.removeContainerProperty(propertyId);\r