#97 Null predicate function should return empty matched set

acdcjunior · acdcjunior · commit 1bb6ab10835d · 2016-01-23T17:52:28.000-02:00
diff --git a/src/main/java/io/github/seleniumquery/functions/jquery/traversing/filtering/FilterFunction.java b/src/main/java/io/github/seleniumquery/functions/jquery/traversing/filtering/FilterFunction.java
@@ -25,6 +25,7 @@
 import java.util.List;
 
 import static io.github.seleniumquery.InternalSeleniumQueryObjectFactory.instance;
+import static java.util.Collections.emptyList;
 
 public class FilterFunction {
 
@@ -39,7 +40,7 @@ public SeleniumQueryObject filter(SeleniumQueryObject seleniumQueryObject, Predi
 
     private List<WebElement> filterWebElements(List<WebElement> unfiltered, Predicate<WebElement> filterFunction) {
         if (filterFunction == null) {
-            return unfiltered;
+            return emptyList();
         }
         Iterable<WebElement> filter = Iterables.filter(unfiltered, filterFunction);
         return Lists.newArrayList(filter);
diff --git a/src/test/java/io/github/seleniumquery/functions/jquery/traversing/filtering/FilterFunctionTest.java b/src/test/java/io/github/seleniumquery/functions/jquery/traversing/filtering/FilterFunctionTest.java
@@ -18,15 +18,18 @@
 
 import com.google.common.base.Predicate;
 import io.github.seleniumquery.SeleniumQueryObject;
+import org.hamcrest.collection.IsEmptyCollection;
 import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.collection.IsEmptyCollection.empty;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
 import static org.junit.Assert.assertThat;
 import static testinfrastructure.testdouble.Dummies.createDummyWebElement;
 import static testinfrastructure.testdouble.SeleniumQueryObjectMother.createStubSeleniumQueryObject;
+import static testinfrastructure.testdouble.SeleniumQueryObjectMother.createStubSeleniumQueryObjectWithAtLeastOneElement;
 import static testinfrastructure.testdouble.SeleniumQueryObjectMother.createStubSeleniumQueryObjectWithElements;
 import static testinfrastructure.testdouble.Stubs.createStubWebElementWithTag;
 
@@ -37,15 +40,13 @@ public class FilterFunctionTest {
     FilterFunction filterFunction = new FilterFunction();
 
     @Test
-    public void null_predicate__should_return_same_elements() {
+    public void null_predicate__should_return_EMPTY_elements() {
         // given
-        WebElement dummyWebElement = createDummyWebElement();
-        WebElement dummyWebElement2 = createDummyWebElement();
-        SeleniumQueryObject targetSQO = createStubSeleniumQueryObjectWithElements(dummyWebElement, dummyWebElement2);
+        SeleniumQueryObject targetSQO = createStubSeleniumQueryObjectWithAtLeastOneElement();
         // when
         SeleniumQueryObject resultSQO = filterFunction.filter(targetSQO, NULL_PREDICATE);
         // then
-        assertThat(resultSQO.get(), containsInAnyOrder(dummyWebElement, dummyWebElement2));
+        assertThat(resultSQO.get(), empty());
     }
 
     @Test
@@ -98,8 +99,4 @@ public boolean apply(WebElement webElement) {
         assertThat(resultSQO.get(), contains(spanOne, spanTwo));
     }
 
-    // TODO filter(this, null) --> should return empty ==> CHANGE THIS FOR THE PREDICATE VERSION ALSO, it is returning the original matched set
-    // TODO filter(this, "") --> should return empty
-    // TODO filter(this, "selector") --> should keep everyone that matches the isFunction("selector")
-
 }
diff --git a/src/test/java/testinfrastructure/testdouble/SeleniumQueryObjectMother.java b/src/test/java/testinfrastructure/testdouble/SeleniumQueryObjectMother.java
@@ -42,6 +42,10 @@ public static SeleniumQueryObject createStubSeleniumQueryObjectWithElements(WebE
         return createStubSeleniumQueryObject(new SeleniumQueryFunctions(), asList(elements));
     }
 
+    public static SeleniumQueryObject createStubSeleniumQueryObjectWithAtLeastOneElement() {
+        return createStubSeleniumQueryObjectWithElements(createDummyWebElement(), createDummyWebElement());
+    }
+
     public static SeleniumQueryObject createStubSeleniumQueryObject() {
         return createStubSeleniumQueryObjectWithElements();
     }

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,10 @@ public static SeleniumQueryObject createStubSeleniumQueryObjectWithElements(WebE`
`42`	`42`	`return createStubSeleniumQueryObject(new SeleniumQueryFunctions(), asList(elements));`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ public static SeleniumQueryObject createStubSeleniumQueryObjectWithAtLeastOneElement() {`
	`46`	`+ return createStubSeleniumQueryObjectWithElements(createDummyWebElement(), createDummyWebElement());`
	`47`	`+ }`
	`48`	`+`
`45`	`49`	`public static SeleniumQueryObject createStubSeleniumQueryObject() {`
`46`	`50`	`return createStubSeleniumQueryObjectWithElements();`
`47`	`51`	`}`