8000 #97 FilterFunction -> filterfunction.FilterPredicateFunction · seleniumQuery/seleniumQuery@ec69cda · GitHub
[go: up one dir, main page]
Skip to content

Commit ec69cda

Browse files
acdcjunioracdcjunior
committed
#97 FilterFunction -> filterfunction.FilterPredicateFunction
1 parent 0077828 commit ec69cda

File tree

3 files changed

+13
-18
lines changed

3 files changed

+13
-18
lines changed

‎src/main/java/io/github/seleniumquery/functions/SeleniumQueryFunctions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.github.seleniumquery.SeleniumQueryObject;
2121
import io.github.seleniumquery.functions.jquery.attributes.PropFunction;
2222
import io.github.seleniumquery.functions.jquery.forms.ValFunction;
23-
import io.github.seleniumquery.functions.jquery.traversing.filtering.FilterFunction;
23+
import io.github.seleniumquery.functions.jquery.traversing.filtering.filterfunction.FilterPredicateFunction;
2424
import io.github.seleniumquery.functions.jquery.traversing.filtering.IsFunction;
2525
import org.openqa.selenium.WebElement;
2626

@@ -47,7 +47,7 @@ public SeleniumQueryObject valWrite(SeleniumQueryObject seleniumQueryObject, Num
4747
}
4848

4949
public SeleniumQueryObject filterFunction(SeleniumQueryObject seleniumQueryObject, Predicate<WebElement> filterFunction) {
50-
return new FilterFunction().filter(seleniumQueryObject, filterFunction);
50+
return new FilterPredicateFunction().filter(seleniumQueryObject, filterFunction);
5151
}
5252

5353
public boolean isFunction(SeleniumQueryObject seleniumQueryObject, String selector) {

‎src/main/java/io/github/seleniumquery/functions/jquery/traversing/filtering/FilterFunction.java renamed to ‎src/main/java/io/github/seleniumquery/functions/jquery/traversing/filtering/filterfunction/FilterPredicateFunction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.github.seleniumquery.functions.jquery.traversing.filtering;
17+
package io.github.seleniumquery.functions.jquery.traversing.filtering.filterfunction;
1818

1919
import com.google.common.base.Predicate;
2020
import com.google.common.collect.Iterables;
@@ -27,7 +27,7 @@
2727
import static io.github.seleniumquery.InternalSeleniumQueryObjectFactory.instance;
2828
import static java.util.Collections.emptyList;
2929

30-
public class FilterFunction {
30+
public class FilterPredicateFunction {
3131

3232
public SeleniumQueryObject filter(SeleniumQueryObject seleniumQueryObject, Predicate<WebElement> filterFunction) {
3333
List<WebElement> filteredWebElements = filterWebElements(seleniumQueryObject.get(), filterFunction);

‎src/test/java/io/github/seleniumquery/functions/jquery/traversing/filtering/FilterFunctionTest.java renamed to ‎src/test/java/io/github/seleniumquery/functions/jquery/traversing/filtering/filterfunction/FilterPredicateFunctionTest.java

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,37 +14,32 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.github.seleniumquery.functions.jquery.traversing.filtering;
17+
package io.github.seleniumquery.functions.jquery.traversing.filtering.filterfunction;
1818

1919
import com.google.common.base.Predicate;
2020
import io.github.seleniumquery.SeleniumQueryObject;
21-
import org.hamcrest.collection.IsEmptyCollection;
2221
import org.junit.Test;
2322
import org.openqa.selenium.WebElement;
2423

2524
import static org.hamcrest.CoreMatchers.is;
2625
import static org.hamcrest.collection.IsEmptyCollection.empty;
27-
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
2826
import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
2927
import static org.junit.Assert.assertThat;
30-
import static testinfrastructure.testdouble.Dummies.createDummyWebElement;
31-
import static testinfrastructure.testdouble.SeleniumQueryObjectMother.createStubSeleniumQueryObject;
32-
import static testinfrastructure.testdouble.SeleniumQueryObjectMother.createStubSeleniumQueryObjectWithAtLeastOneElement;
33-
import static testinfrastructure.testdouble.SeleniumQueryObjectMother.createStubSeleniumQueryObjectWithElements;
28+
import static testinfrastructure.testdouble.SeleniumQueryObjectMother.*;
3429
import static testinfrastructure.testdouble.Stubs.createStubWebElementWithTag;
3530

36-
public class FilterFunctionTest {
31+
public class FilterPredicateFunctionTest {
3732

3833
private static final Predicate<WebElement> NULL_PREDICATE = null;
3934

40-
FilterFunction filterFunction = new FilterFunction();
35+
FilterPredicateFunction filterPredicateFunction = new FilterPredicateFunction();
4136

4237
@Test
4338
public void null_predicate__should_return_EMPTY_elements() {
4439
// given
4540
SeleniumQueryObject targetSQO = createStubSeleniumQueryObjectWithAtLeastOneElement();
4641
// when
47-
SeleniumQueryObject resultSQO = filterFunction.filter(targetSQO, NULL_PREDICATE);
42+
SeleniumQueryObject resultSQO = filterPredicateFunction.filter(targetSQO, NULL_PREDICATE);
4843
// then
4944
assertThat(resultSQO.get(), empty());
5045
}
@@ -54,7 +49,7 @@ public void resultSQO_should_have_targetSQO_as_previous_object() {
5449
// given
5550
SeleniumQueryObject targetSQO = createStubSeleniumQueryObject();
5651
// when
57-
SeleniumQueryObject resultSQO = filterFunction.filter(targetSQO, NULL_PREDICATE);
52+
SeleniumQueryObject resultSQO = filterPredicateFunction.filter(targetSQO, NULL_PREDICATE);
5853
// then
5954
assertThat(resultSQO.end(), is(targetSQO));
6055
}
@@ -64,7 +59,7 @@ public void resultSQO_should_have_same_SQFunctions_as_targetSQO() {
6459
// given
6560
SeleniumQueryObject targetSQO = createStubSeleniumQueryObject();
6661
// when
67-
SeleniumQueryObject resultSQO = filterFunction.filter(targetSQO, NULL_PREDICATE);
62+
SeleniumQueryObject resultSQO = filterPredicateFunction.filter(targetSQO, NULL_PREDICATE);
6863
// then
6964
assertThat(resultSQO.getSeleniumQueryFunctions(), is(targetSQO.getSeleniumQueryFunctions()));
7065
}
@@ -74,7 +69,7 @@ public void resultSQO_should_have_same_WebDriver_as_targetSQO() {
7469
// given
7570
SeleniumQueryObject targetSQO = createStubSeleniumQueryObject();
7671
// when
77-
SeleniumQueryObject resultSQO = filterFunction.filter(targetSQO, NULL_PREDICATE);
72+
SeleniumQueryObject resultSQO = filterPredicateFunction.filter(targetSQO, NULL_PREDICATE);
7873
// then
7974
assertThat(resultSQO.getWebDriver(), is(targetSQO.getWebDriver()));
8075
}
@@ -94,7 +89,7 @@ public boolean apply(WebElement webElement) {
9489
return "span".equals(webElement.getTagName());
9590
}
9691
};
97-
SeleniumQueryObject resultSQO = filterFunction.filter(targetSQO, keepSpansPredicate);
92+
SeleniumQueryObject resultSQO = filterPredicateFunction.filter(targetSQO, keepSpansPredicate);
9893
// then
9994
assertThat(resultSQO.get(), contains(spanOne, spanTwo));
10095
}

0 commit comments

Comments
 (0)
0