From 363dce92ae948aa7912007bb024c980de820851f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Mon, 12 Sep 2016 15:04:02 +0300
Subject: [PATCH] Extract single select stuff to its own test UI

Change-Id: I12e42e91ea6e82fb8d5b8ce9a23dd8600c467056
---
 .../AbstractListingTestUI.java                | 24 +-------
 .../AbstractSingleSelectTestUI.java           | 57 +++++++++++++++++++
 .../nativeselect/NativeSelects.java           | 18 +-----
 3 files changed, 61 insertions(+), 38 deletions(-)
 create mode 100644 uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractSingleSelectTestUI.java

diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractListingTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractListingTestUI.java
index 6267890535..875c7d886f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractListingTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractListingTestUI.java
@@ -15,7 +15,6 @@ public abstract class AbstractListingTestUI<T extends AbstractListing<Object, ?>
     protected void createActions() {
         super.createActions();
         createItemsMenu();
-        createSelectionMenu();
     }
 
     protected void createItemsMenu() {
@@ -35,28 +34,7 @@ public abstract class AbstractListingTestUI<T extends AbstractListing<Object, ?>
                 });
     }
 
-    protected void createSelectionMenu() {
-        LinkedHashMap<String, String> options = new LinkedHashMap<>();
-        options.put("None", null);
-        options.put("Item 0", "Item 0");
-        options.put("Item 1", "Item 1");
-        options.put("Item 2", "Item 2");
-        options.put("Item 10", "Item 10");
-        options.put("Item 100", "Item 100");
-
-        createSelectAction("Select", "Selection", options, "None",
-                (c, selected, data) -> {
-                    if (selected != null) {
-                        c.select(selected);
-                    } else {
-                        c.getSelectedItems().forEach(c::deselect);
-                    }
-                });
-    }
-
     protected Object[] createItems(int number) {
-        return IntStream.range(0, number)
-                .mapToObj(i -> "Item " + i)
-                .toArray();
+        return IntStream.range(0, number).mapToObj(i -> "Item " + i).toArray();
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractSingleSelectTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractSingleSelectTestUI.java
new file mode 100644
index 0000000000..f9529ff2e3
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractSingleSelectTestUI.java
@@ -0,0 +1,57 @@
+/*
+ * 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.components.abstractlisting;
+
+import java.util.LinkedHashMap;
+
+import com.vaadin.ui.AbstractSingleSelect;
+
+public abstract class AbstractSingleSelectTestUI<T extends AbstractSingleSelect<Object>>
+        extends AbstractListingTestUI<T> {
+
+    @Override
+    protected void createActions() {
+        super.createActions();
+
+        createSelectionMenu();
+        createListenerMenu();
+    }
+
+    protected void createListenerMenu() {
+        createListenerAction("Selection listener", "Listeners", c -> c
+                .addSelectionListener(e -> log("Selected: " + e.getValue())));
+    }
+
+    protected void createSelectionMenu() {
+        LinkedHashMap<String, String> options = new LinkedHashMap<>();
+        options.put("None", null);
+        options.put("Item 0", "Item 0");
+        options.put("Item 1", "Item 1");
+        options.put("Item 2", "Item 2");
+        options.put("Item 10", "Item 10");
+        options.put("Item 100", "Item 100");
+
+        createSelectAction("Select", "Selection", options, "None",
+                (c, selected, data) -> {
+                    if (selected != null) {
+                        c.select(selected);
+                    } else {
+                        c.getSelectedItems().forEach(c::deselect);
+                    }
+                });
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java
index cc1c15b2ce..1a28fd41fb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java
@@ -1,26 +1,14 @@
 package com.vaadin.tests.components.nativeselect;
 
-import com.vaadin.tests.components.abstractlisting.AbstractListingTestUI;
+import com.vaadin.tests.components.abstractlisting.AbstractSingleSelectTestUI;
 import com.vaadin.ui.NativeSelect;
 
-public class NativeSelects extends
-        AbstractListingTestUI<NativeSelect<Object>> {
+public class NativeSelects
+        extends AbstractSingleSelectTestUI<NativeSelect<Object>> {
 
     @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     protected Class<NativeSelect<Object>> getTestClass() {
         return (Class) NativeSelect.class;
     }
-
-    @Override
-    protected void createActions() {
-        super.createActions();
-        createListenerMenu();
-    }
-
-    protected void createListenerMenu() {
-        createListenerAction("Selection listener", "Listeners",
-                c -> c.addSelectionListener(
-                        e -> log("Selected: " + e.getValue())));
-    }
 }
-- 
2.39.5