Added icon support to Comboboxes test

svn changeset:15194/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/components/combobox/Comboboxes.html b/tests/src/com/vaadin/tests/components/combobox/Comboboxes.html
index a391589eb18205fa6ca6f5581b6d087206fc100e..d639bbf3e49fc37dee5ff5843e09bdd6524c3dc7 100644 (file)
--- a/tests/src/com/vaadin/tests/components/combobox/Comboboxes.html
+++ b/tests/src/com/vaadin/tests/components/combobox/Comboboxes.html
@@ -11,9 +11,14 @@
 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
+<tr>
+       <td>setSpeed</td>
+       <td>200</td>
+       <td>To avoid sporadic failures</td>
+</tr>
 <tr>
        <td>open</td>
-       <td>/run/com.vaadin.tests.components.combobox.Comboboxes</td>
+       <td>/run/com.vaadin.tests.components.combobox.Comboboxes?restartApplication</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java b/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java
index 2f72d70cc5d983b79e9ea6d12f401db90cbe01d7..5d41fae7850f85ab2d6639fef3345bd1a157b85c 100644 (file)
--- a/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java
+++ b/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java
@@ -1,7 +1,13 @@
 package com.vaadin.tests.components.combobox;
 
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import com.vaadin.terminal.ThemeResource;
 import com.vaadin.tests.components.ComponentTestCase;
 import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Component;
 import com.vaadin.ui.Select;
 
 public class Comboboxes extends ComponentTestCase<ComboBox> {
@@ -111,7 +117,35 @@ public class Comboboxes extends ComponentTestCase<ComboBox> {
 
     @Override
     protected String getDescription() {
-        return "A generic test for Labels in different configurations";
+        return "A generic test for ComboBoxes in different configurations";
     }
 
+    @Override
+    protected void createCustomActions(List<Component> actions) {
+        actions.add(createIconSelect());
+    }
+
+    private Component createIconSelect() {
+
+        LinkedHashMap<String, String> options = new LinkedHashMap<String, String>();
+        options.put("<None>", null);
+        options.put("16x16", "../runo/icons/16/user.png");
+        options.put("32x32", "../runo/icons/32/attention.png");
+        options.put("64x64", "../runo/icons/64/email-reply.png");
+
+        return createSelectAction("Icon", options, "<None>",
+                new Command<ComboBox, String>() {
+
+                    public void execute(ComboBox c, String value) {
+                        for (Object id : c.getItemIds()) {
+                            if (value == null) {
+                                c.setItemIcon(id, null);
+                            } else {
+                                c.setItemIcon(id, new ThemeResource(value + "?"
+                                        + new Date().getTime()));
+                            }
+                        }
+                    }
+                });
+    }
 }