diff options
Diffstat (limited to 'server/src/test/java')
6 files changed, 28 insertions, 23 deletions
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 d80ec546be..7e32449628 100644 --- a/server/src/test/java/com/vaadin/data/provider/ListDataProviderTest.java +++ b/server/src/test/java/com/vaadin/data/provider/ListDataProviderTest.java @@ -16,7 +16,7 @@ public class ListDataProviderTest @Override protected ListDataProvider<StrBean> createDataProvider() { - return DataProvider.create(data); + return DataProvider.ofCollection(data); } @Test 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 45cfb82f69..cecb6bf511 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 @@ -25,7 +25,6 @@ import java.util.stream.Stream; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.provider.CallbackDataProvider; import com.vaadin.data.provider.DataProvider; import com.vaadin.data.provider.SortOrder; import com.vaadin.shared.data.sort.SortDirection; @@ -102,7 +101,7 @@ public class DataProviderBoVTest { } private DataProvider<Person, ?> createUnsortedDataProvider() { - DataProvider<Person, ?> dataProvider = new CallbackDataProvider<>( + DataProvider<Person, ?> dataProvider = DataProvider.fromCallbacks( // First callback fetches items based on a query query -> { // The index of the first item to load @@ -130,7 +129,7 @@ public class DataProviderBoVTest { } private DataProvider<Person, ?> createSortedDataProvider() { - DataProvider<Person, ?> dataProvider = new CallbackDataProvider<>( + DataProvider<Person, ?> dataProvider = DataProvider.fromCallbacks( // First callback fetches items based on a query query -> { List<PersonService.PersonSort> sortOrders = new ArrayList<>(); diff --git a/server/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionModelTest.java b/server/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionModelTest.java index 2f8f5d9efa..c45bad66f0 100644 --- a/server/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionModelTest.java +++ b/server/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionModelTest.java @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import com.vaadin.data.provider.CallbackDataProvider; +import com.vaadin.data.provider.DataProvider; import com.vaadin.data.provider.bov.Person; import com.vaadin.event.selection.MultiSelectionEvent; import com.vaadin.event.selection.MultiSelectionListener; @@ -664,13 +664,15 @@ public class GridMultiSelectionModelTest { model.getSelectAllCheckBoxVisibility()); grid.setDataProvider( - new CallbackDataProvider<String, String>( - q -> IntStream - .range(q.getOffset(), - Math.max(q.getOffset() + q.getLimit() - + 1, 1000)) - .mapToObj(i -> "Item " + i), - q -> 1000)); + DataProvider + .fromCallbacks( + query -> IntStream + .range(query.getOffset(), + Math.max(query.getOffset() + + query.getLimit() + 1, + 1000)) + .mapToObj(i -> "Item " + i), + query -> 1000)); // not in-memory -> checkbox is hidden Assert.assertFalse(model.isSelectAllCheckBoxVisible()); diff --git a/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxFilteringTest.java b/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxFilteringTest.java index f44c7924a0..e8c8d3dd6e 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxFilteringTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxFilteringTest.java @@ -123,7 +123,8 @@ public class ComboBoxFilteringTest { // Result: typing "en" into the search field finds "Enrique Iglesias" // and "Henry Dunant", but not "Erwin Engelbrecht" - comboBox.setDataProvider(DataProvider.create(getPersonCollection())); + comboBox.setDataProvider( + DataProvider.ofCollection(getPersonCollection())); checkFiltering("en", "ennen", 3, 2); } @@ -135,13 +136,14 @@ public class ComboBoxFilteringTest { // Result: typing "En" into the search field finds "Enrique Iglesias" // but not "Henry Dunant" or "Erwin Engelbrecht" comboBox.setDataProvider(String::startsWith, - DataProvider.create(getPersonCollection())); + DataProvider.ofCollection(getPersonCollection())); checkFiltering("En", "en", 3, 1); } public void invalid_dataProvider_compile_error() { - DataProvider<Person, Address> dp = DataProvider.create(getPersonArray()) + DataProvider<Person, Address> dp = DataProvider + .ofItems(getPersonArray()) .filteringByEquals(Person::getAddress); // uncommenting this causes a compile time error because of invalid data @@ -154,7 +156,7 @@ public class ComboBoxFilteringTest { comboBox.setItemCaptionGenerator(Person::getFirstName); // Filters by last name, regardless of the item caption generator - ListDataProvider<Person> ldp = DataProvider.create(getPersonArray()); + ListDataProvider<Person> ldp = DataProvider.ofItems(getPersonArray()); comboBox.setDataProvider(ldp.withConvertedFilter( text -> person -> person.getLastName().contains(text))); @@ -166,7 +168,7 @@ public class ComboBoxFilteringTest { comboBox.setItemCaptionGenerator(Person::getFirstName); // Filters by last name, regardless of the item caption generator - ListDataProvider<Person> ldp = DataProvider.create(getPersonArray()); + ListDataProvider<Person> ldp = DataProvider.ofItems(getPersonArray()); ldp.setFilter(person -> person.getFirstName().contains("nr")); // Same as above, but only showing a subset of the persons diff --git a/server/src/test/java/com/vaadin/ui/AbstractListingTest.java b/server/src/test/java/com/vaadin/ui/AbstractListingTest.java index 496d7e06bb..400105567d 100644 --- a/server/src/test/java/com/vaadin/ui/AbstractListingTest.java +++ b/server/src/test/java/com/vaadin/ui/AbstractListingTest.java @@ -12,7 +12,6 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.HasDataProvider; -import com.vaadin.data.provider.CallbackDataProvider; import com.vaadin.data.provider.DataProvider; import com.vaadin.data.provider.ListDataProvider; import com.vaadin.data.provider.Query; @@ -109,13 +108,16 @@ public class AbstractListingTest { @Test public void testSetDataProvider() { - ListDataProvider<String> dataProvider = DataProvider.create(items); + ListDataProvider<String> dataProvider = DataProvider + .ofCollection(items); listing.setDataProvider(dataProvider); Assert.assertEquals("setDataProvider did not set data provider", dataProvider, listing.getDataProvider()); - listing.setDataProvider(new CallbackDataProvider<>(q -> Stream - .of(ITEM_ARRAY).skip(q.getOffset()).limit(q.getLimit()), - q -> ITEM_ARRAY.length)); + listing.setDataProvider( + DataProvider.fromCallbacks( + query -> Stream.of(ITEM_ARRAY).skip(query.getOffset()) + .limit(query.getLimit()), + query -> ITEM_ARRAY.length)); Assert.assertNotEquals("setDataProvider did not replace data provider", dataProvider, listing.getDataProvider()); } diff --git a/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java b/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java index 281690d7ee..136b23984a 100644 --- a/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java +++ b/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java @@ -35,7 +35,7 @@ public class RadioButtonGroupTest { radioButtonGroup = new RadioButtonGroup<>(); // Intentional deviation from upcoming selection order radioButtonGroup.setDataProvider( - DataProvider.create("Third", "Second", "First")); + DataProvider.ofItems("Third", "Second", "First")); } @Test |