1 files changed, 6 insertions, 1 deletions
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
index 438c40823d..7b3d8a4cf2 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
@@ -1468,7 +1468,12 @@ public class SQLContainerTableQueryTest {
                 container.getContainerProperty(container.getIdByIndex(3),
                         "NAME").getValue());
 
-        Assert.assertNull(container.getIdByIndex(4));
+        try {
+            container.getIdByIndex(4);
+            Assert.fail("SQLContainer.getIdByIndex() returned a value for an index beyond the end of the container");
+        } catch (IndexOutOfBoundsException e) {
+            // should throw exception - item is filtered out
+        }
         Assert.assertNull(container.nextItemId(container.getIdByIndex(3)));
 
         Assert.assertFalse(container.containsId(id2));