#6286 Container filtering improvements: update unit tests with item id as an extra parameter to passesFilter()

svn changeset:17789/svn branch:6.6

4 files changed, 30 insertions, 29 deletions

diff --git a/tests/src/com/vaadin/tests/server/container/filter/AbstractFilterTest.java b/tests/src/com/vaadin/tests/server/container/filter/AbstractFilterTest.java
index 4075b87975..2e913857a8 100644
--- a/tests/src/com/vaadin/tests/server/container/filter/AbstractFilterTest.java
+++ b/tests/src/com/vaadin/tests/server/container/filter/AbstractFilterTest.java
@@ -61,7 +61,7 @@ public abstract class AbstractFilterTest<FILTERTYPE extends Filter> extends
             this.propertyId = propertyId;
         }
 
-        public boolean passesFilter(Item item)
+        public boolean passesFilter(Object itemId, Item item)
                 throws UnsupportedOperationException {
             return this.item == item;
         }
diff --git a/tests/src/com/vaadin/tests/server/container/filter/AndOrFilterTest.java b/tests/src/com/vaadin/tests/server/container/filter/AndOrFilterTest.java
index 94c8862dbb..45f4921c35 100644
--- a/tests/src/com/vaadin/tests/server/container/filter/AndOrFilterTest.java
+++ b/tests/src/com/vaadin/tests/server/container/filter/AndOrFilterTest.java
@@ -16,14 +16,14 @@ public class AndOrFilterTest extends AbstractFilterTest {
     public void testNoFilterAnd() {
         Filter filter = new And();
 
-        Assert.assertTrue(filter.passesFilter(item1));
+        Assert.assertTrue(filter.passesFilter(null, item1));
     }
 
     public void testSingleFilterAnd() {
         Filter filter = new And(new SameItemFilter(item1));
 
-        Assert.assertTrue(filter.passesFilter(item1));
-        Assert.assertFalse(filter.passesFilter(item2));
+        Assert.assertTrue(filter.passesFilter(null, item1));
+        Assert.assertFalse(filter.passesFilter(null, item2));
     }
 
     public void testTwoFilterAnd() {
@@ -32,11 +32,11 @@ public class AndOrFilterTest extends AbstractFilterTest {
         Filter filter2 = new And(new SameItemFilter(item1), new SameItemFilter(
                 item2));
 
-        Assert.assertTrue(filter1.passesFilter(item1));
-        Assert.assertFalse(filter1.passesFilter(item2));
+        Assert.assertTrue(filter1.passesFilter(null, item1));
+        Assert.assertFalse(filter1.passesFilter(null, item2));
 
-        Assert.assertFalse(filter2.passesFilter(item1));
-        Assert.assertFalse(filter2.passesFilter(item2));
+        Assert.assertFalse(filter2.passesFilter(null, item1));
+        Assert.assertFalse(filter2.passesFilter(null, item2));
     }
 
     public void testThreeFilterAnd() {
@@ -45,24 +45,24 @@ public class AndOrFilterTest extends AbstractFilterTest {
         Filter filter2 = new And(new SameItemFilter(item1), new SameItemFilter(
                 item1), new SameItemFilter(item2));
 
-        Assert.assertTrue(filter1.passesFilter(item1));
-        Assert.assertFalse(filter1.passesFilter(item2));
+        Assert.assertTrue(filter1.passesFilter(null, item1));
+        Assert.assertFalse(filter1.passesFilter(null, item2));
 
-        Assert.assertFalse(filter2.passesFilter(item1));
-        Assert.assertFalse(filter2.passesFilter(item2));
+        Assert.assertFalse(filter2.passesFilter(null, item1));
+        Assert.assertFalse(filter2.passesFilter(null, item2));
     }
 
     public void testNoFilterOr() {
         Filter filter = new Or();
 
-        Assert.assertFalse(filter.passesFilter(item1));
+        Assert.assertFalse(filter.passesFilter(null, item1));
     }
 
     public void testSingleFilterOr() {
         Filter filter = new Or(new SameItemFilter(item1));
 
-        Assert.assertTrue(filter.passesFilter(item1));
-        Assert.assertFalse(filter.passesFilter(item2));
+        Assert.assertTrue(filter.passesFilter(null, item1));
+        Assert.assertFalse(filter.passesFilter(null, item2));
     }
 
     public void testTwoFilterOr() {
@@ -71,11 +71,11 @@ public class AndOrFilterTest extends AbstractFilterTest {
         Filter filter2 = new Or(new SameItemFilter(item1), new SameItemFilter(
                 item2));
 
-        Assert.assertTrue(filter1.passesFilter(item1));
-        Assert.assertFalse(filter1.passesFilter(item2));
+        Assert.assertTrue(filter1.passesFilter(null, item1));
+        Assert.assertFalse(filter1.passesFilter(null, item2));
 
-        Assert.assertTrue(filter2.passesFilter(item1));
-        Assert.assertTrue(filter2.passesFilter(item2));
+        Assert.assertTrue(filter2.passesFilter(null, item1));
+        Assert.assertTrue(filter2.passesFilter(null, item2));
     }
 
     public void testThreeFilterOr() {
@@ -84,11 +84,11 @@ public class AndOrFilterTest extends AbstractFilterTest {
         Filter filter2 = new Or(new SameItemFilter(item1), new SameItemFilter(
                 item1), new SameItemFilter(item2));
 
-        Assert.assertTrue(filter1.passesFilter(item1));
-        Assert.assertFalse(filter1.passesFilter(item2));
+        Assert.assertTrue(filter1.passesFilter(null, item1));
+        Assert.assertFalse(filter1.passesFilter(null, item2));
 
-        Assert.assertTrue(filter2.passesFilter(item1));
-        Assert.assertTrue(filter2.passesFilter(item2));
+        Assert.assertTrue(filter2.passesFilter(null, item1));
+        Assert.assertTrue(filter2.passesFilter(null, item2));
     }
 
     public void testAndEqualsHashCode() {
diff --git a/tests/src/com/vaadin/tests/server/container/filter/NotFilterTest.java b/tests/src/com/vaadin/tests/server/container/filter/NotFilterTest.java
index 983b4cf60a..b32b255f76 100644
--- a/tests/src/com/vaadin/tests/server/container/filter/NotFilterTest.java
+++ b/tests/src/com/vaadin/tests/server/container/filter/NotFilterTest.java
@@ -17,10 +17,10 @@ public class NotFilterTest extends AbstractFilterTest {
         Filter origFilter = new SameItemFilter(item1);
         Filter filter = new Not(origFilter);
 
-        Assert.assertTrue(origFilter.passesFilter(item1));
-        Assert.assertFalse(origFilter.passesFilter(item2));
-        Assert.assertFalse(filter.passesFilter(item1));
-        Assert.assertTrue(filter.passesFilter(item2));
+        Assert.assertTrue(origFilter.passesFilter(null, item1));
+        Assert.assertFalse(origFilter.passesFilter(null, item2));
+        Assert.assertFalse(filter.passesFilter(null, item1));
+        Assert.assertTrue(filter.passesFilter(null, item2));
     }
 
     public void testNotEqualsHashCode() {
diff --git a/tests/src/com/vaadin/tests/server/container/filter/SimpleStringFilterTest.java b/tests/src/com/vaadin/tests/server/container/filter/SimpleStringFilterTest.java
index d8415f85a6..dbc803be24 100644
--- a/tests/src/com/vaadin/tests/server/container/filter/SimpleStringFilterTest.java
+++ b/tests/src/com/vaadin/tests/server/container/filter/SimpleStringFilterTest.java
@@ -23,7 +23,7 @@ public class SimpleStringFilterTest extends AbstractFilterTest {
     protected boolean passes(Object propertyId, String filterString,
             boolean ignoreCase, boolean onlyMatchPrefix) {
         return f(propertyId, filterString, ignoreCase, onlyMatchPrefix)
-                .passesFilter(getTestItem());
+                .passesFilter(null, getTestItem());
     }
 
     public void testStartsWithCaseSensitive() {
@@ -124,7 +124,8 @@ public class SimpleStringFilterTest extends AbstractFilterTest {
         TestItem<String, String> item = createTestItem();
         item.addItemProperty("other1", new NullProperty());
 
-        Assert.assertFalse(f("other1", "ab", false, true).passesFilter(item));
+        Assert.assertFalse(f("other1", "ab", false, true).passesFilter(null,
+                item));
     }
 
 }