Merge branch 'master' into layoutperformance

3 files changed, 14 insertions, 42 deletions

diff --git a/tests/testbench/com/vaadin/tests/components/select/MultiSelect.java b/tests/testbench/com/vaadin/tests/components/select/MultiSelect.java
deleted file mode 100644
index d823d1fd10..0000000000
--- a/tests/testbench/com/vaadin/tests/components/select/MultiSelect.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.vaadin.tests.components.select;
-
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Select;
-
-public class MultiSelect extends TestBase {
-
-    @SuppressWarnings("deprecation")
-    @Override
-    protected void setup() {
-        Select selectComponent = new Select();
-        selectComponent.setMultiSelect(true);
-
-        String[] selection = { "One", "Hund", "Three" };
-        for (String word : selection) {
-            selectComponent.addItem(word);
-        }
-
-        addComponent(selectComponent);
-    }
-
-    @Override
-    protected String getDescription() {
-        return "The select is in multi select mode and should be rendered as such";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 4553;
-    }
-
-}
diff --git a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java
index 1fe11f1a92..9f18ef7887 100644
--- a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java
+++ b/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java
@@ -16,8 +16,8 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
+import com.vaadin.ui.ListSelect;
 import com.vaadin.ui.Panel;
-import com.vaadin.ui.Select;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
@@ -116,13 +116,13 @@ public class OrderedLayoutBasics extends TestBase {
         ol.addComponent(tf);
         ol.setComponentAlignment(tf, Alignment.BOTTOM_LEFT);
 
-        Select s = new Select("100% high select");
+        ListSelect s = new ListSelect("100% high select");
         s.setMultiSelect(true);
         s.setHeight("100%");
         s.setWidth("");
         ol.addComponent(s);
 
-        s = new Select("200 px high select");
+        s = new ListSelect("200 px high select");
         s.setMultiSelect(true);
         s.setHeight("200px");
         s.setWidth("");
@@ -172,7 +172,8 @@ public class OrderedLayoutBasics extends TestBase {
         ol.addComponent(l);
         ol.setComponentAlignment(l, Alignment.BOTTOM_LEFT);
 
-        Select s = new Select("100% high select, should fit into layout");
+        ListSelect s = new ListSelect(
+                "100% high select, should fit into layout");
         s.setMultiSelect(true);
         s.setHeight("100%");
         s.setWidth("");
@@ -182,7 +183,7 @@ public class OrderedLayoutBasics extends TestBase {
 
         ol.addComponent(s);
 
-        s = new Select("200 px high select, should be partly outside");
+        s = new ListSelect("200 px high select, should be partly outside");
         s.setMultiSelect(true);
         s.setHeight("200px");
         s.setWidth("");
@@ -224,7 +225,8 @@ public class OrderedLayoutBasics extends TestBase {
         ol.addComponent(l);
         ol.setComponentAlignment(l, Alignment.BOTTOM_LEFT);
 
-        Select s = new Select("100% high select, should fit into layout");
+        ListSelect s = new ListSelect(
+                "100% high select, should fit into layout");
         s.setMultiSelect(true);
         s.setHeight("100%");
         s.setWidth("100%");
@@ -234,7 +236,8 @@ public class OrderedLayoutBasics extends TestBase {
 
         ol.addComponent(s);
 
-        s = new Select("200 px high select, should make the layout 200px high");
+        s = new ListSelect(
+                "200 px high select, should make the layout 200px high");
         s.setMultiSelect(true);
         s.setHeight("200px");
         s.setWidth("100%");
@@ -277,7 +280,8 @@ public class OrderedLayoutBasics extends TestBase {
         ol.addComponent(l);
         ol.setComponentAlignment(l, Alignment.BOTTOM_LEFT);
 
-        Select s = new Select("100% high select, should fit into layout");
+        ListSelect s = new ListSelect(
+                "100% high select, should fit into layout");
         s.setMultiSelect(true);
         s.setHeight("100%");
         s.setWidth("100%");
@@ -287,7 +291,8 @@ public class OrderedLayoutBasics extends TestBase {
 
         ol.addComponent(s);
 
-        s = new Select("200 px high select, should make the layout 200px high");
+        s = new ListSelect(
+                "200 px high select, should make the layout 200px high");
         s.setMultiSelect(true);
         s.setHeight("200px");
         s.setWidth("100%");
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java
index 7cdbb1300e..872084d436 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java
@@ -127,7 +127,6 @@ public class Ticket1230 extends Application.LegacyApplication {
     @SuppressWarnings("deprecation")
     private Select createSelect() {
         Select select = new Select();
-        select.setMultiSelect(false);
         select.addContainerProperty(PROPERTY_ID, String.class, "");
         select.setItemCaptionPropertyId(PROPERTY_ID);