1 files changed, 8 insertions, 9 deletions
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
index 5f33b96a73..cdae1c8e38 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
@@ -3,16 +3,18 @@ package com.vaadin.tests.components.combobox;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.tests.components.TestBase;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.ComboBox;
 
-public class ComboBoxIdenticalItems extends TestBase {
+public class ComboBoxIdenticalItems extends AbstractTestUI {
 
     private Log log = new Log(5);
 
+    @SuppressWarnings("unchecked")
     @Override
-    public void setup() {
+    protected void setup(VaadinRequest request) {
         final ComboBox select = new ComboBox("ComboBox");
         select.addContainerProperty("caption", String.class, null);
         Item item = select.addItem("one-1");
@@ -24,9 +26,7 @@ public class ComboBoxIdenticalItems extends TestBase {
         select.setItemCaptionPropertyId("caption");
         select.setNullSelectionAllowed(false);
         select.setImmediate(true);
-        select.addListener(new Property.ValueChangeListener() {
-            private static final long serialVersionUID = -7932700771673919620L;
-
+        select.addValueChangeListener(new Property.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
                 log.log("Item " + select.getValue() + " selected");
@@ -39,7 +39,7 @@ public class ComboBoxIdenticalItems extends TestBase {
     }
 
     @Override
-    protected String getDescription() {
+    protected String getTestDescription() {
         return "Keyboard selecting of a value is broken in combobox if two "
                 + "items have the same caption. The first item's id is \"One-1\" "
                 + "while the second one is \"One-2\". Selecting with mouse works "
@@ -49,7 +49,6 @@ public class ComboBoxIdenticalItems extends TestBase {
 
     @Override
     protected Integer getTicketNumber() {
-        // TODO Auto-generated method stub
-        return null;
+        return 6125;
     }
 }