2 files changed, 80 insertions, 1 deletions
diff --git a/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java
new file mode 100644
index 0000000000..a3079bcdc3
--- /dev/null
+++ b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2000-2016 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.server.component.listselect;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import com.vaadin.tests.design.DeclarativeTestBase;
+import com.vaadin.ui.ListSelect;
+
+public class ListSelectDeclarativeTest
+        extends DeclarativeTestBase<ListSelect<String>> {
+
+    private ListSelect<String> getWithOptionsExpected() {
+        ListSelect<String> ls = new ListSelect<>(null,
+                Arrays.asList("Male", "Female"));
+        ls.setRows(9); // 10 is default
+        return ls;
+    }
+
+    private String getWithOptionsDesign() {
+        return "<vaadin-list-select rows=9>\n"
+                + "        <option>Male</option>\n"
+                + "        <option>Female</option>\n"
+                + "</vaadin-list-select>\n" + "";
+    }
+
+    @Test
+    public void testReadWithOptions() {
+        testRead(getWithOptionsDesign(), getWithOptionsExpected());
+    }
+
+    @Test
+    public void testWriteWithOptions() {
+        testWrite(stripOptionTags(getWithOptionsDesign()),
+                getWithOptionsExpected());
+    }
+
+    private ListSelect<String> getBasicExpected() {
+        ListSelect<String> ls = new ListSelect<>();
+        ls.setCaption("Hello");
+        return ls;
+    }
+
+    private String getBasicDesign() {
+        return "<vaadin-list-select caption='Hello' />";
+    }
+
+    @Test
+    public void testReadBasic() {
+        testRead(getBasicDesign(), getBasicExpected());
+    }
+
+    @Test
+    public void testWriteBasic() {
+        testWrite(getBasicDesign(), getBasicExpected());
+    }
+
+}
diff --git a/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java b/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java
index 3505e4ec38..d10cee9157 100644
--- a/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java
+++ b/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java
@@ -41,7 +41,8 @@ public class AbstractMultiSelectTest {
 
     @Parameters(name = "{0}")
     public static Iterable<AbstractMultiSelect<String>> multiSelects() {
-        return Arrays.asList(new CheckBoxGroup<>(), new TwinColSelect<>());
+        return Arrays.asList(new CheckBoxGroup<>(), new TwinColSelect<>(),
+                new ListSelect<>());
     }
 
     @Parameter
@@ -90,6 +91,11 @@ public class AbstractMultiSelectTest {
 
         selectionModel.deselectItems("2", "1", "4", "5");
         assertSelectionOrder(selectionModel, "3", "7", "8");
+
+        selectionModel.updateSelection(
+                new LinkedHashSet<>(Arrays.asList("5", "2")),
+                new LinkedHashSet<>(Arrays.asList("3", "8")));
+        assertSelectionOrder(selectionModel, "7", "5", "2");
     }
 
     @Test