From c0117c3baf907c09781c4b56a64d29b4e43c9281 Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Tue, 23 Aug 2016 15:45:51 +0300 Subject: Add SelectionModel interface and selection API to Listing Concrete selection models not implemented in this patch. Change-Id: Ibcd64817efa704b6dd664bfaccb2d8c5110720fb --- .../abstractlisting/AbstractListingTest.java | 44 ++++++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) (limited to 'server/src/test/java') diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractlisting/AbstractListingTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractlisting/AbstractListingTest.java index 2bc13dc4f3..3ec889f301 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractlisting/AbstractListingTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractlisting/AbstractListingTest.java @@ -2,17 +2,21 @@ package com.vaadin.tests.server.component.abstractlisting; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; +import java.util.Set; import java.util.stream.Stream; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import com.vaadin.data.selection.SelectionModel; import com.vaadin.server.data.BackEndDataSource; import com.vaadin.server.data.DataSource; import com.vaadin.server.data.ListDataSource; import com.vaadin.server.data.Query; +import com.vaadin.server.data.TypedDataGenerator; import com.vaadin.ui.AbstractListing; import com.vaadin.ui.AbstractListing.AbstractListingExtension; @@ -20,7 +24,39 @@ import elemental.json.JsonObject; public class AbstractListingTest { - private final class TestListing extends AbstractListing { + private final class TestListing extends + AbstractListing> { + + protected TestListing() { + // Stub for now, implement (and test) when adding concrete + // SelectionModels + super(new SelectionModel() { + + @Override + public Set getSelectedItems() { + return Collections.emptySet(); + } + + @Override + public void select(String item) { + } + + @Override + public void deselect(String item) { + } + }); + } + + @Override + public void addDataGenerator(TypedDataGenerator generator) { + super.addDataGenerator(generator); + } + + @Override + public void removeDataGenerator(TypedDataGenerator generator) { + super.removeDataGenerator(generator); + } + /** * Used to execute data generation */ @@ -95,7 +131,7 @@ public class AbstractListingTest { } @Test - public void testAddDataGeneartorBeforeDataSource() { + public void testAddDataGeneratorBeforeDataSource() { CountGenerator generator = new CountGenerator(); generator.extend(listing); listing.setItems("Foo"); @@ -105,7 +141,7 @@ public class AbstractListingTest { } @Test - public void testAddDataGeneartorAfterDataSource() { + public void testAddDataGeneratorAfterDataSource() { CountGenerator generator = new CountGenerator(); listing.setItems("Foo"); generator.extend(listing); @@ -128,7 +164,7 @@ public class AbstractListingTest { } @Test - public void testRemoveDataGeneartor() { + public void testRemoveDataGenerator() { listing.setItems("Foo"); CountGenerator generator = new CountGenerator(); generator.extend(listing); -- cgit v1.2.3