diff options
Diffstat (limited to 'server/src/test/java')
4 files changed, 9 insertions, 14 deletions
diff --git a/server/src/test/java/com/vaadin/data/provider/BackendDataProviderTest.java b/server/src/test/java/com/vaadin/data/provider/BackendDataProviderTest.java index e2f5211d00..b91a6fe3af 100644 --- a/server/src/test/java/com/vaadin/data/provider/BackendDataProviderTest.java +++ b/server/src/test/java/com/vaadin/data/provider/BackendDataProviderTest.java @@ -61,8 +61,9 @@ public class BackendDataProviderTest extends } @Override - protected void setSortOrder(List<SortOrder<String>> sortOrder, + protected void setSortOrder(List<QuerySortOrder> sortOrder, Comparator<StrBean> comp) { getDataProvider().setSortOrders(sortOrder); } -} + +}
\ No newline at end of file diff --git a/server/src/test/java/com/vaadin/data/provider/DataProviderTestBase.java b/server/src/test/java/com/vaadin/data/provider/DataProviderTestBase.java index 0aa9bb80ba..ebdcdd105c 100644 --- a/server/src/test/java/com/vaadin/data/provider/DataProviderTestBase.java +++ b/server/src/test/java/com/vaadin/data/provider/DataProviderTestBase.java @@ -2,7 +2,6 @@ package com.vaadin.data.provider; import static org.junit.Assert.assertTrue; -import java.util.Collections; import java.util.Comparator; import java.util.LinkedList; import java.util.List; @@ -49,25 +48,20 @@ public abstract class DataProviderTestBase<D extends DataProvider<StrBean, Seria return dataProvider; } - protected abstract void setSortOrder(List<SortOrder<String>> sortOrder, + protected abstract void setSortOrder(List<QuerySortOrder> sortOrder, Comparator<StrBean> comp); private Query<StrBean, SerializablePredicate<StrBean>> createQuery( - List<SortOrder<String>> sortOrder, Comparator<StrBean> comp) { + List<QuerySortOrder> sortOrder, Comparator<StrBean> comp) { return createQuery(sortOrder, comp, null); } private Query<StrBean, SerializablePredicate<StrBean>> createQuery( - List<SortOrder<String>> sortOrder, Comparator<StrBean> comp, + List<QuerySortOrder> sortOrder, Comparator<StrBean> comp, SerializablePredicate<StrBean> filter) { return new Query<>(0, Integer.MAX_VALUE, sortOrder, comp, filter); } - private Query<StrBean, SerializablePredicate<StrBean>> createQuery( - SerializablePredicate<StrBean> filter) { - return createQuery(Collections.emptyList(), null, filter); - } - // Tests start here. @Test diff --git a/server/src/test/java/com/vaadin/data/provider/ListDataProviderTest.java b/server/src/test/java/com/vaadin/data/provider/ListDataProviderTest.java index 7e32449628..1ffa444f50 100644 --- a/server/src/test/java/com/vaadin/data/provider/ListDataProviderTest.java +++ b/server/src/test/java/com/vaadin/data/provider/ListDataProviderTest.java @@ -218,7 +218,7 @@ public class ListDataProviderTest } @Override - protected void setSortOrder(List<SortOrder<String>> sortOrder, + protected void setSortOrder(List<QuerySortOrder> sortOrder, Comparator<StrBean> comp) { SerializableComparator<StrBean> serializableComp = comp::compare; getDataProvider().setSortComparator(serializableComp); diff --git a/server/src/test/java/com/vaadin/data/provider/bov/DataProviderBoVTest.java b/server/src/test/java/com/vaadin/data/provider/bov/DataProviderBoVTest.java index cecb6bf511..b8d659fc47 100644 --- a/server/src/test/java/com/vaadin/data/provider/bov/DataProviderBoVTest.java +++ b/server/src/test/java/com/vaadin/data/provider/bov/DataProviderBoVTest.java @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.provider.DataProvider; -import com.vaadin.data.provider.SortOrder; +import com.vaadin.data.provider.QuerySortOrder; import com.vaadin.shared.data.sort.SortDirection; /** @@ -133,7 +133,7 @@ public class DataProviderBoVTest { // First callback fetches items based on a query query -> { List<PersonService.PersonSort> sortOrders = new ArrayList<>(); - for (SortOrder<String> queryOrder : query.getSortOrders()) { + for (QuerySortOrder queryOrder : query.getSortOrders()) { PersonService.PersonSort sort = personService .createSort( // The name of the sorted property |